using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere

[wxWidgets.git] / misc / scripts / png2c.py

diff --git a/misc/scripts/png2c.py b/misc/scripts/png2c.py
index 5f451aa05d094e936e0bd6017b3b58f25c03028c..e1ea837324edb3a5d9109fcc19cd74644ed87e0b 100755 (executable)
--- a/misc/scripts/png2c.py
+++ b/misc/scripts/png2c.py
@@ -56,9 +56,14 @@ for path in sys.argv[1:]:
 
         # Try to naively get its size if necessary
         if with_size:
 
         # Try to naively get its size if necessary
         if with_size:

-                width = bytes[19] + 16*bytes[18] + 256*bytes[17] + 4096*bytes[16]
-                height = bytes[23] + 16*bytes[22] + 256*bytes[21] + 4096*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" \
 
         # Create the C header
         text = "/* %s - %d bytes */\n" \