Calculate image size

32blit · Nov 9, 2020 · 314147b · 314147b
1 parent 4efe41a
commit 314147b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ttblit/asset/image.py b/src/ttblit/asset/image.py
@@ -7,7 +7,7 @@
 
 from ..core.assetbuilder import AssetBuilder
 from ..core.palette import Colour, Palette, type_palette
-from ..core.struct import struct_blit_image, struct_blit_pixel
+from ..core.struct import struct_blit_image
 
 
 class ImageAsset(AssetBuilder):
@@ -80,7 +80,6 @@ def to_binary(self, input_data):
 
         return struct_blit_image.build({
             'type': 'PK' if self.packed else 'RW',
-            'size': len(image_data) + (len(self.palette) * 4) + 20,
             'width': image.size[0],
             'height': image.size[1],
             'palette_entries': len(self.palette),

diff --git a/src/ttblit/core/struct.py b/src/ttblit/core/struct.py
@@ -3,7 +3,8 @@
 
 from construct import (Array, Bytes, Checksum, Computed, Const, Int8ul,
                        Int16ul, Int32ul, Optional, PaddedString, Prefixed,
-                       PrefixedArray, RawCopy, Struct, Adapter, this)
+                       PrefixedArray, RawCopy, Struct, Adapter, Rebuild,
+                       this, len_)
 
 
 def compute_bit_length(ctx):
@@ -47,7 +48,7 @@ def _encode(self, obj, context, path):
 struct_blit_image = Struct(
     'header' / Const(b'SPRITE'),
     'type' / PaddedString(2, 'ASCII'),
-    'size' / Int32ul,
+    'size' / Rebuild(Int32ul, len_(this.data) + (this.palette_entries * 4) + 18),
     'width' / Int16ul,
     'height' / Int16ul,
     'format' / Const(0x02, Int8ul),