Additional tests for gray tiff images

5 years ago · 3b18d705e3
14 changed files with 91 additions and 2 deletions
--- a/src/ImageSharp/Formats/Tiff/TiffBitsPerPixel.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffBitsPerPixel.cs
@ -30,6 +30,13 @@ namespace SixLabors.ImageSharp.Formats.Tiff
        /// </summary>
        Bit8 = 8,

+        /// <summary>
+        /// 10 bits per pixel, for gray images.
+        ///
+        /// Note: The TiffEncoder does not yet support 10 bits per pixel and will default to 24 bits per pixel instead.
+        /// </summary>
+        Bit10 = 10,
+
        /// <summary>
        /// 12 bits per pixel. 4 bit for each color channel.
        ///
@ -37,6 +44,20 @@ namespace SixLabors.ImageSharp.Formats.Tiff
        /// </summary>
        Bit12 = 12,

+        /// <summary>
+        /// 14 bits per pixel, for gray images.
+        ///
+        /// Note: The TiffEncoder does not yet support 14 bits per pixel images and will default to 24 bits per pixel instead.
+        /// </summary>
+        Bit14 = 14,
+
+        /// <summary>
+        /// 16 bits per pixel, for gray images.
+        ///
+        /// Note: The TiffEncoder does not yet support 16 bits per color channel and will default to 24 bits per pixel instead.
+        /// </summary>
+        Bit16 = 16,
+
        /// <summary>
        /// 24 bits per pixel. One byte for each color channel.
        /// </summary>
--- a/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
@ -320,10 +320,13 @@ namespace SixLabors.ImageSharp.Formats.Tiff
                        this.SetEncoderOptions(bitsPerPixel, photometricInterpretation ?? TiffPhotometricInterpretation.BlackIsZero, compression, predictor);
                        break;
                    case TiffBitsPerPixel.Bit6:
+                    case TiffBitsPerPixel.Bit10:
                    case TiffBitsPerPixel.Bit12:
+                    case TiffBitsPerPixel.Bit14:
+                    case TiffBitsPerPixel.Bit16:
                    case TiffBitsPerPixel.Bit30:
                    case TiffBitsPerPixel.Bit42:
-                        // Encoding 42, 30, 12 and 6 bits per pixel is not yet supported. Default to 24 bits.
+                        // Encoding not yet supported bits per pixel will default to 24 bits.
                        this.SetEncoderOptions(TiffBitsPerPixel.Bit24, TiffPhotometricInterpretation.Rgb, compression, TiffPredictor.None);
                        break;
                    default:
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@ -99,18 +99,50 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
        public void TiffDecoder_CanDecode_4Bit_WithPalette<TPixel>(TestImageProvider<TPixel> provider)
            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider, ReferenceDecoder, useExactComparer: false, 0.01f);

+        [Theory]
+        [WithFile(Flower2BitPalette, PixelTypes.Rgba32)]
+        public void TiffDecoder_CanDecode_2Bit_WithPalette<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider, ReferenceDecoder, useExactComparer: false, 0.01f);
+
+        [Theory]
+        [WithFile(Flower2BitGray, PixelTypes.Rgba32)]
+        public void TiffDecoder_CanDecode_2Bit<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
+
        [Theory]
        [WithFile(FlowerRgb222Contiguous, PixelTypes.Rgba32)]
        [WithFile(FlowerRgb222Planar, PixelTypes.Rgba32)]
+        [WithFile(Flower6BitGray, PixelTypes.Rgba32)]
        public void TiffDecoder_CanDecode_6Bit<TPixel>(TestImageProvider<TPixel> provider)
            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);

+        [Theory]
+        [WithFile(Flower8BitGray, PixelTypes.Rgba32)]
+        public void TiffDecoder_CanDecode_8Bit<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
+
+        [Theory]
+        [WithFile(Flower10BitGray, PixelTypes.Rgba32)]
+        public void TiffDecoder_CanDecode_10Bit<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
+
        [Theory]
        [WithFile(FlowerRgb444Contiguous, PixelTypes.Rgba32)]
        [WithFile(FlowerRgb444Planar, PixelTypes.Rgba32)]
+        [WithFile(Flower12BitGray, PixelTypes.Rgba32)]
        public void TiffDecoder_CanDecode_12Bit<TPixel>(TestImageProvider<TPixel> provider)
            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);

