From bd703954dca8534ea5d6e126fcd2b9bfd4df8eb2 Mon Sep 17 00:00:00 2001
From: Brian Popow <popow@gmx.de>
Date: Mon, 7 Mar 2022 17:51:22 +0100
Subject: [PATCH] Add 5 and 3 to valid magicFrame.Depth

---
 .../Formats/Tiff/TiffDecoderTests.cs          | 28 +++----------------
 .../ReferenceCodecs/MagickReferenceDecoder.cs |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
index 18e39d44a..5e5e1b778 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -164,12 +164,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         [Theory]
         [WithFile(FLowerRgb3Bit, PixelTypes.Rgba32)]
         public void TiffDecoder_CanDecode_9Bit_WithUnassociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            // Note: because the MagickReferenceDecoder fails to load the image, we only debug save them.
-            using Image<TPixel> image = provider.GetImage();
-            image.DebugSave(provider);
-        }
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
 
         [Theory]
         [WithFile(Flower10BitGray, PixelTypes.Rgba32)]
@@ -190,12 +185,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         [Theory]
         [WithFile(Rgba3BitUnassociatedAlpha, PixelTypes.Rgba32)]
         public void TiffDecoder_CanDecode_12Bit_WithUnassociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            // Note: because the MagickReferenceDecoder fails to load the image, we only debug save them.
-            using Image<TPixel> image = provider.GetImage();
-            image.DebugSave(provider);
-        }
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
 
         [Theory]
         [WithFile(Flower14BitGray, PixelTypes.Rgba32)]
@@ -205,12 +195,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         [Theory]
         [WithFile(FLowerRgb5Bit, PixelTypes.Rgba32)]
         public void TiffDecoder_CanDecode_15Bit<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            // Note: because the MagickReferenceDecoder fails to load the image, we only debug save them.
-            using Image<TPixel> image = provider.GetImage();
-            image.DebugSave(provider);
-        }
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
 
         [Theory]
         [WithFile(Flower16BitGrayLittleEndian, PixelTypes.Rgba32)]
@@ -239,12 +224,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         [Theory]
         [WithFile(Rgba5BitUnassociatedAlpha, PixelTypes.Rgba32)]
         public void TiffDecoder_CanDecode_20Bit_WithUnassociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            // Note: because the MagickReferenceDecoder fails to load the image, we only debug save them.
-            using Image<TPixel> image = provider.GetImage();
-            image.DebugSave(provider);
-        }
+            where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
 
         [Theory]
         [WithFile(FlowerRgb888Contiguous, PixelTypes.Rgba32)]
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
index 5d1b904c0..a61261293 100644
--- 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 is 8 or 6 or 4 or 2 or 1 or 10 or 12)
+                if (magicFrame.Depth is 12 or 10 or 8 or 6 or 5 or 4 or 3 or 2 or 1)
                 {
                     byte[] data = pixels.ToByteArray(PixelMapping.RGBA);