Merge remote-tracking branch 'origin/master' into bp/tiff24bit

brianpopow · brianpopow · commit 51e18702d949 · 2021-08-06T15:01:17.000+02:00
# Conflicts:
#	src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs
#	src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb161616TiffColor{TPixel}.cs
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs
@@ -16,11 +16,18 @@ internal class BlackIsZero16TiffColor<TPixel> : TiffBaseColorDecoder<TPixel>
     {
         private readonly bool isBigEndian;
 
+        private readonly Configuration configuration;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BlackIsZero16TiffColor{TPixel}" /> class.
         /// </summary>
+        /// <param name="configuration">The configuration.</param>
         /// <param name="isBigEndian">if set to <c>true</c> decodes the pixel data as big endian, otherwise as little endian.</param>
-        public BlackIsZero16TiffColor(bool isBigEndian) => this.isBigEndian = isBigEndian;
+        public BlackIsZero16TiffColor(Configuration configuration, bool isBigEndian)
+        {
+            this.configuration = configuration;
+            this.isBigEndian = isBigEndian;
+        }
 
         /// <inheritdoc/>
         public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
@@ -47,13 +54,14 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
                 }
                 else
                 {
-                    for (int x = 0; x < pixelRow.Length; x++)
-                    {
-                        ushort intensity = TiffUtils.ConvertToUShortLittleEndian(data.Slice(offset, 2));
-                        offset += 2;
+                    int byteCount = pixelRow.Length * 2;
+                    PixelOperations<TPixel>.Instance.FromL16Bytes(
+                        this.configuration,
+                        data.Slice(offset, byteCount),
+                        pixelRow,
+                        pixelRow.Length);
 
-                        pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);
-                    }
+                    offset += byteCount;
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor{TPixel}.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using SixLabors.ImageSharp.Formats.Tiff.Utils;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -14,22 +13,26 @@ namespace SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation
     internal class BlackIsZero8TiffColor<TPixel> : TiffBaseColorDecoder<TPixel>
         where TPixel : unmanaged, IPixel<TPixel>
     {
+        private readonly Configuration configuration;
+
+        public BlackIsZero8TiffColor(Configuration configuration) => this.configuration = configuration;
+
         /// <inheritdoc/>
         public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
         {
-            var color = default(TPixel);
-
             int offset = 0;
 
-            var l8 = default(L8);
             for (int y = top; y < top + height; y++)
             {
                 Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
-                for (int x = 0; x < pixelRow.Length; x++)
-                {
-                    byte intensity = data[offset++];
-                    pixelRow[x] = TiffUtils.ColorFromL8(l8, intensity, color);
-                }
+                int byteCount = pixelRow.Length;
+                PixelOperations<TPixel>.Instance.FromL8Bytes(
+                    this.configuration,
+                    data.Slice(offset, byteCount),
+                    pixelRow,
+                    pixelRow.Length);
+
+                offset += byteCount;
             }
         }
     }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb161616TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb161616TiffColor{TPixel}.cs
