Author: tack
Date: Wed Apr 26 13:32:24 2006
New Revision: 1508

Modified:
   trunk/metadata/src/image/pnginfo.py

Log:
Support comment meta tag as comment attribute


Modified: trunk/metadata/src/image/pnginfo.py
==============================================================================
--- trunk/metadata/src/image/pnginfo.py (original)
+++ trunk/metadata/src/image/pnginfo.py Wed Apr 26 13:32:24 2006
@@ -37,6 +37,7 @@
 # kaa imports
 from kaa.metadata import mediainfo
 from kaa.metadata import factory
+from kaa.strutils import str_to_unicode
 
 # image imports
 import IPTC
@@ -84,6 +85,8 @@
         except (OSError, IOError):
             return 0
 
+        key = None
+
         if type == 'IEND':
             return 0
 
@@ -95,7 +98,7 @@
             log.debug('latin-1 Text found.')
             (data, crc) = struct.unpack('>%isI' % length,file.read(length+4))
             (key, value) = data.split('\0')
-            self.meta[key] = value
+            self.meta[key] = str_to_unicode(value)
 
         elif type == 'zTXt':
             log.debug('Compressed Text found.')
@@ -111,18 +114,20 @@
                           (key,compression,decompressed))
             else:
                 log.debug("%s has unknown Compression %c" % (key,compression))
-            self.meta[key] = value
+            self.meta[key] = str_to_unicode(value)
 
         elif type == 'iTXt':
             log.debug('International Text found.')
             (data,crc) = struct.unpack('>%isI' % length,file.read(length+4))
             (key, value) = data.split('\0')
-            self.meta[key] = value
+            self.meta[key] = str_to_unicode(value)
 
         else:
             file.seek(length+4,1)
             log.debug("%s of length %d ignored." % (type, length))
 
+        if key is not None and key.lower() == "comment":
+            self.comment = self.meta[key]
         return 1
 
 factory.register( 'image/png', ('png',), mediainfo.TYPE_IMAGE, PNGInfo )


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to