From 9e1b4aba9ace272048d26d5737c3a8bc06c7b2fd Mon Sep 17 00:00:00 2001 From: wiredfool Date: Sat, 25 Jun 2016 14:33:26 +0100 Subject: [PATCH] These modes upconvert to 32bit I --- Tests/test_numpy.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index aff52123c..38f0e05eb 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -55,28 +55,22 @@ class TestNumpy(PillowTestCase): 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) + # These may fail, depending on the platform, since we have no native + # 64 bit int image types. + # self.assert_image(to_image(numpy.uint), "I", TEST_IMAGE_SIZE) + # self.assert_image(to_image(numpy.int), "I", TEST_IMAGE_SIZE) # 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.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) + + self.assert_image(to_image(numpy.int16), "I", 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.uint32), "I", TEST_IMAGE_SIZE) + self.assert_image(to_image(numpy.int32), "I", TEST_IMAGE_SIZE) # Check 64-bit integer formats self.assertRaises(TypeError, lambda: to_image(numpy.uint64))