@@ -16,11 +16,18 @@ internal class Rgb161616TiffColor<TPixel> : TiffBaseColorDecoder<TPixel>
     {
         private readonly bool isBigEndian;
 
+        private readonly Configuration configuration;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Rgb161616TiffColor{TPixel}" /> class.
         /// </summary>
+        /// <param name="configuration">The configuration.</param>
         /// <param name="isBigEndian">if set to <c>true</c> decodes the pixel data as big endian, otherwise as little endian.</param>
-        public Rgb161616TiffColor(bool isBigEndian) => this.isBigEndian = isBigEndian;
+        public Rgb161616TiffColor(Configuration configuration, bool isBigEndian)
+        {
+            this.configuration = configuration;
+            this.isBigEndian = isBigEndian;
+        }
 
         /// <inheritdoc/>
         public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
@@ -53,17 +60,14 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
                 }
                 else
                 {
-                    for (int x = 0; x < pixelRow.Length; x++)
-                    {
-                        ulong r = TiffUtils.ConvertToUShortLittleEndian(data.Slice(offset, 2));
-                        offset += 2;
-                        ulong g = TiffUtils.ConvertToUShortLittleEndian(data.Slice(offset, 2));
-                        offset += 2;
-                        ulong b = TiffUtils.ConvertToUShortLittleEndian(data.Slice(offset, 2));
-                        offset += 2;
+                    int byteCount = pixelRow.Length * 6;
+                    PixelOperations<TPixel>.Instance.FromRgb48Bytes(
+                        this.configuration,
+                        data.Slice(offset, byteCount),
+                        pixelRow,
+                        pixelRow.Length);
 
-                        pixelRow[x] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);
-                    }
+                    offset += byteCount;
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor{TPixel}.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -14,29 +13,26 @@ namespace SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation
     internal class Rgb888TiffColor<TPixel> : TiffBaseColorDecoder<TPixel>
         where TPixel : unmanaged, IPixel<TPixel>
     {
+        private readonly Configuration configuration;
+
+        public Rgb888TiffColor(Configuration configuration) => this.configuration = configuration;
+
         /// <inheritdoc/>
         public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
         {
-            var color = default(TPixel);
-
             int offset = 0;
 
-            var rgba = default(Rgba32);
             for (int y = top; y < top + height; y++)
             {
                 Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
-
-                for (int x = 0; x < pixelRow.Length; x++)
-                {
-                    byte r = data[offset++];
-                    byte g = data[offset++];
-                    byte b = data[offset++];
-
-                    rgba.PackedValue = (uint)(r | (g << 8) | (b << 16) | (0xff << 24));
-                    color.FromRgba32(rgba);
-
-                    pixelRow[x] = color;
-                }
+                int byteCount = pixelRow.Length * 3;
+                PixelOperations<TPixel>.Instance.FromRgb24Bytes(
+                    this.configuration,
+                    data.Slice(offset, byteCount),
+                    pixelRow,
+                    pixelRow.Length);
+
+                offset += byteCount;
             }
         }
     }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorDecoderFactory{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/TiffColorDecoderFactory{TPixel}.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation
     internal static class TiffColorDecoderFactory<TPixel>
         where TPixel : unmanaged, IPixel<TPixel>
     {
-        public static TiffBaseColorDecoder<TPixel> Create(TiffColorType colorType, TiffBitsPerSample bitsPerSample, ushort[] colorMap, ByteOrder byteOrder)
+        public static TiffBaseColorDecoder<TPixel> Create(Configuration configuration, TiffColorType colorType, TiffBitsPerSample bitsPerSample, ushort[] colorMap, ByteOrder byteOrder)
         {
             switch (colorType)
             {
@@ -65,12 +65,12 @@ public static TiffBaseColorDecoder<TPixel> Create(TiffColorType colorType, TiffB
                 case TiffColorType.BlackIsZero8:
                     DebugGuard.IsTrue(bitsPerSample.Channels == 1 && bitsPerSample.Channel0 == 8, "bitsPerSample");
                     DebugGuard.IsTrue(colorMap == null, "colorMap");
-                    return new BlackIsZero8TiffColor<TPixel>();
+                    return new BlackIsZero8TiffColor<TPixel>(configuration);
 
                 case TiffColorType.BlackIsZero16:
                     DebugGuard.IsTrue(bitsPerSample.Channels == 1 && bitsPerSample.Channel0 == 16, "bitsPerSample");
                     DebugGuard.IsTrue(colorMap == null, "colorMap");
-                    return new BlackIsZero16TiffColor<TPixel>(byteOrder == ByteOrder.BigEndian);
+                    return new BlackIsZero16TiffColor<TPixel>(configuration, byteOrder == ByteOrder.BigEndian);
 
                 case TiffColorType.BlackIsZero24:
                     DebugGuard.IsTrue(bitsPerSample.Channels == 1 && bitsPerSample.Channel0 == 24, "bitsPerSample");
@@ -114,7 +114,7 @@ public static TiffBaseColorDecoder<TPixel> Create(TiffColorType colorType, TiffB
                         && bitsPerSample.Channel0 == 8,
                         "bitsPerSample");
                     DebugGuard.IsTrue(colorMap == null, "colorMap");
-                    return new Rgb888TiffColor<TPixel>();
+                    return new Rgb888TiffColor<TPixel>(configuration);
 
                 case TiffColorType.Rgb101010:
                     DebugGuard.IsTrue(
@@ -154,7 +154,7 @@ public static TiffBaseColorDecoder<TPixel> Create(TiffColorType colorType, TiffB
                         && bitsPerSample.Channel0 == 16,
                         "bitsPerSample");
                     DebugGuard.IsTrue(colorMap == null, "colorMap");
-                    return new Rgb161616TiffColor<TPixel>(isBigEndian: byteOrder == ByteOrder.BigEndian);
+                    return new Rgb161616TiffColor<TPixel>(configuration, isBigEndian: byteOrder == ByteOrder.BigEndian);
 
                 case TiffColorType.Rgb242424:
                     DebugGuard.IsTrue(
diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
@@ -316,7 +316,7 @@ private void DecodeStripsChunky<TPixel>(ImageFrame<TPixel> frame, int rowsPerStr
                 this.Predictor,
                 this.FaxCompressionOptions);
 
-            TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.ColorType, this.BitsPerSample, this.ColorMap, this.byteOrder);
+            TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.Configuration, this.ColorType, this.BitsPerSample, this.ColorMap, this.byteOrder);
 
             for (int stripIndex = 0; stripIndex < stripOffsets.Length; stripIndex++)
             {
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs
@@ -188,7 +188,7 @@ public void Decode_WritesPixelData_8Bit(byte[] inputData, int bitsPerSample, int
         {
             AssertDecode(expectedResult, pixels =>
                 {
-                    new BlackIsZero8TiffColor<Rgba32>().Decode(inputData, pixels, left, top, width, height);
+                    new BlackIsZero8TiffColor<Rgba32>(Configuration.Default).Decode(inputData, pixels, left, top, width, height);
                 });
         }
     }
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs
@@ -179,7 +179,7 @@ public void Decode_WritesPixelData_8Bit(byte[] inputData, TiffBitsPerSample bits
         {
             AssertDecode(expectedResult, pixels =>
                 {
-                    new Rgb888TiffColor<Rgba32>().Decode(inputData, pixels, left, top, width, height);
+                    new Rgb888TiffColor<Rgba32>(Configuration.Default).Decode(inputData, pixels, left, top, width, height);
                 });
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ private void DecodeStripsChunky<TPixel>(ImageFrame<TPixel> frame, int rowsPerStr`
`316`	`316`	`this.Predictor,`
`317`	`317`	`this.FaxCompressionOptions);`
`318`	`318`
`319`		`- TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.ColorType, this.BitsPerSample, this.ColorMap, this.byteOrder);`
	`319`	`+ TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.Configuration, this.ColorType, this.BitsPerSample, this.ColorMap, this.byteOrder);`
`320`	`320`
`321`	`321`	`for (int stripIndex = 0; stripIndex < stripOffsets.Length; stripIndex++)`
`322`	`322`	`{`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public void Decode_WritesPixelData_8Bit(byte[] inputData, int bitsPerSample, int`
`188`	`188`	`{`
`189`	`189`	`AssertDecode(expectedResult, pixels =>`
`190`	`190`	`{`
`191`		`- new BlackIsZero8TiffColor<Rgba32>().Decode(inputData, pixels, left, top, width, height);`
	`191`	`+ new BlackIsZero8TiffColor<Rgba32>(Configuration.Default).Decode(inputData, pixels, left, top, width, height);`
`192`	`192`	`});`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public void Decode_WritesPixelData_8Bit(byte[] inputData, TiffBitsPerSample bits`
`179`	`179`	`{`
`180`	`180`	`AssertDecode(expectedResult, pixels =>`
`181`	`181`	`{`
`182`		`- new Rgb888TiffColor<Rgba32>().Decode(inputData, pixels, left, top, width, height);`
	`182`	`+ new Rgb888TiffColor<Rgba32>(Configuration.Default).Decode(inputData, pixels, left, top, width, height);`
`183`	`183`	`});`
`184`	`184`	`}`
`185`	`185`	`}`