Merge pull request #2459 from SixLabors/bp/Issue2456

Tiff: Undo horizontal predictor for cmyk images
SixLabors · May 18, 2023 · b9e3cd8 · b9e3cd8
2 parents 7d0bbbd + f558e6f
commit b9e3cd8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/src/ImageSharp/Formats/Tiff/Compression/HorizontalPredictor.cs b/src/ImageSharp/Formats/Tiff/Compression/HorizontalPredictor.cs
@@ -44,6 +44,7 @@ public static void Undo(Span<byte> pixelBytes, int width, TiffColorType colorTyp
                 UndoRgb24Bit(pixelBytes, width);
                 break;
             case TiffColorType.Rgba8888:
+            case TiffColorType.Cmyk:
                 UndoRgba32Bit(pixelBytes, width);
                 break;
             case TiffColorType.Rgb161616:

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -308,6 +308,7 @@ public void TiffDecoder_CanDecode_CieLab<TPixel>(TestImageProvider<TPixel> provi
 
     [Theory]
     [WithFile(Cmyk, PixelTypes.Rgba32)]
+    [WithFile(CmykLzwPredictor, PixelTypes.Rgba32)]
     public void TiffDecoder_CanDecode_Cmyk<TPixel>(TestImageProvider<TPixel> provider)
         where TPixel : unmanaged, IPixel<TPixel>
     {

diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -958,6 +958,7 @@ public static class Tiff
 
         public const string Cmyk = "Tiff/Cmyk.tiff";
         public const string Cmyk64BitDeflate = "Tiff/cmyk_deflate_64bit.tiff";
+        public const string CmykLzwPredictor = "Tiff/Cmyk-lzw-predictor.tiff";
 
         public const string Issues1716Rgb161616BitLittleEndian = "Tiff/Issues/Issue1716.tiff";
         public const string Issues1891 = "Tiff/Issues/Issue1891.tiff";

diff --git a/...utput/TiffDecoderTests/TiffDecoder_CanDecode_Cmyk_Rgba32_Cmyk-lzw-predictor.png b/...utput/TiffDecoderTests/TiffDecoder_CanDecode_Cmyk_Rgba32_Cmyk-lzw-predictor.png
diff --git a/tests/Images/Input/Tiff/Cmyk-lzw-predictor.tiff b/tests/Images/Input/Tiff/Cmyk-lzw-predictor.tiff