Merge remote-tracking branch 'origin/master' into ppm

Author: bstorm

.gitignore

@@ -4,3 +4,6 @@ _build
 .env
 build*
 bundles
+.idea/
+venv/
+

adafruit_imageload/pnm/__init__.py

@@ -41,9 +41,7 @@ def load(f, header, *, bitmap=None, palette=None):
     while True:
         # We have all we need at length 3
         if len(pnm_header) == 3:
-            test_byte = f.read(1)
-            if test_byte.isdigit():
-                raise RuntimeError("Not supporting 16-bit colors at this time")
+            f.read(1)
             break
         if magic_number.startswith(b"P1") or magic_number.startswith(b"P4"):
             if len(pnm_header) == 2:
@@ -57,13 +55,22 @@ def load(f, header, *, bitmap=None, palette=None):
         next_byte = f.read(1)
         if next_byte == b"#":
             while True:
-                f.read(1)
+                next_byte = f.read(1)
                 if not next_byte:
                     raise RuntimeError("Unsupported image format")
-                if next_byte != b"\n":
+                if next_byte == b"\n":
                     break
         if next_byte.isdigit():
-            pnm_header.append(int.from_bytes(next_byte, "big"))
+            value = bytearray()
+            while True:
+                if not next_byte.isdigit():
+                    break
+                value += next_byte
+                next_byte = f.read(1)
+                if not next_byte:
+                    raise RuntimeError("Unsupported image format")
+
+            pnm_header.append(int(value))
             continue
 
         if not next_byte:

examples/images/netpbm_p1_mono.pbm

@@ -0,0 +1,24 @@
+P1
+# This is an example bitmap of the letter "J" in a 2x2 grid
+13 21
+0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 1 0 0 0 1 0 1 0 0 0 1 0
+0 0 1 1 1 0 0 0 1 1 1 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 0 0 0 0 1 0 0 0 0 0 1 0
+0 1 0 0 0 1 0 1 0 0 0 1 0
+0 0 1 1 1 0 0 0 1 1 1 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0