+        [Theory]
+        [WithFile(Flower14BitGray, PixelTypes.Rgba32)]
+        public void TiffDecoder_CanDecode_14Bit<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
+
+        [Theory]
+        [WithFile(Flower16BitGray, PixelTypes.Rgba32)]
+        public void TiffDecoder_CanDecode_16Bit<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
+
        [Theory]
        [WithFile(FlowerRgb101010Contiguous, PixelTypes.Rgba32)]
        [WithFile(FlowerRgb101010Planar, PixelTypes.Rgba32)]
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs
@ -81,6 +81,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
        [InlineData(TiffBitsPerPixel.Bit42)]
        [InlineData(TiffBitsPerPixel.Bit30)]
        [InlineData(TiffBitsPerPixel.Bit12)]
+        [InlineData(TiffBitsPerPixel.Bit10)]
        [InlineData(TiffBitsPerPixel.Bit6)]
        public void EncoderOptions_UnsupportedBitPerPixel_DefaultTo24Bits(TiffBitsPerPixel bitsPerPixel)
        {
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@ -568,6 +568,14 @@ namespace SixLabors.ImageSharp.Tests
            public const string FlowerRgb444Planar = "Tiff/flower-rgb-planar-04.tiff";
            public const string FlowerRgb222Contiguous = "Tiff/flower-rgb-contig-02.tiff";
            public const string FlowerRgb222Planar = "Tiff/flower-rgb-planar-02.tiff";
+            public const string Flower2BitGray = "Tiff/flower-minisblack-02.tiff";
+            public const string Flower2BitPalette = "Tiff/flower-palette-02.tiff";
+            public const string Flower6BitGray = "Tiff/flower-minisblack-06.tiff";
+            public const string Flower8BitGray = "Tiff/flower-minisblack-08.tiff";
+            public const string Flower10BitGray = "Tiff/flower-minisblack-10.tiff";
+            public const string Flower12BitGray = "Tiff/flower-minisblack-12.tiff";
+            public const string Flower14BitGray = "Tiff/flower-minisblack-14.tiff";
+            public const string Flower16BitGray = "Tiff/flower-minisblack-16.tiff";

            public const string SmallRgbDeflate = "Tiff/rgb_small_deflate.tiff";
            public const string SmallRgbLzw = "Tiff/rgb_small_lzw.tiff";
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
                MemoryGroup<TPixel> framePixels = frame.PixelBuffer.FastMemoryGroup;

                using IUnsafePixelCollection<ushort> pixels = magicFrame.GetPixelsUnsafe();
-                if (magicFrame.Depth == 8 || magicFrame.Depth == 4 || magicFrame.Depth == 2 || magicFrame.Depth == 1 || magicFrame.Depth == 10)
+                if (magicFrame.Depth == 8 || magicFrame.Depth == 6 || magicFrame.Depth == 4 || magicFrame.Depth == 2 || magicFrame.Depth == 1 || magicFrame.Depth == 10 || magicFrame.Depth == 12)
                {
                    byte[] data = pixels.ToByteArray(PixelMapping.RGBA);

--- a/tests/Images/Input/Tiff/flower-minisblack-02.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-02.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3122afede012fa00b8cb379b2f9125a34a38188c3346ec5e18d3b4bddcbb451b
+size 1131
--- a/tests/Images/Input/Tiff/flower-minisblack-06.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-06.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0c13012d8d35215b01192eb38058db4543486c60b4918beec8719a94d1e208e
+size 2679
--- a/tests/Images/Input/Tiff/flower-minisblack-08.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-08.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1268d843a2338409ec3a9f5a5a62e23d38c3a898035619994a02f21eff7590bf
+size 3453
--- a/tests/Images/Input/Tiff/flower-minisblack-10.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-10.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a91d6946730604dd65c63f1653fb33031682f26218de33ebf3d0b362cb6883af
+size 4269
--- a/tests/Images/Input/Tiff/flower-minisblack-12.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-12.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86fc9309872f4e4668350b95fae315d878ec9658046d738050a2743f5fa44446
+size 5043
--- a/tests/Images/Input/Tiff/flower-minisblack-14.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-14.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcd07668c73f24c2a13133ac4910b59a568502a6d3762675eef61a7e3b090165
+size 5817
--- a/tests/Images/Input/Tiff/flower-minisblack-16.tiff
+++ b/tests/Images/Input/Tiff/flower-minisblack-16.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79531a10710dee89b86e2467818b7c03a24ff28ebd98c7bdcc292559671e1887
+size 6591
--- a/tests/Images/Input/Tiff/flower-palette-02.tiff
+++ b/tests/Images/Input/Tiff/flower-palette-02.tiff
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75e74d8816942ff6e9dfda411f9171f0f1dd1a5a88cb1410238b55a2b2aeeb71
+size 1164