From 9f2e711a12c5d8e07a37afc9816b31868223c985 Mon Sep 17 00:00:00 2001 From: Tomasz Jezierski Date: Thu, 7 Dec 2017 15:06:55 +0100 Subject: [PATCH 1/2] Add value in TiffImagePlugin in compression list --- PIL/TiffImagePlugin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py index b9dd19a61..08268d4a8 100644 --- a/PIL/TiffImagePlugin.py +++ b/PIL/TiffImagePlugin.py @@ -1240,7 +1240,8 @@ class TiffImageFile(ImageFile.ImageFile): "tiff_deflate", "tiff_sgilog", "tiff_sgilog24", - "tiff_raw_16"]: + "tiff_raw_16", + "jpeg"]: # if DEBUG: # print("Activating g4 compression for whole file") From 7699621ca5174f6e6404ba6eb129f48df02a9d55 Mon Sep 17 00:00:00 2001 From: Tomasz Jezierski Date: Tue, 12 Dec 2017 11:21:42 +0100 Subject: [PATCH 2/2] tiff-colors-fix test adjust --- Tests/test_file_tiff.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 1eb784dfb..f2aa850b4 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -72,12 +72,8 @@ class TestFileTiff(PillowTestCase): self.assertEqual(im.mode, "RGB") self.assertEqual(im.size, (256, 256)) self.assertEqual( - im.tile, [ - ('jpeg', (0, 0, 256, 64), 8, ('RGB', '')), - ('jpeg', (0, 64, 256, 128), 1215, ('RGB', '')), - ('jpeg', (0, 128, 256, 192), 2550, ('RGB', '')), - ('jpeg', (0, 192, 256, 256), 3890, ('RGB', '')), - ]) + im.tile, [('jpeg', (0, 0, 256, 256), 0, ('RGB', 'jpeg', False))] + ) im.load() def test_sampleformat(self):