Skip to content

Commit

Permalink
Merge f4c01a9 into 69b1a0e
Browse files Browse the repository at this point in the history
  • Loading branch information
@mairsbw
mairsbw committed Apr 19, 2016
2 parents 69b1a0e + f4c01a9 commit 53bb971
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 28 deletions.
12 changes: 8 additions & 4 deletions PIL/Image.py
View file
Expand Up @@ -2207,10 +2207,14 @@ def fromqpixmap(im):
# ((1, 1), "|b1"): ("1", "1"), # broken
((1, 1), "|u1"): ("L", "L"),
((1, 1), "|i1"): ("I", "I;8"),
((1, 1), "<i2"): ("I", "I;16"),
((1, 1), ">i2"): ("I", "I;16B"),
((1, 1), "<i4"): ("I", "I;32"),
((1, 1), ">i4"): ("I", "I;32B"),
((1, 1), "<u2"): ("I", "I;16"),
((1, 1), ">u2"): ("I", "I;16B"),
((1, 1), "<i2"): ("I", "I;16S"),
((1, 1), ">i2"): ("I", "I;16BS"),
((1, 1), "<u4"): ("I", "I;32"),
((1, 1), ">u4"): ("I", "I;32B"),
((1, 1), "<i4"): ("I", "I;32S"),
((1, 1), ">i4"): ("I", "I;32BS"),
((1, 1), "<f4"): ("F", "F;32F"),
((1, 1), ">f4"): ("F", "F;32BF"),
((1, 1), "<f8"): ("F", "F;64F"),
Expand Down
Binary file added Tests/images/uint16_1_4660.tif
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions Tests/test_file_tiff.py
View file
Expand Up @@ -450,6 +450,13 @@ def test_save_tiff_with_jpegtables(self):
# Should not raise UnicodeDecodeError or anything else
im.save(outfile)

def test_open_tiff_uint16(self):
# Test an image of all '0' values
pixel_value = 0x1234
infile = "Tests/images/uint16_1_{}.tif".format(pixel_value)
im = Image.open(infile)
self.assertEqual(im.getpixel((0, 0)), pixel_value)

if __name__ == '__main__':
unittest.main()

Expand Down
89 changes: 65 additions & 24 deletions Tests/test_numpy.py
View file
Expand Up @@ -10,6 +10,7 @@
# Skip via setUp()
pass

TEST_IMAGE_SIZE = (10, 10)

class TestNumpy(PillowTestCase):

Expand All @@ -29,51 +30,76 @@ def to_image(dtype, bands=1, boolean=0):
else:
data = list(range(100))
a = numpy.array(data, dtype=dtype)
a.shape = 10, 10
a.shape = TEST_IMAGE_SIZE
i = Image.fromarray(a)
if list(i.getdata()) != data:
print("data mismatch for", dtype)
else:
data = list(range(100))
a = numpy.array([[x]*bands for x in data], dtype=dtype)
a.shape = 10, 10, bands
a.shape = TEST_IMAGE_SIZE[0], TEST_IMAGE_SIZE[1], bands
i = Image.fromarray(a)
if list(i.split()[0].getdata()) != list(range(100)):
print("data mismatch for", dtype)
# print dtype, list(i.getdata())
return i

# self.assert_image(to_image(numpy.bool, boolean=1), "1", (10, 10))
# self.assert_image(to_image(numpy.bool8, boolean=1), "1", (10, 10))
# Check supported 1-bit integer formats
self.assertRaises(TypeError, lambda: to_image(numpy.bool))
self.assertRaises(TypeError, lambda: to_image(numpy.bool8))

self.assertRaises(TypeError, lambda: to_image(numpy.uint))
self.assert_image(to_image(numpy.uint8), "L", (10, 10))
self.assertRaises(TypeError, lambda: to_image(numpy.uint16))
self.assertRaises(TypeError, lambda: to_image(numpy.uint32))
self.assertRaises(TypeError, lambda: to_image(numpy.uint64))
# Check supported 8-bit integer formats
self.assert_image(to_image(numpy.uint8), "L", TEST_IMAGE_SIZE)
self.assert_image(to_image(numpy.uint8, 3), "RGB", TEST_IMAGE_SIZE)
self.assert_image(to_image(numpy.uint8, 4), "RGBA", TEST_IMAGE_SIZE)
self.assert_image(to_image(numpy.int8), "I", TEST_IMAGE_SIZE)

# Check non-fixed-size integer types
self.assert_image(to_image(numpy.uint), "I", TEST_IMAGE_SIZE)
self.assert_image(to_image(numpy.int), "I", TEST_IMAGE_SIZE)

