Merge pull request python-pillow#2263 from wiredfool/tiff_bytesio

Fix for writing Tiff to BytesIO using libtiff
SpamExperts · Dec 9, 2016 · e83479e · e83479e
2 parents 7dff4e5 + ce3432f
commit e83479e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
@@ -39,6 +39,8 @@ def _assert_noerr(self, im):
         out = self.tempfile("temp.png")
         im.save(out)
 
+        out_bytes = io.BytesIO()
+        im.save(out_bytes, format='tiff', compression='group4')
 
 class TestFileLibTiff(LibTiffTestCase):
 

diff --git a/libImaging/TiffDecode.c b/libImaging/TiffDecode.c
@@ -58,7 +58,7 @@ tsize_t _tiffWriteProc(thandle_t hdata, tdata_t buf, tsize_t size) {
 		tdata_t new;
 		tsize_t newsize=state->size;
 		while (newsize < (size + state->size)) {
-            if (newsize > (tsize_t)SIZE_MAX - 64*1024){
+            if (newsize > INT_MAX - 64*1024){
                 return 0;
             }
 			newsize += 64*1024;