Merge branch 'master' into Riddlerat/pgm-work

Author: Errolyn

adafruit_imageload/__init__.py

@@ -55,4 +55,3 @@ def load(filename, *, bitmap=None, palette=None):
             return pnm.load(f, header, bitmap=bitmap, palette=palette)
         else:
             raise RuntimeError("Unsupported image format")
-

adafruit_imageload/pnm/__init__.py

@@ -41,11 +41,9 @@ def load(f, header, *, bitmap=None, palette=None):
     while True:
         # We have all we need at length 3
         if len(pnm_header) == 3:
-            f.read(1)
             break
         if magic_number.startswith(b"P1") or magic_number.startswith(b"P4"):
             if len(pnm_header) == 2:
-                f.read(1)
                 from . import pbm
 
                 return pbm.load(
@@ -70,7 +68,7 @@ def load(f, header, *, bitmap=None, palette=None):
                 if not next_byte:
                     raise RuntimeError("Unsupported image format")
 
-            pnm_header.append(int(value))
+            pnm_header.append(int("".join(["%c" % char for char in value])))
             continue
 
         if not next_byte:

adafruit_imageload/pnm/pbm/__init__.py

@@ -0,0 +1,20 @@
+import logging
+
+
+
+def load(f, magic_number, header, bitmap = None , palette = None):
+    # type: (stream, str, list, c_obj, c_obj) -> bitmap, palette
+    height = header[0]
+    width = header[1]
+    logging.info(f'height: {height}')
+    if palette:
+        palette = palette(1)
+    if bitmap:
+        bitmap = bitmap(header[0], header[1], 1)
+        for line in range(height-1,-1,-1):
+
+            chunk = f.read(width)
+            #logging.info(chunk)
+    return bitmap, palette
+
+    #while not has 3 signnif

adafruit_imageload/pnm/ppm/__init__.py

@@ -0,0 +1,82 @@
+# 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.ppm`
+====================================================
+
+Load pixel values (indices or colors) into a bitmap and for a binary 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"
+
+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
+
+    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:
+            minimum_color_depth *= 2
+
+        # This seems maybe right?
+        line_size = width * 3
+
+        chunk = bytearray(line_size)
+
+        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
+
+    return bitmap, palette

adafruit_imageload/pnm/ppm/ppm_ascii.py

@@ -0,0 +1,69 @@
+# 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.ppm.ppm_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"
+
+import struct
+
+
+def load(file, width, height, max_colors, bitmap=None, palette=None):
+    """Load an ascii ppm into the Bitmap object"""
+    if bitmap:
+        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)
+                        color = bytearray()
+                        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")
+
+    return bitmap, palette

adafruit_imageload/tests/test_pnm_load.py

@@ -12,43 +12,38 @@ def __init__(self, width, height, colors):
 
 logging.getLogger().setLevel(logging.INFO)
 
-class TestPbmP1(TestCase):
+class TestPnmLoad(TestCase):
 
     def test_load_fails_with_no_header_data(self):
         f = BytesIO(b"some initial binary data: \x00\x01")
         try:
-            pnm.load(f, b'P1')
+            pnm.load(f, b'P1', bitmap=Bitmap)
             self.fail('should have failed')
         except Exception as e:
             if "Unsupported image format" not in str(e):
                 raise
 
-    def _test_load_works_p1_ascii(self):
+    def test_load_works_p1_ascii(self):
         test_file = os.path.join(os.path.dirname(__file__), '..', '..', 'examples', 'images', 'netpbm_p1_mono.pbm')
-        with open(test_file) as f:
-            f.seek(2)
-            bitmap, palette = pnm.load(f, b'P1')
-        self.assertTrue(isinstance(bitmap, Bitmap))
-        self.fail(bitmap)
+        with open(test_file, 'rb') as f:
+            bitmap, palette = pnm.load(f, b'P1', bitmap=Bitmap)
+        self.assertTrue(isinstance(bitmap, Bitmap), bitmap)
         self.assertEqual(1, bitmap.colors)
-        self.assertEqual(20, bitmap.width)
+        self.assertEqual(13, bitmap.width)
+        self.assertEqual(21, bitmap.height)
 
     def test_load_works_p4_binary(self):
         test_file = os.path.join(os.path.dirname(__file__), '..', '..', 'examples', 'images', 'netpbm_p4_mono.pbm')
-
         with open(test_file, 'rb') as f:
-            f.seek(2)
             bitmap, palette = pnm.load(f, b'P4', bitmap=Bitmap)
         self.assertTrue(isinstance(bitmap, Bitmap))
         self.assertEqual(1, bitmap.colors)
         self.assertEqual(8, bitmap.width)
         self.assertEqual(8, bitmap.height)
 
-    def test_load_works_p4_binary_big(self):
+    def test_load_works_p4_binary_high_res(self):
         test_file = os.path.join(os.path.dirname(__file__), '..', '..', 'examples', 'images', 'MARBLES.PBM')
-
         with open(test_file, 'rb') as f:
-            f.seek(2)
             bitmap, palette = pnm.load(f, b'P4', bitmap=Bitmap)
         self.assertTrue(isinstance(bitmap, Bitmap))
         self.assertEqual(1, bitmap.colors)