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

Author: bstorm

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(

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/tests/__init__.py

@@ -0,0 +1,51 @@
+from unittest import TestCase
+from adafruit_imageload import pnm
+from io import BytesIO
+import logging
+import os
+
+class Bitmap(object):
+    def __init__(self, width, height, colors):
+        self.width = width
+        self.height = height
+        self.colors = colors
+
+logging.getLogger().setLevel(logging.INFO)
+
+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', 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):
+        test_file = os.path.join(os.path.dirname(__file__), '..', '..', 'examples', 'images', 'netpbm_p1_mono.pbm')
+        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(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:
+            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_high_res(self):
+        test_file = os.path.join(os.path.dirname(__file__), '..', '..', 'examples', 'images', 'MARBLES.PBM')
+        with open(test_file, 'rb') as f:
+            bitmap, palette = pnm.load(f, b'P4', bitmap=Bitmap)
+        self.assertTrue(isinstance(bitmap, Bitmap))
+        self.assertEqual(1, bitmap.colors)
+        self.assertEqual(1152, bitmap.width)
+        self.assertEqual(813, bitmap.height)