apftool 1.2.1__tar.gz → 1.2.3__tar.gz

{apftool-1.2.1 → apftool-1.2.3}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: apftool
-Version: 1.2.1
+Version: 1.2.3
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Pillow
+Requires-Dist: psqueeze
 Dynamic: license-file
 
 # A library for converting to and from Aperture Science apf files, the custom extended apf2s, otb/wbmp images, and facedev's bruh format.
@@ -100,6 +101,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+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]
 
 1.2.0 - increase apfcli verbosity, add lossy encoding options. Allow apfcli to take its own formats as inputs and outputs, also adds a much better quantization algorithm and removes the limitations on indexed animations.

{apftool-1.2.1 → apftool-1.2.3}/README.md

@@ -89,6 +89,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+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]
 
 1.2.0 - increase apfcli verbosity, add lossy encoding options. Allow apfcli to take its own formats as inputs and outputs, also adds a much better quantization algorithm and removes the limitations on indexed animations.

{apftool-1.2.1 → apftool-1.2.3}/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.1"
+version = "1.2.3"
 
 extensions_all = []
 extensions_all.extend(extensions_apf+extensions_apf2+extensions_capf2+extensions_wbmp+extensions_otb+extensions_bruh+extensions_mqif)
@@ -26,7 +26,7 @@ def decode(data, format: str = None, returnImageObject: bool = False, provide_ex
         return apf2.decode(data, format, returnImageObject) # apf and af2 decoder
 
     elif isinstance(data, bytes):
-        if data.startswith(b'APERTURE IMAGE FORMAT (c) ') or data.startswith(b'APF2') or data.startswith(b'BZh') or data.startswith(b'\x1f\x8b\x08') or data.startswith(b'\x83\x42\x2D\x2A\x95\x69\x45\x41'): # this makes me GLaD
+        if data.startswith(b'APERTURE IMAGE FORMAT (c) ') or data.startswith(b'APF2') or data.startswith(b'BZh') or data.startswith(b'v\xff') or data.startswith(b'\x1f\x8b\x08') or data.startswith(b'\x83\x42\x2D\x2A\x95\x69\x45\x41'): # this makes me GLaD
             if format is None:
                 format = "PNG"
             return apf2.decode(data, format, returnImageObject, provide_extra_data=provide_extra_data)

{apftool-1.2.1 → apftool-1.2.3}/apftool/apf2.py

@@ -1,6 +1,6 @@
 from PIL import Image, ImageSequence
 from collections import Counter
-import io, textwrap, math
+import io, textwrap, math, squeeze
 
 compressgood = False
 
@@ -32,8 +32,12 @@ 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):
+    if not c in mapping_invert:
+        mapping_invert[c] = i
 
 # slow pure python version
 def quantize_most_frequent_basic(img: Image.Image, n_colors: int, palette: list = None, dither: bool = False, dither_mode: str = None): # for use with A and P>256 images, dithering unsupported for basic mode
@@ -81,20 +85,11 @@ else:
 def split_datapoints(data: str, datlen: int):
     leng = len(data)
 
-    trunc = False
-    if not leng%datlen == 0:
+    if leng % datlen:
         print("Error: Data must be divisible by the apf2 segment length! Attempting decode anyways...")
-        trunc = True
+        leng -= leng % datlen
 
-    split_points = []
-
-    for n in range(0, leng, datlen):
-        split_points.append(data[n:(n+datlen)])
-
-    if trunc:
-        split_points.pop(-1)
-
-    return split_points
+    return [data[n:n + datlen] for n in range(0, leng, datlen)]
 
 def apf2_apfdecodedata(data: str, h: int, w: int, apfbuffer: list, lineskip: int, pals: list, trans: bool = False, topdown: bool = False):
     x = 0
@@ -156,19 +151,19 @@ def flexTypeToRGB(inpt: str, mode: int, trans: bool = False):
     # 7 - 95-level Grayscale
     # 8 - 8-bit Grayscale
     if mode == 3:
-        r = mapping.index(inpt[0])
-        g = mapping.index(inpt[1])
-        b = mapping.index(inpt[2])
+        r = mapping_invert[inpt[0]]
+        g = mapping_invert[inpt[1]]
+        b = mapping_invert[inpt[2]]
         r = r+int(r == 254)
         g = g+int(g == 254)
         b = b+int(b == 254)
         return r, g, b
 
     elif mode == 4:
-        r = mapping.index(inpt[0])
-        g = mapping.index(inpt[1])
-        b = mapping.index(inpt[2])
-        a = mapping.index(inpt[3])
+        r = mapping_invert[inpt[0]]
+        g = mapping_invert[inpt[1]]
+        b = mapping_invert[inpt[2]]
+        a = mapping_invert[inpt[3]]
         r = r+int(r == 254)
         g = g+int(g == 254)
         b = b+int(b == 254)
@@ -176,9 +171,9 @@ def flexTypeToRGB(inpt: str, mode: int, trans: bool = False):
         return r, g, b, a
 
     elif mode == 5:
-        r = mapping.index(inpt[0])
-        g = mapping.index(inpt[1])
-        b = mapping.index(inpt[2])
+        r = mapping_invert[inpt[0]]
+        g = mapping_invert[inpt[1]]
+        b = mapping_invert[inpt[2]]
 
         # compute corrections
         c = ord(inpt[3])-32
@@ -193,10 +188,10 @@ def flexTypeToRGB(inpt: str, mode: int, trans: bool = False):
             return r+rc, g+gc, b+bc
 
     elif mode == 6:
