Place saving update

- Bitmap is seemingly working
- Palette is not working
- Ascii might have broke? going to do more testing later.

Author: Errolyn

adafruit_imageload/pnm/pgm/__init__.py

@@ -28,7 +28,7 @@
 * Author(s): Matt Land, Brooke Storm, Sam McGahan
 
 """
-
+#import logging
 
 def load(file, magic_number, header, *, bitmap=None, palette=None):
     # TODO: remove unused variables later
@@ -50,14 +50,15 @@ def load(file, magic_number, header, *, bitmap=None, palette=None):
             for x in range(width):
             # Takes int and converts to an 8 bit
                 while True:
-                    bit = file.read(1)  # type: byte
-                    if not bit.isdigit():
+                    byte = file.read(1)  # type: byte
+                    if not byte.isdigit():
                         break
-                    pixel += bit
+                    pixel += byte
 
                 int_pixel = int("".join(["%c" % char for char in pixel]))
                 bitmap[x, y] = int_pixel
                 colors.add(int_pixel)
+                # logging.info(f'{x}, {y}, {byte}, {int_pixel}')
         if palette:
             palette = palette(len(colors))
             for counter, color in enumerate(colors):
@@ -71,10 +72,13 @@ def load(file, magic_number, header, *, bitmap=None, palette=None):
     if magic_number == b'P5': # To handle binary PGM files.
         for y in range(height):
             for x in range(width):
-                bit = file.read(2)
-                if not bit.isdigit():
+                byte = file.read(1)
+                if byte == b"":
                     raise ValueError("ran out of file unexpectedly")
-                bitmap[x, y] = bit
+                int_pixel = int.from_bytes(byte, "little")
+                bitmap[x, y] = int_pixel
+                colors.add(int_pixel)
+
 
         if palette:
             palette = palette(len(colors))
@@ -86,7 +90,4 @@ def load(file, magic_number, header, *, bitmap=None, palette=None):
 
         return bitmap, palette
 
-
-
-
     raise NotImplementedError("Was not able to send image")

adafruit_imageload/tests/test_pnm_load.py

@@ -180,7 +180,9 @@ def test_load_works_p5_binary(self):
         self.assertEqual(8, bitmap.width)
         self.assertEqual(8, bitmap.height)
         bitmap.validate()
-        self.assertEqual(6, palette.colors)
+        self.assertEqual(8, palette.num_colors)
+        
+
 
 
 class TestPnmLoad(TestCase):