self.assert_image(to_image(numpy.int8), "I", (10, 10))
if Image._ENDIAN == '<': # Little endian
self.assert_image(to_image(numpy.int16), "I;16", (10, 10))
# Check 16-bit integer formats
if Image._ENDIAN == '<':
self.assert_image(to_image(numpy.uint16), "I;16", TEST_IMAGE_SIZE)
else:
self.assert_image(to_image(numpy.int16), "I;16B", (10, 10))
self.assert_image(to_image(numpy.int32), "I", (10, 10))
self.assertRaises(TypeError, lambda: to_image(numpy.int64))
self.assert_image(to_image(numpy.uint16), "I;16B", TEST_IMAGE_SIZE)
if Image._ENDIAN == '<':
self.assert_image(to_image(numpy.int16), "I;16S", TEST_IMAGE_SIZE)
else:
self.assert_image(to_image(numpy.int16), "I;16BS", TEST_IMAGE_SIZE)

# Check 32-bit integer formats
if Image._ENDIAN == '<':
self.assert_image(to_image(numpy.uint32), "I;32", TEST_IMAGE_SIZE)
else:
self.assert_image(to_image(numpy.uint32), "I;32B", TEST_IMAGE_SIZE)
if Image._ENDIAN == '<':
self.assert_image(to_image(numpy.int32), "I;32S", TEST_IMAGE_SIZE)
else:
self.assert_image(to_image(numpy.int32), "I;32BS", TEST_IMAGE_SIZE)

self.assert_image(to_image(numpy.float), "F", (10, 10))
self.assert_image(to_image(numpy.float32), "F", (10, 10))
self.assert_image(to_image(numpy.float64), "F", (10, 10))
# Check 64-bit integer formats
self.assertRaises(TypeError, lambda: to_image(numpy.uint64))
self.assertRaises(TypeError, lambda: to_image(numpy.int64))

self.assert_image(to_image(numpy.uint8, 3), "RGB", (10, 10))
self.assert_image(to_image(numpy.uint8, 4), "RGBA", (10, 10))
# Check floating-point formats
self.assert_image(to_image(numpy.float), "F", TEST_IMAGE_SIZE)
self.assertRaises(TypeError, lambda: to_image(numpy.float16))
self.assert_image(to_image(numpy.float32), "F", TEST_IMAGE_SIZE)
self.assert_image(to_image(numpy.float64), "F", TEST_IMAGE_SIZE)

# based on an erring example at
# http://stackoverflow.com/questions/10854903/what-is-causing-dimension-dependent-attributeerror-in-pil-fromarray-function
def test_3d_array(self):
a = numpy.ones((10, 10, 10), dtype=numpy.uint8)
self.assert_image(Image.fromarray(a[1, :, :]), "L", (10, 10))
self.assert_image(Image.fromarray(a[:, 1, :]), "L", (10, 10))
self.assert_image(Image.fromarray(a[:, :, 1]), "L", (10, 10))
size = (5, TEST_IMAGE_SIZE[0], TEST_IMAGE_SIZE[1])
a = numpy.ones(size, dtype=numpy.uint8)
self.assert_image(Image.fromarray(a[1, :, :]), "L", TEST_IMAGE_SIZE)
size = (TEST_IMAGE_SIZE[0], 5, TEST_IMAGE_SIZE[1])
a = numpy.ones(size, dtype=numpy.uint8)
self.assert_image(Image.fromarray(a[:, 1, :]), "L", TEST_IMAGE_SIZE)
size = (TEST_IMAGE_SIZE[0], TEST_IMAGE_SIZE[1], 5)
a = numpy.ones(size, dtype=numpy.uint8)
self.assert_image(Image.fromarray(a[:, :, 1]), "L", TEST_IMAGE_SIZE)

def _test_img_equals_nparray(self, img, np):
np_size = np.shape[1], np.shape[0]
Expand All @@ -89,6 +115,21 @@ def test_16bit(self):
self._test_img_equals_nparray(img, np_img)
self.assertEqual(np_img.dtype, numpy.dtype('<u2'))

def test_save_tiff_uint16(self):
'''
Open a single-channel uint16 greyscale image and verify that it can be saved without
losing precision.
'''
tmpfile = self.tempfile("temp.tif")
pixel_value = 0x1234
filename = "Tests/images/uint16_1_4660.tif"
a = numpy.array([pixel_value] * TEST_IMAGE_SIZE[0] * TEST_IMAGE_SIZE[1], dtype=numpy.uint16)
a.shape = TEST_IMAGE_SIZE
Image.fromarray(a).save(tmpfile)
im_test = Image.open(tmpfile)
im_good = Image.open(filename)
self.assert_image_equal(im_good, im_test)

def test_to_array(self):

def _to_array(mode, dtype):
Expand Down

0 comments on commit 53bb971

Please sign in to comment.