-        r = mapping.index(inpt[0])
-        g = mapping.index(inpt[1])
-        b = mapping.index(inpt[2])
-        a = mapping.index(inpt[3])
+        r = mapping_invert[inpt[0]]
+        g = mapping_invert[inpt[1]]
+        b = mapping_invert[inpt[2]]
+        a = mapping_invert[inpt[3]]
 
         # compute corrections
         c = ord(inpt[4])-32
@@ -208,7 +203,7 @@ def flexTypeToRGB(inpt: str, mode: int, trans: bool = False):
         return r+rc, g+gc, b+bc, a+ac
 
     elif mode == 7:
-        r = mapping.index(inpt[0])
+        r = mapping_invert[inpt[0]]
         return [r, r, r]
 
     elif mode == 8:
@@ -343,7 +338,7 @@ def graypal(perfect: bool = False):
     else:
         for n in set(mapping):
             if not n in pal:
-                pal[n] = (mapping.index(n), mapping.index(n), mapping.index(n))
+                pal[n] = (mapping_invert[n], mapping_invert[n], mapping_invert[n])
     return pal
 
 def int_alpha_composit(l1: tuple, l2: tuple):
@@ -408,6 +403,8 @@ def decode(apf2: str | bytes, format: str = 'PNG', returnImageObject: bool = Fal
                 apf2 = gzip.decompress(compressed_blob)
             elif alg == b'ci':
                 apf2 = asciipak.decompress(compressed_blob)
+            elif alg == b'sq':
+                apf2 = squeeze.decompress(compressed_blob)
             else:
                 raise Exception("Invalid/Unsupported Compression Algorithm")
             apf2 = apf2.decode("ascii")
@@ -417,6 +414,9 @@ def decode(apf2: str | bytes, format: str = 'PNG', returnImageObject: bool = Fal
         elif apf2.startswith(b'\x1f\x8b\x08'):
             apf2 = gzip.decompress(apf2)
             apf2 = apf2.decode("ascii")
+        elif apf2.startswith(b'v\xff'):
+            apf2 = squeeze.decompress(apf2)
+            apf2 = apf2.decode("ascii")
         elif apf2.startswith(b'\x83\x42\x2D\x2A\x95\x69\x45\x41'):
             apf2 = asciipak.decompress(apf2)
             apf2 = apf2.decode("ascii")
@@ -791,9 +791,9 @@ 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]
-    c = mapping.index(d)
+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 +849,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 +858,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
@@ -919,13 +921,13 @@ def generate_runs_apf2_f(bitmap: list, lineskip: int, w: int, h: int, trans, com
                 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:
@@ -1199,15 +1201,15 @@ def encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: boo
     if not compressor in (None, "none", "bzip2", "gzip", "asciipak", "squeeze"):
         raise Exception('Error: Invalid Compressor! Options: none, bzip2, gzip, asciipak, squeeze')
 
-    if compressor == "squeeze":
-        raise Exception('Error: squeeze is not currently supported by apftool!')
-
     if compressor in ("bzip2", "gzip") and not compressgood:
         raise Exception('Error: bzip2 and gzip is not currently supported by your python install!')
 
     if compressor == "none":
         compressor = None # set it to the real nonetype
 
+    if useadvancedquant and qmf == "basic": # disable the good quantizer
+        useadvancedquant = False
+
     trans = int(trans) # compatability filter
     if trans > 2:
         raise Exception("Error: Invalid Transparency Mode!")

{apftool-1.2.1 → apftool-1.2.3}/apftool/apf2quant.py

@@ -16,9 +16,12 @@ Pipeline
 """
 import heapq
 
-import numpy as np
-from PIL import Image
-from scipy.spatial import cKDTree
+try:
+    import numpy as np
+    from PIL import Image
+    from scipy.spatial import cKDTree
+except Exception:
+    print("Error Loading numpy or scipy")
 
 # ---------------------------------------------------------------- Oklab ----
 _M1 = np.array([[0.4122214708, 0.5363325363, 0.0514459929],
@@ -233,4 +236,4 @@ def quantize_perceptual(img: Image.Image, n_colors: int, palette: list = None,
             raise ValueError("dither_mode must be 'ordered' or 'fs'")
 
     quantized = pal_rgba[idx].reshape(h, w, 4)
-    return Image.fromarray(quantized, "RGBA"), [tuple(int(v) for v in c) for c in pal_rgba]
+    return Image.fromarray(quantized, "RGBA"), [tuple(int(v) for v in c) for c in pal_rgba]

{apftool-1.2.1 → apftool-1.2.3}/apftool.egg-info/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: apftool
-Version: 1.2.1
+Version: 1.2.3
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Pillow
+Requires-Dist: psqueeze
 Dynamic: license-file
 
 # A library for converting to and from Aperture Science apf files, the custom extended apf2s, otb/wbmp images, and facedev's bruh format.
@@ -100,6 +101,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+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]
 
 1.2.0 - increase apfcli verbosity, add lossy encoding options. Allow apfcli to take its own formats as inputs and outputs, also adds a much better quantization algorithm and removes the limitations on indexed animations.

apftool-1.2.3/apftool.egg-info/requires.txt

@@ -0,0 +1,2 @@
+Pillow
+psqueeze

{apftool-1.2.1 → apftool-1.2.3}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apftool"
-version = "1.2.1"
+version = "1.2.3"
 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"
 requires-python = ">=3.10"
-dependencies = ["Pillow"]
+dependencies = ["Pillow", "psqueeze"]
 
 [project.scripts]
 apfcli = "apftool:cli"

apftool-1.2.1/apftool.egg-info/requires.txt

@@ -1 +0,0 @@
-Pillow