ReverseBox 0.48.2__tar.gz → 0.48.3__tar.gz

{reversebox-0.48.2 → reversebox-0.48.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.48.2
+Version: 0.48.3
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -141,12 +141,13 @@ or software researchers).
 * Image
   - Decode RGB121 ✔️
   - Decode ALPHA4 ✔️
-  - Decode RAWBMP2_PS2 ✔️
+  - Decode ALPHA4_16X ✔️
   - Decode RGB121_BYTE ✔️
   - Decode RGBA2222 ✔️
   - Decode RGBX2222 ✔️
   - Decode GRAY8 ✔️
   - Decode ALPHA8 ✔️
+  - Decode ALPHA8_16X ✔️
   - Decode LA44 ✔️
   - Decode RGBX332 (RGB8) ✔️
   - Decode BGRX332 (BGR8) ✔️

{reversebox-0.48.2 → reversebox-0.48.3}/README.md

@@ -104,12 +104,13 @@ or software researchers).
 * Image
   - Decode RGB121 ✔️
   - Decode ALPHA4 ✔️
-  - Decode RAWBMP2_PS2 ✔️
+  - Decode ALPHA4_16X ✔️
   - Decode RGB121_BYTE ✔️
   - Decode RGBA2222 ✔️
   - Decode RGBX2222 ✔️
   - Decode GRAY8 ✔️
   - Decode ALPHA8 ✔️
+  - Decode ALPHA8_16X ✔️
   - Decode LA44 ✔️
   - Decode RGBX332 (RGB8) ✔️
   - Decode BGRX332 (BGR8) ✔️

{reversebox-0.48.2 → reversebox-0.48.3}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.48.2
+Version: 0.48.3
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -141,12 +141,13 @@ or software researchers).
 * Image
   - Decode RGB121 ✔️
   - Decode ALPHA4 ✔️
-  - Decode RAWBMP2_PS2 ✔️
+  - Decode ALPHA4_16X ✔️
   - Decode RGB121_BYTE ✔️
   - Decode RGBA2222 ✔️
   - Decode RGBX2222 ✔️
   - Decode GRAY8 ✔️
   - Decode ALPHA8 ✔️
+  - Decode ALPHA8_16X ✔️
   - Decode LA44 ✔️
   - Decode RGBX332 (RGB8) ✔️
   - Decode BGRX332 (BGR8) ✔️

{reversebox-0.48.2 → reversebox-0.48.3}/reversebox/image/common.py

@@ -85,7 +85,7 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                         ImageFormats.BC4_UNORM,
                         ImageFormats.PAL4,
                         ImageFormats.ALPHA4,
-                        ImageFormats.RAWBMP2_PS2
+                        ImageFormats.ALPHA4_16X
                         ):
         return 4
     elif image_format in (ImageFormats.RGBX2222,
@@ -95,6 +95,7 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                           ImageFormats.BGR332,
                           ImageFormats.GRAY8,
                           ImageFormats.ALPHA8,
+                          ImageFormats.ALPHA8_16X,
                           ImageFormats.LA44,
                           ImageFormats.N64_I8,
                           ImageFormats.N64_IA4,

{reversebox-0.48.2 → reversebox-0.48.3}/reversebox/image/image_decoder.py

@@ -74,17 +74,7 @@ class ImageDecoder:
         p[3] = 0xFF
         return p
 
-    # A4 (Alpha 4-bit)
-    def _decode_alpha4_pixel(self, pixel_int: int) -> bytes:
-        p = bytearray(4)
-        p[0] = 0xFF
-        p[1] = 0xFF
-        p[2] = 0xFF
-        p[3] = pixel_int & 0xFF
-        return p
-
-    # RAWBMP/2 PS2 (4-bit)
-    def _decode_rawbmp2_ps2_pixel(self, pixel_int: int) -> bytes:
+    def _decode_alpha_16x_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
         p[0] = 0xFF
         p[1] = 0xFF
@@ -92,8 +82,7 @@ class ImageDecoder:
         p[3] = (16 * pixel_int) & 0xFF
         return p
 
-    # A8 (Alpha 8-bit)
-    def _decode_alpha8_pixel(self, pixel_int: int) -> bytes:
+    def _decode_alpha_only_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
         p[0] = 0xFF
         p[1] = 0xFF
@@ -584,12 +573,13 @@ class ImageDecoder:
         # image_format: (decode_function, bits_per_pixel, image_entry_read_function)
         ImageFormats.RGB121: (_decode_rgb121_byte_pixel, 4, get_uint8),
         ImageFormats.N64_I4: (_decode_i4_pixel, 4, get_uint8),  # GRAY, 4bpp
-        ImageFormats.ALPHA4: (_decode_alpha4_pixel, 4, get_uint8),
-        ImageFormats.RAWBMP2_PS2: (_decode_rawbmp2_ps2_pixel, 4, get_uint8),
+        ImageFormats.ALPHA4: (_decode_alpha_only_pixel, 4, get_uint8),
+        ImageFormats.ALPHA4_16X: (_decode_alpha_16x_pixel, 4, get_uint8),
 
         ImageFormats.RGB121_BYTE: (_decode_rgb121_byte_pixel, 8, get_uint8),
         ImageFormats.GRAY8: (_decode_gray8_pixel, 8, get_uint8),
-        ImageFormats.ALPHA8: (_decode_alpha8_pixel, 8, get_uint8),
+        ImageFormats.ALPHA8: (_decode_alpha_only_pixel, 8, get_uint8),
+        ImageFormats.ALPHA8_16X: (_decode_alpha_16x_pixel, 8, get_uint8),
         ImageFormats.LA44: (_decode_la44_pixel, 8, get_uint8),
         ImageFormats.RGBX2222: (_decode_rgbx2222_pixel, 8, get_uint8),
         ImageFormats.RGBA2222: (_decode_rgba2222_pixel, 8, get_uint8),

{reversebox-0.48.2 → reversebox-0.48.3}/reversebox/image/image_formats.py

@@ -20,7 +20,7 @@ class ImageFormats(Enum):
     # 4-bit
     RGB121 = "rgb121"  # PIX_FMT_RGB4 / packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb)
     ALPHA4 = "alpha4"  # (A4 / Alpha 4-bit)
-    RAWBMP2_PS2 = "rawbmp2_ps2"  # RAWBMP/2 PS2 (4-bit)
+    ALPHA4_16X = "alpha4_16x"
 
     # 8-bit
     RGBX2222 = "rgbx2222"
@@ -30,6 +30,7 @@ class ImageFormats(Enum):
     BGR332 = "bgr332"  # PIX_FMT_BGR8 / packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
     GRAY8 = "gray8"  # PIX_FMT_GRAY8 / Y, 8bpp  (Y800 / L8 / Luminance 8-bit)
     ALPHA8 = "alpha8"  # (A8 / Alpha 8-bit)
+    ALPHA8_16X = "alpha8_16x"
     LA44 = "la44"  # (LA4 / L4A4 / Luminance 4-bit and Alpha 4-bit)
     R8 = "r8"
     G8 = "g8"

{reversebox-0.48.2 → reversebox-0.48.3}/setup.py

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