ReverseBox 0.35.0__tar.gz → 0.35.2__tar.gz

{reversebox-0.35.0 → reversebox-0.35.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.35.0
+Version: 0.35.2
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda

{reversebox-0.35.0 → reversebox-0.35.2}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.35.0
+Version: 0.35.2
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda

{reversebox-0.35.0 → reversebox-0.35.2}/ReverseBox.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ reversebox/hash/hash_sdbm.py
 reversebox/hash/hash_sha1.py
 reversebox/hash/hash_sha2.py
 reversebox/image/__init__.py
+reversebox/image/byte_swap.py
 reversebox/image/common.py
 reversebox/image/image_decoder.py
 reversebox/image/image_encoder.py

reversebox-0.35.2/reversebox/image/byte_swap.py

@@ -0,0 +1,71 @@
+"""
+Copyright © 2025  Bartłomiej Duda
+License: GPL-3.0 License
+"""
+
+# fmt: off
+
+# Byte swapping functions
+
+
+def swap_byte_order_x360(image_data: bytes) -> bytes:
+    if len(image_data) % 2 != 0:
+        raise Exception("Data size must be a multiple of 2 bytes!")
+
+    swapped_data: bytearray = bytearray()
+    for i in range(0, len(image_data), 2):
+        group = image_data[i: i + 2]
+        swapped_data.extend(group[::-1])
+    return swapped_data
+
+
+def swap_byte_order_gamecube(image_data: bytes, img_width: int, img_height: int) -> bytes:
+    if len(image_data) % 8 != 0:
+        raise ValueError("The data must be a multiple of 8 bytes (the size of one BC block)")
+
+    bw: int = img_width // 4
+    bh: int = img_height // 4
+    block_size: int = 8
+    tile_w: int = bw // 2
+    tile_h: int = bh // 2
+    tile_index: int = 0
+
+    swapped_data: bytearray = bytearray(len(image_data))
+
+    for ty in range(tile_h):
+        for tx in range(tile_w):
+            for by in range(2):
+                for bx in range(2):
+                    # Calculate destination position
+                    dst_x = tx * 2 + bx
+                    dst_y = ty * 2 + by
+                    dst_index = (dst_y * bw + dst_x) * block_size
+
+                    # Get source block and convert endianness
+                    src_index = tile_index * block_size
+                    block = image_data[src_index:src_index + block_size]
+
+                    # Convert GameCube DXT1 to little-endian DXT1
+                    # Swap color0 and color1 endianness
+                    color0 = (block[0] << 8) | block[1]
+                    color1 = (block[2] << 8) | block[3]
+
+                    # Reorder 2-bit indices (bit reversal within each byte)
+                    indices = bytearray(4)
+                    for i in range(4):
+                        b = block[4 + i]
+                        indices[i] = ((b & 0b00000011) << 6) | \
+                                     ((b & 0b00001100) << 2) | \
+                                     ((b & 0b00110000) >> 2) | \
+                                     ((b & 0b11000000) >> 6)
+
+                    # Write converted block to output
+                    swapped_data[dst_index] = color0 & 0xff
+                    swapped_data[dst_index + 1] = color0 >> 8
+                    swapped_data[dst_index + 2] = color1 & 0xff
+                    swapped_data[dst_index + 3] = color1 >> 8
+                    swapped_data[dst_index + 4:dst_index + 8] = indices
+
+                    tile_index += 1
+
+    return bytes(swapped_data)

{reversebox-0.35.0 → reversebox-0.35.2}/reversebox/image/image_encoder.py

@@ -320,13 +320,15 @@ class ImageEncoder:
         else:
             raise Exception(f"[1] Image_bits_per_pixel={image_bpp} not supported!")
 
-        # encode to intermediate image
-        encoded_intermediate_image: bytes = self._encode_generic(image_data, img_width, img_height, palette_format, image_endianess)  # RGBA8888
+        texture_data_expected_size: int = len(texture_data)
 
-        # colour quantization
-        pillow_img: Image = PillowWrapper().get_pillow_image_from_rgba8888_data(encoded_intermediate_image, img_width, img_height)
-        pillow_img = pillow_img.quantize(colors=max_colors_count, method=2).convert("RGBA")
-        encoded_intermediate_image = pillow_img.tobytes()
+        # colour quantization and dithering
+        pillow_img: Image = PillowWrapper().get_pillow_image_from_rgba8888_data(image_data, img_width, img_height)
+        pillow_img = pillow_img.quantize(colors=max_colors_count, method=2).convert("RGBA", dither=Image.Dither.FLOYDSTEINBERG)
+        image_data = pillow_img.tobytes()
+
+        # encode to intermediate image (e.g. RGBA8888 -> RGB565)
+        encoded_intermediate_image: bytes = self._encode_generic(image_data, img_width, img_height, palette_format, image_endianess)
 
         # get pixels from intermediate image
         pixel_int_values: list[int] = []
@@ -350,6 +352,7 @@ class ImageEncoder:
             raise Exception(f"Not supported aligned colors count for max_colors_count={max_colors_count}")  # TODO - support other formats like PAL16
 
         palette_data: bytearray = bytearray(aligned_colors_count * palette_bytes_per_pixel)
+        palette_data_expected_size: int = len(palette_data)
 
         # palette preparation (get unique values for palette)
         pixel_check_list: List[int] = []
@@ -370,7 +373,6 @@ class ImageEncoder:
 
         # encode indices
         img_entry_number: int = 0
-
         if image_bpp == 4:  # PAL4
             for i in range(0, len(pixel_int_values), 2):
                 pal_entry_number_1: int = pixel_map[pixel_int_values[i]]
@@ -390,6 +392,13 @@ class ImageEncoder:
         else:
             raise Exception(f"Not supported img_bpp={image_bpp}!")  # TODO - support other formats like PAL16
 
+        # final checks
+        if len(palette_data) > palette_data_expected_size or len(palette_data) > 1024:
+            raise Exception("Error! Palette data too big!")
+
+        if len(texture_data) > texture_data_expected_size:
+            raise Exception("Error! Texture data too big!")
+
         return texture_data, palette_data
 
     def encode_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats, image_endianess: str = "little") -> bytes:

{reversebox-0.35.0 → reversebox-0.35.2}/reversebox/image/swizzling/swizzle_x360.py

@@ -1,24 +1,15 @@
 """
-Copyright © 2024  Bartłomiej Duda
+Copyright © 2024-2025  Bartłomiej Duda
 License: GPL-3.0 License
 """
 
+from reversebox.image.byte_swap import swap_byte_order_x360
+
 # Xbox 360 Texture Swizzling
 
 # fmt: off
 
 
-def _swap_byte_order(image_data: bytes) -> bytes:
-    if len(image_data) % 2 != 0:
-        raise Exception("Data size must be a multiple of 2 bytes!")
-
-    swapped_data: bytearray = bytearray()
-    for i in range(0, len(image_data), 2):
-        group = image_data[i: i + 2]
-        swapped_data.extend(group[::-1])
-    return swapped_data
-
-
 def _xg_address_2d_tiled_x(block_offset: int, width_in_blocks: int, texel_byte_pitch: int) -> int:
     aligned_width: int = (width_in_blocks + 31) & ~31
     log_bpp: int = (texel_byte_pitch >> 2) + ((texel_byte_pitch >> 1) >> (texel_byte_pitch >> 2))
@@ -74,12 +65,12 @@ def _convert_x360_image_data(image_data: bytes, image_width: int, image_height:
 
 
 def unswizzle_x360(image_data: bytes, img_width: int, img_height: int, block_pixel_size: int = 4, texel_byte_pitch: int = 8) -> bytes:
-    swapped_data: bytes = _swap_byte_order(image_data)
+    swapped_data: bytes = swap_byte_order_x360(image_data)
     unswizzled_data: bytes = _convert_x360_image_data(swapped_data, img_width, img_height, block_pixel_size, texel_byte_pitch, False)
     return unswizzled_data
 
 
 def swizzle_x360(image_data: bytes, img_width: int, img_height: int, block_pixel_size: int = 4, texel_byte_pitch: int = 8) -> bytes:
-    swapped_data: bytes = _swap_byte_order(image_data)
+    swapped_data: bytes = swap_byte_order_x360(image_data)
     swizzled_data: bytes = _convert_x360_image_data(swapped_data, img_width, img_height, block_pixel_size, texel_byte_pitch, True)
     return swizzled_data

{reversebox-0.35.0 → reversebox-0.35.2}/setup.py

@@ -8,7 +8,7 @@ from typing import Final
 
 import setuptools
 
-VERSION_NUM: Final[str] = "0.35.0"
+VERSION_NUM: Final[str] = "0.35.2"
 
 
 def get_long_description() -> str: