apftool 1.2.0__tar.gz → 1.2.2__tar.gz

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

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: apftool
-Version: 1.2.0
+Version: 1.2.2
 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.
@@ -40,9 +41,9 @@ bruh is an intentionally terrible format made by facedev. info can be found [her
 
 `apf.encode(img: bytes | Image.Image, lineskip: int = 1, findbestlineskip: bool = False, returnbytes: bool = False)` takes image bytes or pil image object and outputs apf string. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the possible max of 199 and uses the smallest one. returnbytes makes it return bytes instead of a string.
 
-`apf2.encode(img: bytes | Image.Image, lineskip: int = 1, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None)`
+`apf2.encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None, maxrunerror: float = 0, maxmotionerror: float = 0, verbose: bool = False, useadvancedquant: bool = True, dither_mode: str = "fs", compressor: str = None, wrapper: bool = True, compresslevel: int = 9)`
 
-takes image bytes or pil image object and outputs apf2 as a string or ascii bytes. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the provided lineskip and uses the smallest one. legacy uses apf1-style 2 color data instead of a 95 color palette. trans sets transparency mode, with mode 0 being off, mode 1 being index 0 transparency (GIF-like, it overrides a color), and mode 2 being indexed alpha. pal allows you to manually force a smaller or larger palette anything over 95 will use APF2-1994's Dual Indexed Mode. Prepalette is an already encoded APF2 palette you input into the encoder to make the colors deterministic. dodithering enables or disables dithering. returnbytes makes it return bytes instead of a string. These options use the APF2-2000 mode: compress - disable RLE compression, allows for smaller file sizes where RLE is not beneficial. Topside_first makes the image scan top-to-bottom, like most formats. emit_redundant_flag - adds the implicit i flag explicitally to baseline 95 color images. mode - selects apf2 coding mode [0: 2 colors, 1: 95 colors, 2: 9025 colors, 3: near-truecolor, 4: near-truecolor with alpha, 5: truecolor, 6: truecolor with alpha, 7: quantized grayscale (based on 95 color mode), 8: 8-bit grayscale (based on 9025 color mode)], combine attempts to do cross-frame delta coding. avoid_run_breaks reduces the amount of transparency pixels emitted by combine, typically harms efficiency. width and height force the output resolution of the image. if both are specified, the output is streched to the specified resolution. if only 1 is present, the other is determined based on aspect ratio. If unspecfied, no scaling happens.
+takes image bytes or pil image object and outputs apf2 as a string or ascii bytes. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the provided lineskip and uses the smallest one. legacy uses apf1-style 2 color data instead of a 95 color palette. trans sets transparency mode, with mode 0 being off, mode 1 being index 0 transparency (GIF-like, it overrides a color), and mode 2 being indexed alpha. pal allows you to manually force a smaller or larger palette anything over 95 will use APF2-1994's Dual Indexed Mode. Prepalette is an already encoded APF2 palette you input into the encoder to make the colors deterministic. dodithering enables or disables dithering. returnbytes makes it return bytes instead of a string. These options use the APF2-2000 mode: compress - disable RLE compression, allows for smaller file sizes where RLE is not beneficial. Topside_first makes the image scan top-to-bottom, like most formats. emit_redundant_flag - adds the implicit i flag explicitally to baseline 95 color images. mode - selects apf2 coding mode [0: 2 colors, 1: 95 colors, 2: 9025 colors, 3: near-truecolor, 4: near-truecolor with alpha, 5: truecolor, 6: truecolor with alpha, 7: quantized grayscale (based on 95 color mode), 8: 8-bit grayscale (based on 9025 color mode)], combine attempts to do cross-frame delta coding. avoid_run_breaks reduces the amount of transparency pixels emitted by combine, typically harms efficiency. width and height force the output resolution of the image. if both are specified, the output is streched to the specified resolution. if only 1 is present, the other is determined based on aspect ratio. If unspecfied, no scaling happens. maxrunerror and maxmotionerror control how lossy the image is, verbose increases logging output, useadvancedquant allows you to enable/disable the new quantizer, dither_mode sets its ditherer, which can be "fs" (floyd-steinberg) or "ordered" (bayer), compressor sets the apf2 post-compression algorithm (supports gzip, bzip2, and asciipak (ascii packing)). wrapper toggles wether to append an identifyable magic string to a compressed apf2. compresslevel sets the compression level for bzip2 and gzip
 
 `wbmp.encode(img: Image)` takes pil image object and outputs wbmp bytes
 
@@ -100,6 +101,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+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.
 
 1.1.3 - add version field, add width and height options to apf2 encoding

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

@@ -29,9 +29,9 @@ bruh is an intentionally terrible format made by facedev. info can be found [her
 
 `apf.encode(img: bytes | Image.Image, lineskip: int = 1, findbestlineskip: bool = False, returnbytes: bool = False)` takes image bytes or pil image object and outputs apf string. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the possible max of 199 and uses the smallest one. returnbytes makes it return bytes instead of a string.
 
-`apf2.encode(img: bytes | Image.Image, lineskip: int = 1, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None)`
+`apf2.encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None, maxrunerror: float = 0, maxmotionerror: float = 0, verbose: bool = False, useadvancedquant: bool = True, dither_mode: str = "fs", compressor: str = None, wrapper: bool = True, compresslevel: int = 9)`
 
-takes image bytes or pil image object and outputs apf2 as a string or ascii bytes. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the provided lineskip and uses the smallest one. legacy uses apf1-style 2 color data instead of a 95 color palette. trans sets transparency mode, with mode 0 being off, mode 1 being index 0 transparency (GIF-like, it overrides a color), and mode 2 being indexed alpha. pal allows you to manually force a smaller or larger palette anything over 95 will use APF2-1994's Dual Indexed Mode. Prepalette is an already encoded APF2 palette you input into the encoder to make the colors deterministic. dodithering enables or disables dithering. returnbytes makes it return bytes instead of a string. These options use the APF2-2000 mode: compress - disable RLE compression, allows for smaller file sizes where RLE is not beneficial. Topside_first makes the image scan top-to-bottom, like most formats. emit_redundant_flag - adds the implicit i flag explicitally to baseline 95 color images. mode - selects apf2 coding mode [0: 2 colors, 1: 95 colors, 2: 9025 colors, 3: near-truecolor, 4: near-truecolor with alpha, 5: truecolor, 6: truecolor with alpha, 7: quantized grayscale (based on 95 color mode), 8: 8-bit grayscale (based on 9025 color mode)], combine attempts to do cross-frame delta coding. avoid_run_breaks reduces the amount of transparency pixels emitted by combine, typically harms efficiency. width and height force the output resolution of the image. if both are specified, the output is streched to the specified resolution. if only 1 is present, the other is determined based on aspect ratio. If unspecfied, no scaling happens.
+takes image bytes or pil image object and outputs apf2 as a string or ascii bytes. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the provided lineskip and uses the smallest one. legacy uses apf1-style 2 color data instead of a 95 color palette. trans sets transparency mode, with mode 0 being off, mode 1 being index 0 transparency (GIF-like, it overrides a color), and mode 2 being indexed alpha. pal allows you to manually force a smaller or larger palette anything over 95 will use APF2-1994's Dual Indexed Mode. Prepalette is an already encoded APF2 palette you input into the encoder to make the colors deterministic. dodithering enables or disables dithering. returnbytes makes it return bytes instead of a string. These options use the APF2-2000 mode: compress - disable RLE compression, allows for smaller file sizes where RLE is not beneficial. Topside_first makes the image scan top-to-bottom, like most formats. emit_redundant_flag - adds the implicit i flag explicitally to baseline 95 color images. mode - selects apf2 coding mode [0: 2 colors, 1: 95 colors, 2: 9025 colors, 3: near-truecolor, 4: near-truecolor with alpha, 5: truecolor, 6: truecolor with alpha, 7: quantized grayscale (based on 95 color mode), 8: 8-bit grayscale (based on 9025 color mode)], combine attempts to do cross-frame delta coding. avoid_run_breaks reduces the amount of transparency pixels emitted by combine, typically harms efficiency. width and height force the output resolution of the image. if both are specified, the output is streched to the specified resolution. if only 1 is present, the other is determined based on aspect ratio. If unspecfied, no scaling happens. maxrunerror and maxmotionerror control how lossy the image is, verbose increases logging output, useadvancedquant allows you to enable/disable the new quantizer, dither_mode sets its ditherer, which can be "fs" (floyd-steinberg) or "ordered" (bayer), compressor sets the apf2 post-compression algorithm (supports gzip, bzip2, and asciipak (ascii packing)). wrapper toggles wether to append an identifyable magic string to a compressed apf2. compresslevel sets the compression level for bzip2 and gzip
 
 `wbmp.encode(img: Image)` takes pil image object and outputs wbmp bytes
 
@@ -89,6 +89,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+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.
 
 1.1.3 - add version field, add width and height options to apf2 encoding

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

@@ -6,6 +6,7 @@ from .apfcli import main as cli
 extensions = (".apf", ".apf2", ".aif", ".af2", ".ap2", ".aif2", ".a2k", ".ap2k")
 extensions_apf = (".apf", ".aif")
 extensions_apf2 = (".apf2", ".af2", ".ap2", ".aif2", ".a2k", ".ap2k")
+extensions_capf2 = (".a2g", ".a2c", ".a2ci", ".apc", ".aq2", ".aqf", ".a2b")
 extensions_wbmp = (".wbmp", ".wbitmap", ".wbm")
 extensions_otb = (".otb", ".ota", ".otab")
 extensions_bruh = (".bruh", ".brh")
@@ -13,10 +14,10 @@ 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.0"
+version = "1.2.2"
 
 extensions_all = []
-extensions_all.extend(extensions_apf+extensions_apf2+extensions_wbmp+extensions_otb+extensions_bruh+extensions_mqif)
+extensions_all.extend(extensions_apf+extensions_apf2+extensions_capf2+extensions_wbmp+extensions_otb+extensions_bruh+extensions_mqif)
 
 def decode(data, format: str = None, returnImageObject: bool = False, provide_extra_data=True):
     if isinstance(data, str):
@@ -25,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) '): # 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)
@@ -60,7 +61,7 @@ def decode(data, format: str = None, returnImageObject: bool = False, provide_ex
             return otb.decode(data, format, returnImageObject) # assume otb if it doesnt look like a wbmp or doesnt taste like a bruh
 
         else:
-            Exception(f"decoding failed! {e}. this likely means the format isnt supported by apftool.")
+            Exception(f"decoding failed!. this likely means the format isnt supported by apftool.")
 
     else:
         raise Exception("Invalid data! Must be bytes or str")

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

@@ -1,6 +1,15 @@
 from PIL import Image, ImageSequence
 from collections import Counter
-import io, textwrap, math
+import io, textwrap, math, squeeze
+
+compressgood = False
+
+from . import asciipak
+try:
+    import gzip, bz2
+    compressgood = True
+except Exception as e:
+    print(f"Importing gzip or bz2 failed, compression will be limited to ascii packing\n{e}")
 
 qmf = "basic"
 
@@ -25,6 +34,10 @@ def quant_to_base95(g: int):
 mapping = []
 for i in range(256):
     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
@@ -72,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
-
-    split_points = []
-
-    for n in range(0, leng, datlen):
-        split_points.append(data[n:(n+datlen)])
-
-    if trunc:
-        split_points.pop(-1)
+        leng -= leng % datlen
 
-    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
@@ -147,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)
@@ -167,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
@@ -184,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
@@ -199,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:
@@ -334,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):
@@ -390,7 +394,34 @@ def diff_images(base, overlay, magenter = False):
 
 def decode(apf2: str | bytes, format: str = 'PNG', returnImageObject: bool = False, provide_extra_data: bool = False, composite_layers: bool = True):
     if type(apf2) == bytes:
