Swap pixel values on Big Endian

wiredfool · Jan 14, 2021 · 7e5df7f · 7e5df7f
1 parent 9040770
commit 7e5df7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
@@ -16,7 +16,6 @@
     assert_image_similar,
     assert_image_similar_tofile,
     hopper,
-    is_big_endian,
     skip_unless_feature,
 )
 
@@ -879,7 +878,6 @@ def test_strip_planar_16bit_RGBa(self):
         with Image.open("Tests/images/tiff_strip_planar_16bit_RGBa.tiff") as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGBa_target.png")
 
-    @pytest.mark.xfail(is_big_endian(), reason="Fails on big-endian")
     def test_old_style_jpeg(self):
         infile = "Tests/images/old-style-jpeg-compression.tif"
         with Image.open(infile) as im:

diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c
@@ -289,6 +289,10 @@ _decodeStripYCbCr(Imaging im, ImagingCodecState state, TIFF *tiff) {
             goto decodeycbcr_err;
         }
 
+#if WORDS_BIGENDIAN
+        TIFFSwabArrayOfLong((UINT32 *)state->buffer, img.width * rows_to_read);
+#endif
+
         TRACE(("Decoded strip for row %d \n", state->y));
 
         // iterate over each row in the strip and stuff data into image
@@ -609,6 +613,10 @@ ImagingLibTiffDecode(
                             state->errcode = IMAGING_CODEC_BROKEN;
                             goto decode_err;
                         }
+
+#if WORDS_BIGENDIAN
+                    TIFFSwabArrayOfLong((UINT32 *)state->buffer, tile_width * tile_length);
+#endif
                     } else {
                         if (TIFFReadTile(tiff, (tdata_t)state->buffer, x, y, 0, plane) == -1) {
                             TRACE(("Decode Error, Tile at %dx%d\n", x, y));