ReverseBox 0.35.3__tar.gz → 0.35.6__tar.gz

{reversebox-0.35.3 → reversebox-0.35.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.35.3
+Version: 0.35.6
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -161,7 +161,7 @@ or software researchers).
   - Decode RGBA4444 ✔️
   - Decode ABGR4444 ✔️
   - Decode XBGR4444 ✔️
-  - Decode RGBX4444 ✔️
+  - Decode/Encode RGBX4444 ✔️
   - Decode BGRA4444 ✔️
   - Decode BGRX4444 ✔️
   - Decode XRGB1555 ✔️

{reversebox-0.35.3 → reversebox-0.35.6}/README.md

@@ -124,7 +124,7 @@ or software researchers).
   - Decode RGBA4444 ✔️
   - Decode ABGR4444 ✔️
   - Decode XBGR4444 ✔️
-  - Decode RGBX4444 ✔️
+  - Decode/Encode RGBX4444 ✔️
   - Decode BGRA4444 ✔️
   - Decode BGRX4444 ✔️
   - Decode XRGB1555 ✔️

{reversebox-0.35.3 → reversebox-0.35.6}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.35.3
+Version: 0.35.6
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -161,7 +161,7 @@ or software researchers).
   - Decode RGBA4444 ✔️
   - Decode ABGR4444 ✔️
   - Decode XBGR4444 ✔️
-  - Decode RGBX4444 ✔️
+  - Decode/Encode RGBX4444 ✔️
   - Decode BGRA4444 ✔️
   - Decode BGRX4444 ✔️
   - Decode XRGB1555 ✔️

{reversebox-0.35.3 → reversebox-0.35.6}/reversebox/common/common.py

@@ -39,7 +39,7 @@ def fill_data_with_padding(input_data: bytes, padding_length: int) -> bytes:
 # e.g. "aaa" and 5 --> "aaa\x00\x00"
 def fill_data_with_padding_to_desired_length(
     input_data: bytes, desired_padding_length: int
-):
+) -> bytes:
     if len(input_data) > desired_padding_length:
         raise Exception("Data too big or desired padding too low!")
     elif len(input_data) == desired_padding_length:

{reversebox-0.35.3 → reversebox-0.35.6}/reversebox/image/image_encoder.py

@@ -146,6 +146,25 @@ class ImageEncoder:
         p[1] = (bgra4444 >> 8) & 0xFF
         return p
 
+    def _encode_rgbx4444_pixel(self, pixel_int: int) -> bytearray:
+        p = bytearray(2)
+
+        r = pixel_int & 0xFF
+        g = (pixel_int >> 8) & 0xFF
+        b = (pixel_int >> 16) & 0xFF
+        x = 0xFF
+
+        r4 = (r >> 4) & 0x0F
+        g4 = (g >> 4) & 0x0F
+        b4 = (b >> 4) & 0x0F
+        x4 = (x >> 4) & 0x0F
+
+        rgbx4444 = (x4 << 12) | (b4 << 8) | (g4 << 4) | r4
+
+        p[0] = rgbx4444 & 0xFF
+        p[1] = (rgbx4444 >> 8) & 0xFF
+        return p
+
     def _encode_rgba5551_pixel(self, pixel_int: int) -> bytearray:
         p = bytearray(2)
 
@@ -236,6 +255,7 @@ class ImageEncoder:
         ImageFormats.BGR565: (_encode_bgr565_pixel, 16, get_uint16, set_uint16),
         ImageFormats.ABGR4444: (_encode_abgr4444_pixel, 16, get_uint16, set_uint16),
         ImageFormats.BGRA4444: (_encode_bgra4444_pixel, 16, get_uint16, set_uint16),
+        ImageFormats.RGBX4444: (_encode_rgbx4444_pixel, 16, get_uint16, set_uint16),
         ImageFormats.RGBA5551: (_encode_rgba5551_pixel, 16, get_uint16, set_uint16),
         ImageFormats.BGRA5551: (_encode_bgra5551_pixel, 16, get_uint16, set_uint16),
         ImageFormats.RGBX5551: (_encode_rgbx5551_pixel, 16, get_uint16, set_uint16),
@@ -324,7 +344,9 @@ class ImageEncoder:
 
         # 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)
+        unique_colors_count: int = len(set(pillow_img.getdata()))
+        if unique_colors_count > max_colors_count:
+            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)

{reversebox-0.35.3 → reversebox-0.35.6}/setup.py

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