-        apf2 = apf2.decode("ascii")
+        if apf2.startswith(b"APF2"):
+            compressed_blob = apf2[6:]
+            alg = apf2[4:6]
+            if alg == b'b2':
+                apf2 = bz2.decompress(compressed_blob)
+            elif alg == b'gz':
+                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")
+        elif apf2.startswith(b'BZh'):
+            apf2 = bz2.decompress(apf2)
+            apf2 = apf2.decode("ascii")
+        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")
+        else: # also add the check for unwrapped gzip/bzip2 apf2 here
+            apf2 = apf2.decode("ascii")
 
     apf_list = apf2.splitlines()
     apf_lines = []
@@ -762,7 +793,7 @@ def generate_runs_apf2_l(bitmap: list, lineskip: int, w: int, h: int, topside_fi
 
 def uint8_to_base95_with_corrector(val):
     d = mapping[val]
-    c = mapping.index(d)
+    c = mapping_invert[d]
     e = val - c
     return d, e
 
@@ -1159,12 +1190,24 @@ def encode_wrapper(legacy, bitmaps, gray, truecolor, lineskip, w, h, topside_fir
 
     return output, apf2pal
 
-def encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None, maxrunerror: float = 0, maxmotionerror: float = 0, verbose: bool = False, useadvancedquant: bool = True, dither_mode: str = "fs"):
+def encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None, maxrunerror: float = 0, maxmotionerror: float = 0, verbose: bool = False, useadvancedquant: bool = True, dither_mode: str = "fs", compressor: str = None, wrapper: bool = True, compresslevel: int = 9):
     frametiming = None
     bakedpal = None
     dim = False
     transmag = False
 
