Browse Source
Merge branch 'main' into js/gif-fixes
pull/2500/head
James Jackson-South
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
9 additions and
0 deletions
-
src/ImageSharp/Formats/Tiff/Compression/HorizontalPredictor.cs
-
tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
-
tests/ImageSharp.Tests/TestImages.cs
-
tests/Images/External/ReferenceOutput/TiffDecoderTests/TiffDecoder_CanDecode_Cmyk_Rgba32_Cmyk-lzw-predictor.png
-
tests/Images/Input/Tiff/Cmyk-lzw-predictor.tiff
|
|
|
@ -44,6 +44,7 @@ internal static class HorizontalPredictor |
|
|
|
UndoRgb24Bit(pixelBytes, width); |
|
|
|
break; |
|
|
|
case TiffColorType.Rgba8888: |
|
|
|
case TiffColorType.Cmyk: |
|
|
|
UndoRgba32Bit(pixelBytes, width); |
|
|
|
break; |
|
|
|
case TiffColorType.Rgb161616: |
|
|
|
|
|
|
|
@ -308,6 +308,7 @@ public class TiffDecoderTests : TiffDecoderBaseTester |
|
|
|
|
|
|
|
[Theory] |
|
|
|
[WithFile(Cmyk, PixelTypes.Rgba32)] |
|
|
|
[WithFile(CmykLzwPredictor, PixelTypes.Rgba32)] |
|
|
|
public void TiffDecoder_CanDecode_Cmyk<TPixel>(TestImageProvider<TPixel> provider) |
|
|
|
where TPixel : unmanaged, IPixel<TPixel> |
|
|
|
{ |
|
|
|
|
|
|
|
@ -960,6 +960,7 @@ public static class TestImages |
|
|
|
|
|
|
|
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"; |
|
|
|
|
|
|
|
@ -0,0 +1,3 @@ |
|
|
|
version https://git-lfs.github.com/spec/v1 |
|
|
|
oid sha256:db076491d7afc78cb5de99cb1e7a9c53f891157bf064994c60d453aec75b9c90 |
|
|
|
size 512 |
|
|
|
@ -0,0 +1,3 @@ |
|
|
|
version https://git-lfs.github.com/spec/v1 |
|
|
|
oid sha256:d322e42dd61c528e91ba9d16310248a4b9a77094a22761dcb9e6f132fc16fe1b |
|
|
|
size 1080 |
