png_file fixed (IHDR was wrong)

construct · Aug 22, 2016 · 0d13533 · 0d13533
1 parent ef523d3
commit 0d13533
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/construct/formats/graphics/png.py b/construct/formats/graphics/png.py
@@ -7,7 +7,6 @@
 coding conventions)
 """
 from construct import *
-import six
 
 
 #===============================================================================
@@ -318,7 +317,7 @@ def splt_info_data_length(ctx):
 
 image_header_chunk = Struct("image_header",
     UBInt32("length"),
-    Const(String("type", 4), "IHDR"),
+    Magic(b"IHDR"),
     UBInt32("width"),
     UBInt32("height"),
     UBInt8("bit_depth"),
@@ -349,7 +348,7 @@ def splt_info_data_length(ctx):
 # the complete PNG file
 #===============================================================================
 png_file = Struct("png",
-    Magic(six.b("\x89PNG\r\n\x1a\n")),
+    Magic(b"\x89PNG\r\n\x1a\n"),
     image_header_chunk,
     Rename("chunks", GreedyRange(chunk)),
 )