+    if not compressor in (None, "none", "bzip2", "gzip", "asciipak", "squeeze"):
+        raise Exception('Error: Invalid Compressor! Options: none, bzip2, gzip, asciipak, squeeze')
+
+    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!")
@@ -1476,7 +1519,27 @@ def encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: boo
         print(f"APF2 Version: {version}")
         print(f"APF2 Header Line: {apflist[1]}")
 
-    if returnbytes:
-        return apftext.encode()
+    if compressor is None:
+        if returnbytes:
+            return apftext.encode()
+        else:
+            return apftext
     else:
-        return apftext
+        apfbin = apftext.encode()
+        #  "none", "bzip2", "gzip", "asciipak", "squeeze"
+        wraphead = b"APF2"
+        if compressor == "bzip2":
+            apfbin_c = bz2.compress(apfbin, compresslevel=compresslevel)
+            wraphead+=b"b2"
+        elif compressor == "gzip":
+            apfbin_c = gzip.compress(apfbin, compresslevel=compresslevel)
+            wraphead+=b"gz"
+        elif compressor == "squeeze":
+            apfbin_c = squeeze.compress(apfbin)
+            wraphead+=b"sq"
+        else:
+            apfbin_c = asciipak.compress(apfbin)
+            wraphead+=b"ci"
+        if wrapper:
+            apfbin_c = wraphead+apfbin_c
+        return apfbin_c

