Merge branch 'feature-tests' of https://github.com/crookedstorm/Adafruit_CircuitPython_ImageLoad into Riddlerat/pgm-work

Author: Errolyn

adafruit_imageload/__init__.py

@@ -42,16 +42,15 @@ def load(filename, *, bitmap=None, palette=None):
        palette is the desired pallete type. The constructor should take the number of colors and
        support assignment to indices via [].
     """
-    with open(filename, "rb") as f:
-        header = f.read(3)
-        f.seek(0)
+    with open(filename, "rb") as file:
+        header = file.read(3)
+        file.seek(0)
         if header.startswith(b"BM"):
             from . import bmp
-
-            return bmp.load(f, bitmap=bitmap, palette=palette)
+            return bmp.load(file, bitmap=bitmap, palette=palette)
         elif header.startswith(b"P"):
             from . import pnm
 
-            return pnm.load(f, header, bitmap=bitmap, palette=palette)
+            return pnm.load(file, header, bitmap=bitmap, palette=palette)
         else:
             raise RuntimeError("Unsupported image format")

adafruit_imageload/pnm/__init__.py

@@ -33,27 +33,39 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
 
 
-def load(f, header, *, bitmap=None, palette=None):
+def load(file, header, *, bitmap=None, palette=None):
     # Read the header
     magic_number = header[:2]
-    f.seek(2)
+    file.seek(2)
     pnm_header = []
     while True:
         # We have all we need at length 3
         if len(pnm_header) == 3:
             break
-        if magic_number.startswith(b"P1") or magic_number.startswith(b"P4"):
-            if len(pnm_header) == 2:
-                from . import pbm
+        if len(pnm_header) == 2 and (
+            magic_number.startswith(b"P1") or magic_number.startswith(b"P4")
+        ):
+            bitmap = bitmap(pnm_header[0], pnm_header[1], 1)
+            if palette:
+                palette = palette(1)
+                palette[0] = 0xFFFFFF
+            if magic_number.startswith(b"P1"):
+                from . import pbm_ascii
 
-                return pbm.load(
-                    f, magic_number, pnm_header, bitmap=bitmap, palette=palette
+                return pbm_ascii.load(
+                    file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
                 )
 
-        next_byte = f.read(1)
+            from . import pbm_binary
+
+            return pbm_binary.load(
+                file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
+            )
+
+        next_byte = file.read(1)
         if next_byte == b"#":
             while True:
-                next_byte = f.read(1)
+                next_byte = file.read(1)
                 if not next_byte:
                     raise RuntimeError("Unsupported image format")
                 if next_byte == b"\n":
@@ -64,7 +76,7 @@ def load(f, header, *, bitmap=None, palette=None):
                 if not next_byte.isdigit():
                     break
                 value += next_byte
-                next_byte = f.read(1)
+                next_byte = file.read(1)
                 if not next_byte:
                     raise RuntimeError("Unsupported image format")
 
@@ -77,15 +89,11 @@ def load(f, header, *, bitmap=None, palette=None):
     if magic_number.startswith(b"P2") or magic_number.startswith(b"P5"):
         from . import pgm
 
-        return pgm.load(
-            f, magic_number, pnm_header, bitmap=bitmap, palette=palette
-        )
+        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
 
-        return ppm.load(
-            f, magic_number, pnm_header, bitmap=bitmap, palette=palette
-        )
+        return ppm.load(file, magic_number, pnm_header, bitmap=bitmap, palette=palette)
 
     raise RuntimeError("Unsupported image format")

adafruit_imageload/pnm/pbm/__init__.py

@@ -0,0 +1,52 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2018 Scott Shawcroft for Adafruit Industries LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+"""
+`adafruit_imageload.pnm.pbm.ascii`
+====================================================
+
+Load pixel values (indices or colors) into a bitmap and for an ascii ppm,
+return None for pallet.
+
+* Author(s):  Matt Land, Brooke Storm, Sam McGahan
+
+"""
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
+
+
+def load(file, width, height, bitmap=None, palette=None):
+    """
+    Load a P1 'PBM' ascii image into the displayio.Bitmap
+    """
+    next_byte = True
+    for y in range(height):
+        x = 0
+        while next_byte:
+            next_byte = file.read(1)
+            if not next_byte.isdigit():
+                continue
+            bitmap[x, y] = 1 if next_byte == b"1" else 0
+            if x == width - 1:
+                break
+            x += 1
+    return bitmap, palette

adafruit_imageload/pnm/pbm_ascii.py

@@ -0,0 +1,60 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2018 Scott Shawcroft for Adafruit Industries LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+"""
+`adafruit_imageload.pnm.pbm.binary`
+====================================================
+
+Load pixel values (indices or colors) into a bitmap and for an ascii ppm,
+return None for pallet.
+
+* Author(s):  Matt Land, Brooke Storm, Sam McGahan
+
+"""
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
+
+
+def load(file, width, height, bitmap=None, palette=None):
+    """
+    Load a P4 'PBM' binary image into the displayio.Bitmap
+    """
+    x = 0
+    y = 0
+    while True:
+        next_byte = file.read(1)
+        if not next_byte:
+            break  # out of bits
+        for bit in iterbits(int.from_bytes(next_byte, "little")):
+            bitmap[x, y] = bit
+            x += 1
+            if x > width - 1:
+                y += 1
+                x = 0
+            if y > height - 1:
+                break
+    return bitmap, palette
+
+
+def iterbits(b):
+    for i in range(8):
+        yield (b >> i) & 1