]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix bytes to integers conversion in png2c script.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 8 Feb 2011 13:36:06 +0000 (13:36 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 8 Feb 2011 13:36:06 +0000 (13:36 +0000)
Use really correct coefficients for all the bytes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

misc/scripts/png2c.py

index fe96def07920c648a5c6c24ad013482f85870090..e1ea837324edb3a5d9109fcc19cd74644ed87e0b 100755 (executable)
@@ -56,9 +56,14 @@ for path in sys.argv[1:]:
 
         # Try to naively get its size if necessary
         if with_size:
-                width = bytes[19] + 16*bytes[18] + 256*bytes[17] + 65536*bytes[16]
-                height = bytes[23] + 16*bytes[22] + 256*bytes[21] + 65536*bytes[20]
-                size_suffix = "_%dx%d" % (width, height)
+                def getInt(start):
+                        """ Convert 4 bytes in network byte order to an integer. """
+                        return 16777216*bytes[start]   + \
+                                  65536*bytes[start+1] + \
+                                    256*bytes[start+2] + \
+                                        bytes[start+3];
+
+                size_suffix = "_%dx%d" % (getInt(16), getInt(20))
 
         # Create the C header
         text = "/* %s - %d bytes */\n" \