{apftool-1.2.0 → apftool-1.2.2}/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.0 → apftool-1.2.2}/apftool/apfcli.py

@@ -36,6 +36,9 @@ encoding:
 --quality=INT - (APF2) (0 to 100) sets both --run-quality and --motion-quality [Alias: -Q=INT]
 --pillow - (APF2) use pillow's quantizer [Alias: -P]
 --bayer - (APF2) use faster bayer/ordered dithering for perceptual mode instead of the slower, but prettier floyd-steinberg
+--compressor=[bzip2, gzip, asciipak, none] - (APF2) set APF2 post-compressor
+--compresslevel=[1-9] - (APF2) set compression level for apf2 compressor (gzip/bzip2) (default: 9)
+--nowrap - (APF2) disable the Compressed APF2 wrapper on compressed APF2 Files
 --mode=INT - (APF2) color mode (specified in A2K) for APF2. [Alias: -M=INT]
     0 - 2 colors
     1 - 95 colors
@@ -75,12 +78,12 @@ TODO: MQIF encoding
     lineskip = None
     dither = False
     description = ""
-    if opext in apftool.extensions_apf2:
-        wid = None
-        hei = None
-    else:
+    if opext in apftool.extensions_otb:
         wid = 255
         hei = 255
+    else:
+        wid = None
+        hei = None
     transcolor = None
     flip = False
     compress = True
@@ -91,6 +94,9 @@ TODO: MQIF encoding
     maxrunerror = 0
     useadvancedquant = True
     dither_mode = "fs"
+    compressor = None
+    wrapper = True
+    compresslevel = 9
     if args:
         if "--findbestlineskip" in args:
             fbls = True
@@ -114,6 +120,8 @@ TODO: MQIF encoding
             useadvancedquant = False
         if "--bayer" in args:
             dither_mode = "ordered"
+        if "--nowrap" in args:
+            wrapper = False
         for arg in args:
             if arg.startswith("--desc=") or arg.startswith("-D="):
                 description = arg.replace("--desc=", "").replace("-D=", "")
@@ -131,10 +139,11 @@ TODO: MQIF encoding
             if arg.startswith("--height=") or arg.startswith("-H="):
                 hei = int(arg.replace("--height=", "").replace("-H=", ""))
 
