p3 format (RGB ascii) working

Author: Matt Land

adafruit_imageload/pnm/ppm/__init__.py

@@ -33,28 +33,26 @@
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
 
-import math
-
 
 def load(file, magic_number, header, 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]
-    max_colors = (header[2] + 1) ** 3
+
     # TODO: This needs to be different most likely?
-    colors = math.log(header[2], 2)
-    bitmap = bitmap(width, height, int(colors))
-    palette = None
+    #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
+        )
 
     if bitmap:
-        if magic_number == b"P3":
-            # This is ascii
-            from . import ppm_ascii
 
-            return ppm_ascii.load(
-                file, width, height, max_colors, bitmap=bitmap, palette=None
-            )
 
         minimum_color_depth = 1
         while max_colors > 2 ** minimum_color_depth:

adafruit_imageload/pnm/ppm/ppm_ascii.py

@@ -33,37 +33,58 @@
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
 
-import struct
 
+def load(file, width, height, bitmap=None, palette=None):
+    """
+
+    :param stream file: infile with the position set at start of data
+    :param int width:
+    :param int height:
+    :param int max_colors: color space of file
+    :param bitmap: displayio.Bitmap class
+    :param palette: displayio.Palette class
+    :return:
+    """
+    palette_colors = set()
+    data_start = file.tell()
+    triplet = []
+    color = bytearray()
+    while True:  # scan for all colors present in the file
+        # read values from file, values can be string len 1-3 for values 0 - 255
+        this_byte = file.read(1)
+        if this_byte == b'':
+            break
+        if not this_byte.isdigit():  # completed one number
+            triplet.append(int("".join(["%c" % char for char in color])))
+            color = bytearray()
+            if len(triplet) == 3:
+                palette_colors.add(tuple(triplet))
+                triplet = []
+            continue
+        color += this_byte
+    if palette:
+        palette = palette(len(palette_colors))
+        for counter, color in enumerate(palette_colors):
+            palette[counter] = bytes(color)
 
-def load(file, width, height, max_colors, bitmap=None, palette=None):
-    """Load an ascii ppm into the Bitmap object"""
     if bitmap:
+        file.seek(data_start)
+        bitmap = bitmap(width, height, len(palette_colors))
+        palette_colors = list(palette_colors)
         for y in range(height):
-            offset = y * width
             for x in range(width):
                 triplet = []
                 color = bytearray()
                 while True:
-                    if len(triplet) == 3:
-                        break
                     this_byte = file.read(1)
-                    if this_byte.isdigit():
-                        color += this_byte
-                    else:
-                        triplet.append(color)
+
+                    if not this_byte.isdigit():  # completed one number
+                        triplet.append(int("".join(["%c" % char for char in color])))
                         color = bytearray()
+                        if len(triplet) == 3:  # completed one pixel
+                            bitmap[x, y] = palette_colors.index(tuple(triplet))
+                            break
                         continue
-                pixel = bytearray(3)
-                # This just became 8-bit only...
-                struct.pack_into(
-                    "BBB",
-                    pixel,
-                    0,
-                    int("".join(["%c" % char for char in triplet[0]])),
-                    int("".join(["%c" % char for char in triplet[1]])),
-                    int("".join(["%c" % char for char in triplet[2]])),
-                )
-                bitmap[offset + x] = int.from_bytes(pixel, "little")
+                    color += this_byte
 
     return bitmap, palette

adafruit_imageload/tests/test_ppm_load.py

@@ -17,16 +17,19 @@ def test_load_works_p3_ascii(self):
             "images",
             "netpbm_p3_rgb_ascii.ppm",
         )
-        with open(test_file, "rb") as f:
+        with open(test_file, "rb") as file:
             bitmap, palette = pnm.load(
-                f, b"P3", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface
+                file, b"P3", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface
             )
+
+        self.assertTrue(isinstance(palette, Palette_C_Interface))
+        self.assertEqual(6, palette.num_colors)
+        #self.fail(str(palette))
         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()
-        str(bitmap)
         palette.validate()
 
     def test_load_works_p6_binary(self):

docs/pbm_test_code.py

@@ -28,7 +28,9 @@
 display.show(splash)
 #image = "images/netpbm_p1_mono_ascii.pbm"
 #image = "images/netpbm_p4_mono_binary.pbm"
-image = "images/netpbm_p2_ascii.pgm"
+#image = "images/netpbm_p2_ascii.pgm"
+#image = "images/netpbm_p5_binary.pgm"
+image = "images/netpbm_p3_rgb_ascii.ppm"
 
 bitmap, palette = adafruit_imageload.load(
     image, bitmap=displayio.Bitmap, palette=displayio.Palette