Merge pull request #3790 from radarhere/numpy_bool

Fix numpy bool bug
python-pillow · Apr 15, 2019 · caf7af6 · caf7af6
2 parents 0ab0c99 + 73cb0ce
commit caf7af6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py
@@ -178,6 +178,14 @@ def test_putdata(self):
 
         self.assertEqual(len(im.getdata()), len(arr))
 
+    def test_roundtrip_eye(self):
+        for dtype in (numpy.bool, numpy.bool8,
+                      numpy.int8, numpy.int16, numpy.int32,
+                      numpy.uint8, numpy.uint16, numpy.uint32,
+                      numpy.float, numpy.float32, numpy.float64):
+            arr = numpy.eye(10, dtype=dtype)
+            numpy.testing.assert_array_equal(arr, numpy.array(Image.fromarray(arr)))
+
     def test_zero_size(self):
         # Shouldn't cause floating point exception
         # See https://github.com/python-pillow/Pillow/issues/2259

diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c
@@ -1280,7 +1280,7 @@ static struct {
     {"1",       "1;I",          1,      unpack1I},
     {"1",       "1;R",          1,      unpack1R},
     {"1",       "1;IR",         1,      unpack1IR},
-    {"1",       "1;8",          1,      unpack18},
+    {"1",       "1;8",          8,      unpack18},
 
     /* greyscale */
     {"L",       "L;2",          2,      unpackL2},