-            if arg.startswith("--mode="):
-                mode = int(arg.replace("--mode=", ""))
-            if arg.startswith("-M="):
-                mode = int(arg.replace("-M=", ""))
+            if arg.startswith("--mode=") or arg.startswith("-M="):
+                mode = int(arg.replace("--mode=", "").replace("-M=", ""))
+
+            if arg.startswith("--compresslevel="):
+                compresslevel = int(arg.replace("--compresslevel=", ""))
 
             if arg.startswith("--quality=") or arg.startswith("-Q="):
                 qual = int(arg.replace("--quality=", "").replace("-Q=", ""))/2
@@ -156,6 +165,9 @@ TODO: MQIF encoding
                 tcb = int(transcolor_hex[4:6], 16)
                 transcolor = (tcr, tcg, tcb)
 
+            if arg.startswith("--compressor="):
+                compressor = arg.replace("--compressor=", "")
+
         if mode is None:
             if maxpalette > 9025 and 857375 >= maxpalette:
                 maxpalette = 95
@@ -203,8 +215,8 @@ TODO: MQIF encoding
         elif opext in apftool.extensions_mqif:
             encoded = apftool.mqif.encode(img_bytes, transcolor)
 
-        elif opext in apftool.extensions_apf2:
-            encoded = apftool.apf2.encode(img_bytes, lineskip=lineskip, findbestlineskip=fbls, legacy=legacy, trans=trans, pal=maxpalette, desc=description, prepalette= None, dodithering=dither, returnbytes=True, compress=compress, topside_first=flip, mode=mode, combine=combine, avoid_run_breaks=avoid_run_breaks, width=wid, height=hei, maxrunerror = maxrunerror, maxmotionerror = maxmotionerror, verbose = True, useadvancedquant=useadvancedquant, dither_mode=dither_mode)
+        elif opext in apftool.extensions_apf2 or opext in apftool.extensions_capf2:
+            encoded = apftool.apf2.encode(img_bytes, lineskip=lineskip, findbestlineskip=fbls, legacy=legacy, trans=trans, pal=maxpalette, desc=description, prepalette= None, dodithering=dither, returnbytes=True, compress=compress, topside_first=flip, mode=mode, combine=combine, avoid_run_breaks=avoid_run_breaks, width=wid, height=hei, maxrunerror = maxrunerror, maxmotionerror = maxmotionerror, verbose = True, useadvancedquant=useadvancedquant, dither_mode=dither_mode, compressor=compressor, wrapper=wrapper, compresslevel=compresslevel)
 
         else:
             raise ValueError("Unsupported Image Format!")

apftool-1.2.2/apftool/asciipak.py

@@ -0,0 +1,27 @@
+from .bittools import byte_to_boollist, boollist_to_int_var
+
+def compress(inpt: bytes):
+    buffr = []
+    output = bytearray()
+    for byte in inpt:
+        buffr.extend(byte_to_boollist(byte)[1:])
+        if len(buffr) >= 8:
+            output.append(boollist_to_int_var(buffr[0:8]))
+            buffr = buffr[8:]
+    if buffr:
+        while len(buffr) < 8:
+            buffr.append(False)
+        output.append(boollist_to_int_var(buffr))
+    return output
+
+def decompress(inpt: bytes):
+    buffr = []
+    output = bytearray()
+    for byte in inpt:
+        buffr.extend(byte_to_boollist(byte))
+        while len(buffr) >= 8:
+            v = boollist_to_int_var([0]+buffr[0:7])
+            if v:
+                output.append(v)
+            buffr = buffr[7:]
+    return output

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

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: apftool
-Version: 1.2.0
+Version: 1.2.2
 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.
