working P6 format

Author: Matt Land

adafruit_imageload/pnm/__init__.py

@@ -91,9 +91,14 @@ def load(file, header, *, bitmap=None, palette=None):
 
         return pgm.load(file, magic_number, pnm_header, bitmap=bitmap, palette=palette)
 
-    if magic_number.startswith(b"P3") or magic_number.startswith(b"P6"):
-        from . import ppm
+    if magic_number.startswith(b"P3"):
+        from . import ppm_ascii
 
-        return ppm.load(file, magic_number, pnm_header, bitmap=bitmap, palette=palette)
+        return ppm_ascii.load(file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette)
+
+    if magic_number.startswith(b"P6"):
+        from . import ppm_binary
+
+        return ppm_binary.load(file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette)
 
     raise RuntimeError("Unsupported image format")

adafruit_imageload/pnm/ppm/ppm_ascii.py adafruit_imageload/pnm/ppm_ascii.pyadafruit_imageload/pnm/ppm/ppm_ascii.py renamed to adafruit_imageload/pnm/ppm_ascii.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_imageload.pnm.ppm.ppm_ascii`
+`adafruit_imageload.pnm.ppm_ascii`
 ====================================================
 
 Load pixel values (indices or colors) into a bitmap and for an ascii ppm,

adafruit_imageload/pnm/ppm/__init__.py adafruit_imageload/pnm/ppm_binary.pyadafruit_imageload/pnm/ppm/__init__.py renamed to adafruit_imageload/pnm/ppm_binary.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_imageload.pnm.ppm`
+`adafruit_imageload.pnm.ppm_binary`
 ====================================================
 
 Load pixel values (indices or colors) into a bitmap and for a binary ppm,
@@ -34,47 +34,36 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
 
 
-def load(file, magic_number, header, bitmap=None, palette=None):
+def load(file, width, height, bitmap=None, palette=None):
     """Load pixel values (indices or colors) into a bitmap and for a binary
     ppm, return None for pallet."""
-    width = header[0]
-    height = header[1]
-
-    # TODO: This needs to be different most likely?
-    #colors = math.log(header[2], 2)
-    #bitmap = bitmap(width, height, int(colors))
-    if magic_number == b"P3":
-        # This is ascii
-        from . import ppm_ascii
-
-        return ppm_ascii.load(
-            file, width, height, bitmap=bitmap, palette=palette
-        )
 
+    data_start = file.tell()
+    palette_colors = set()
+    line_size = width * 3
+
+    for y in range(height):
+        data_line = iter(bytes(file.read(line_size)))
+        for red in data_line:
+            green = next(data_line)
+            blue = next(data_line)
+            palette_colors.add((red, green, blue))
+
+    if palette:
+        palette = palette(len(palette_colors))
+        for counter, color in enumerate(palette_colors):
+            palette[counter] = bytes(color)
     if bitmap:
-
-
-        minimum_color_depth = 1
-        while max_colors > 2 ** minimum_color_depth:
-            minimum_color_depth *= 2
-
-        # This seems maybe right?
-        line_size = width * 3
-
-        chunk = bytearray(line_size)
-
+        bitmap = bitmap(width, height, len(palette_colors))
+        file.seek(data_start)
+        palette_colors = list(palette_colors)
         for y in range(height):
-            file.readinto(chunk)
-            # Division by zero!
-            pixels_per_byte = 8 // max_colors
-            offset = y * width
-
-            for x in range(width):
-                # This math is clearly wrong and was just copied in from the PR
-                i = x // pixels_per_byte
-                pixel = (
-                    chunk[i] >> (8 - max_colors * (x % pixels_per_byte + 1))
-                ) & ((1 << minimum_color_depth) - 1)
-                bitmap[offset + x] = pixel
+            x = 0
+            data_line = iter(bytes(file.read(line_size)))
+            for red in data_line:
+                green = next(data_line)
+                blue = next(data_line)
+                bitmap[x,y] = palette_colors.index((red, green, blue))
+                x += 1
 
     return bitmap, palette

adafruit_imageload/tests/test_ppm_load.py

@@ -46,7 +46,7 @@ def test_load_works_p6_binary(self):
                 f, b"P6", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface
             )
         self.assertTrue(isinstance(bitmap, Bitmap_C_Interface), bitmap)
-        self.assertEqual(16777216, bitmap.colors)
+        self.assertEqual(6, bitmap.colors)
         self.assertEqual(16, bitmap.width)
         self.assertEqual(16, bitmap.height)
         bitmap.validate()

docs/pbm_test_code.py

@@ -30,7 +30,8 @@
 #image = "images/netpbm_p4_mono_binary.pbm"
 #image = "images/netpbm_p2_ascii.pgm"
 #image = "images/netpbm_p5_binary.pgm"
-image = "images/netpbm_p3_rgb_ascii.ppm"
+#image = "images/netpbm_p3_rgb_ascii.ppm"
+image = "images/netpbm_p6_binary.ppm"
 
 bitmap, palette = adafruit_imageload.load(
     image, bitmap=displayio.Bitmap, palette=displayio.Palette