apftool 1.2.2__tar.gz → 1.2.4__tar.gz

{apftool-1.2.2 → apftool-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apftool
-Version: 1.2.2
+Version: 1.2.4
 Summary: Encoder and decoder for Aperture Science Image Format (apf), Aperture Science Image Format 2 (apf2), Wireless Bitmap (wbmp), Over-The-Air Bitmap (otb), and FaceDev's .bruh format
 Author: Mari (kbity)
 Requires-Python: >=3.10
@@ -101,6 +101,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+1.2.4 - spec conformance [I swear I will release it soon], +1 bias for 95-level grayscale
+
+1.2.3 - add +1 bias for near-truecolor modes, reducing the darkening problem 
+
 1.2.2 - add support for squeeze, improve handling for numpy/scipy not being installed. Signifigant performance improvement for Truecolor modes.
 
 1.2.1 - add support for 3 of apf2's compressed modes [bzip2, gzip, ascii packing]

{apftool-1.2.2 → apftool-1.2.4}/README.md

@@ -89,6 +89,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+1.2.4 - spec conformance [I swear I will release it soon], +1 bias for 95-level grayscale
+
+1.2.3 - add +1 bias for near-truecolor modes, reducing the darkening problem 
+
 1.2.2 - add support for squeeze, improve handling for numpy/scipy not being installed. Signifigant performance improvement for Truecolor modes.
 
 1.2.1 - add support for 3 of apf2's compressed modes [bzip2, gzip, ascii packing]

{apftool-1.2.2 → apftool-1.2.4}/apftool/__init__.py

@@ -14,7 +14,7 @@ extensions_mqif = (".mqif", ".mqi")
 
 extensions_txt = (".txt", ".text") # txt is seen as a generic container for apf/apf2 because they're just txt files
 
-version = "1.2.2"
+version = "1.2.4"
 
 extensions_all = []
 extensions_all.extend(extensions_apf+extensions_apf2+extensions_capf2+extensions_wbmp+extensions_otb+extensions_bruh+extensions_mqif)

{apftool-1.2.2 → apftool-1.2.4}/apftool/apf2.py

@@ -32,7 +32,7 @@ def quant_to_base95(g: int):
     return round(g/X)
 
 mapping = []
-for i in range(256):
+for i in range(257): # +1 to cover bias +1
     mapping.append(chr(quant_to_base95(i)+32))
 mapping_invert = {}
 for i, c in enumerate(mapping):
@@ -339,6 +339,7 @@ def graypal(perfect: bool = False):
         for n in set(mapping):
             if not n in pal:
                 pal[n] = (mapping_invert[n], mapping_invert[n], mapping_invert[n])
+        pal["~"] = (255, 255, 255)
     return pal
 
 def int_alpha_composit(l1: tuple, l2: tuple):
@@ -543,7 +544,7 @@ def decode(apf2: str | bytes, format: str = 'PNG', returnImageObject: bool = Fal
     if mode == 0:
         pals = apf_lines[2].split(".")
         if pals[0] == "":
-            if transparency_mode:
+            if transparency_mode == 1:
                 pals[0] = (0,0,0,0)
             else:
                 pals[0] = (0,0,0)
@@ -791,8 +792,8 @@ def generate_runs_apf2_l(bitmap: list, lineskip: int, w: int, h: int, topside_fi
         runlens.append(runcounter)
     return runlens
 
-def uint8_to_base95_with_corrector(val):
-    d = mapping[val]
+def uint8_to_base95_with_corrector(val, bias = 0):
+    d = mapping[val+bias]
     c = mapping_invert[d]
     e = val - c
     return d, e
@@ -849,6 +850,7 @@ def generate_runs_apf2_f(bitmap: list, lineskip: int, w: int, h: int, trans, com
     perfect = False
     alpha = False
     fakealpha = False
+    bias = 1
 
     if mode in (7, 8):
         gray = True
@@ -857,6 +859,7 @@ def generate_runs_apf2_f(bitmap: list, lineskip: int, w: int, h: int, trans, com
 
     if mode in (5, 6):
         perfect = True
+        bias = 0
 
     if mode in (4, 6):
         alpha = True
@@ -912,20 +915,20 @@ def generate_runs_apf2_f(bitmap: list, lineskip: int, w: int, h: int, trans, com
                     ind = chr(i1+32)+chr(i0+32)
                     curpixval = ind
                 else:
-                    v, _ = uint8_to_base95_with_corrector(pixtup)
+                    v, _ = uint8_to_base95_with_corrector(pixtup+1) # +1 bias
                     curpixval = v
 
             else:
                 if combine and pixel == (0,0,0,0) and not isTransPix:
                     pixel = (255,0,255,0) # alpha is zero but the RGB is non-zero
 
-                r, rc = uint8_to_base95_with_corrector(pixel[0])
-                g, gc = uint8_to_base95_with_corrector(pixel[1])
-                b, bc = uint8_to_base95_with_corrector(pixel[2])
+                r, rc = uint8_to_base95_with_corrector(pixel[0], bias)
+                g, gc = uint8_to_base95_with_corrector(pixel[1], bias)
+                b, bc = uint8_to_base95_with_corrector(pixel[2], bias)
                 a, ac = "~", 0
 
                 if alpha:
-                    a, ac = uint8_to_base95_with_corrector(pixel[3])
+                    a, ac = uint8_to_base95_with_corrector(pixel[3], bias)
 
                 # tri-level alpha for free
                 elif fakealpha and perfect:

{apftool-1.2.2 → apftool-1.2.4}/apftool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apftool
-Version: 1.2.2
+Version: 1.2.4
 Summary: Encoder and decoder for Aperture Science Image Format (apf), Aperture Science Image Format 2 (apf2), Wireless Bitmap (wbmp), Over-The-Air Bitmap (otb), and FaceDev's .bruh format
 Author: Mari (kbity)
 Requires-Python: >=3.10
@@ -101,6 +101,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+1.2.4 - spec conformance [I swear I will release it soon], +1 bias for 95-level grayscale
+
+1.2.3 - add +1 bias for near-truecolor modes, reducing the darkening problem 
+
 1.2.2 - add support for squeeze, improve handling for numpy/scipy not being installed. Signifigant performance improvement for Truecolor modes.
 
 1.2.1 - add support for 3 of apf2's compressed modes [bzip2, gzip, ascii packing]

{apftool-1.2.2 → apftool-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apftool"
-version = "1.2.2"
+version = "1.2.4"
 description = "Encoder and decoder for Aperture Science Image Format (apf), Aperture Science Image Format 2 (apf2), Wireless Bitmap (wbmp), Over-The-Air Bitmap (otb), and FaceDev's .bruh format"
 authors = [{name = "Mari (kbity)"}]
 readme = "README.md"