@@ -40,9 +41,9 @@ bruh is an intentionally terrible format made by facedev. info can be found [her
 
 `apf.encode(img: bytes | Image.Image, lineskip: int = 1, findbestlineskip: bool = False, returnbytes: bool = False)` takes image bytes or pil image object and outputs apf string. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the possible max of 199 and uses the smallest one. returnbytes makes it return bytes instead of a string.
 
-`apf2.encode(img: bytes | Image.Image, lineskip: int = 1, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None)`
+`apf2.encode(img: bytes | Image.Image, lineskip: int = None, findbestlineskip: bool = False, legacy: bool = False, trans = False, pal: int = 95, desc: str = "", prepalette: str = None, dodithering: bool = False, returnbytes: bool = False, compress: bool = True, topside_first: bool = False, emit_redundant_flag: bool = False, mode: int = None, combine: bool = False, avoid_run_breaks: bool = False, width: int = None, height: int = None, maxrunerror: float = 0, maxmotionerror: float = 0, verbose: bool = False, useadvancedquant: bool = True, dither_mode: str = "fs", compressor: str = None, wrapper: bool = True, compresslevel: int = 9)`
 
-takes image bytes or pil image object and outputs apf2 as a string or ascii bytes. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the provided lineskip and uses the smallest one. legacy uses apf1-style 2 color data instead of a 95 color palette. trans sets transparency mode, with mode 0 being off, mode 1 being index 0 transparency (GIF-like, it overrides a color), and mode 2 being indexed alpha. pal allows you to manually force a smaller or larger palette anything over 95 will use APF2-1994's Dual Indexed Mode. Prepalette is an already encoded APF2 palette you input into the encoder to make the colors deterministic. dodithering enables or disables dithering. returnbytes makes it return bytes instead of a string. These options use the APF2-2000 mode: compress - disable RLE compression, allows for smaller file sizes where RLE is not beneficial. Topside_first makes the image scan top-to-bottom, like most formats. emit_redundant_flag - adds the implicit i flag explicitally to baseline 95 color images. mode - selects apf2 coding mode [0: 2 colors, 1: 95 colors, 2: 9025 colors, 3: near-truecolor, 4: near-truecolor with alpha, 5: truecolor, 6: truecolor with alpha, 7: quantized grayscale (based on 95 color mode), 8: 8-bit grayscale (based on 9025 color mode)], combine attempts to do cross-frame delta coding. avoid_run_breaks reduces the amount of transparency pixels emitted by combine, typically harms efficiency. width and height force the output resolution of the image. if both are specified, the output is streched to the specified resolution. if only 1 is present, the other is determined based on aspect ratio. If unspecfied, no scaling happens.
+takes image bytes or pil image object and outputs apf2 as a string or ascii bytes. lineskip is interleave value, findbestlineskip brute-forces different interleave values to the provided lineskip and uses the smallest one. legacy uses apf1-style 2 color data instead of a 95 color palette. trans sets transparency mode, with mode 0 being off, mode 1 being index 0 transparency (GIF-like, it overrides a color), and mode 2 being indexed alpha. pal allows you to manually force a smaller or larger palette anything over 95 will use APF2-1994's Dual Indexed Mode. Prepalette is an already encoded APF2 palette you input into the encoder to make the colors deterministic. dodithering enables or disables dithering. returnbytes makes it return bytes instead of a string. These options use the APF2-2000 mode: compress - disable RLE compression, allows for smaller file sizes where RLE is not beneficial. Topside_first makes the image scan top-to-bottom, like most formats. emit_redundant_flag - adds the implicit i flag explicitally to baseline 95 color images. mode - selects apf2 coding mode [0: 2 colors, 1: 95 colors, 2: 9025 colors, 3: near-truecolor, 4: near-truecolor with alpha, 5: truecolor, 6: truecolor with alpha, 7: quantized grayscale (based on 95 color mode), 8: 8-bit grayscale (based on 9025 color mode)], combine attempts to do cross-frame delta coding. avoid_run_breaks reduces the amount of transparency pixels emitted by combine, typically harms efficiency. width and height force the output resolution of the image. if both are specified, the output is streched to the specified resolution. if only 1 is present, the other is determined based on aspect ratio. If unspecfied, no scaling happens. maxrunerror and maxmotionerror control how lossy the image is, verbose increases logging output, useadvancedquant allows you to enable/disable the new quantizer, dither_mode sets its ditherer, which can be "fs" (floyd-steinberg) or "ordered" (bayer), compressor sets the apf2 post-compression algorithm (supports gzip, bzip2, and asciipak (ascii packing)). wrapper toggles wether to append an identifyable magic string to a compressed apf2. compresslevel sets the compression level for bzip2 and gzip
 
 `wbmp.encode(img: Image)` takes pil image object and outputs wbmp bytes
 
@@ -100,6 +101,10 @@ apftool provides many extensions tuples:
 
 ## changelog:
 
+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.
 
 1.1.3 - add version field, add width and height options to apf2 encoding

{apftool-1.2.0 → apftool-1.2.2}/apftool.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ apftool/apf.py
 apftool/apf2.py
 apftool/apf2quant.py
 apftool/apfcli.py
+apftool/asciipak.py
 apftool/bittools.py
 apftool/bruh.py
 apftool/mqif.py

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

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

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

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apftool"
-version = "1.2.0"
+version = "1.2.2"
 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.0/apftool.egg-info/requires.txt

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