ifstools 3.0__tar.gz → 3.1__tar.gz

{ifstools-3.0 → ifstools-3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ifstools
-Version: 3.0
+Version: 3.1
 Requires-Dist: kbinxml>=1.5
 Requires-Dist: lxml
 Requires-Dist: pillow
@@ -93,9 +93,6 @@ uv pip install . pyinstaller==6.19.0
 uv run pyinstaller --onefile --name ifstools ifstools_bin.py
 ```
 
-Notes:
-- argb8888rev and dxt5 can be repacked. Other formats will silently be converted to argb8888rev
-
 Todo:
 - Recursive repacking for ifs inside ifs
 

{ifstools-3.0 → ifstools-3.1}/README.md

@@ -79,9 +79,6 @@ uv pip install . pyinstaller==6.19.0
 uv run pyinstaller --onefile --name ifstools ifstools_bin.py
 ```
 
-Notes:
-- argb8888rev and dxt5 can be repacked. Other formats will silently be converted to argb8888rev
-
 Todo:
 - Recursive repacking for ifs inside ifs
 

{ifstools-3.0 → ifstools-3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ifstools"
-version = "3.0"
+version = "3.1"
 description = "Extractor/repacker for Konmai IFS files"
 readme = "README.md"
 authors = [

{ifstools-3.0 → ifstools-3.1}/src/ifstools/handlers/image_decoders.py

@@ -1,6 +1,6 @@
 from io import BytesIO
 
-from PIL import Image
+from PIL import Image, ImageChops
 from tqdm import tqdm
 
 try:
@@ -44,11 +44,11 @@ def decode_argb4444(ifs_img, data):
     return Image.merge('RGBA', (b, g, r, a))
 
 def encode_argb4444(ifs_img, image):
-    # there's no BGRA;4B
-    r, g, b, a = image.split()
-    image = Image.merge('RGBA', (b, g, r, a))
-
-    return image.tobytes('raw', 'RGBA;4B')
+    # PIL has no packer for RGBA;4B. Per pixel: byte0 = G<<4|B, byte1 = A<<4|R
+    r, g, b, a = image.convert('RGBA').split()
+    lo = ImageChops.add(g.point(lambda v: v & 0xF0), b.point(lambda v: v >> 4))
+    hi = ImageChops.add(a.point(lambda v: v & 0xF0), r.point(lambda v: v >> 4))
+    return Image.merge('LA', (lo, hi)).tobytes()
 
 def decode_dxt(ifs_img, data, version):
     rgba = _native.decode_dxt(data, ifs_img.img_size[0], ifs_img.img_size[1], version)
@@ -60,14 +60,20 @@ def decode_dxt5(ifs_img, data):
 def decode_dxt1(ifs_img, data):
     return decode_dxt(ifs_img, data, 'dxt1')
 
+def encode_dxt(ifs_img, image, version):
+    return _native.encode_dxt(image.tobytes('raw', 'RGBA'), image.width, image.height, version)
+
 def encode_dxt5(ifs_img, image):
-    return _native.encode_dxt(image.tobytes('raw', 'RGBA'), image.width, image.height, 'dxt5')
+    return encode_dxt(ifs_img, image, 'dxt5')
+
+def encode_dxt1(ifs_img, image):
+    return encode_dxt(ifs_img, image, 'dxt1')
 
 
 image_formats = {
     'argb8888rev' : {'decoder': decode_argb8888rev, 'encoder': encode_argb8888rev},
     'argb4444'    : {'decoder': decode_argb4444, 'encoder': encode_argb4444},
-    'dxt1'        : {'decoder': decode_dxt1, 'encoder': None},
+    'dxt1'        : {'decoder': decode_dxt1, 'encoder': encode_dxt1 if _native else None},
     'dxt5'        : {'decoder': decode_dxt5, 'encoder': encode_dxt5 if _native else None},
 }