Use pixel row span to access pixels

brianpopow · brianpopow · commit 0ae95f17d970 · 2021-08-03T14:34:03.000+02:00
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs
@@ -32,14 +32,15 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             var l16 = default(L16);
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 if (this.isBigEndian)
                 {
                     for (int x = left; x < left + width; x++)
                     {
                         ushort intensity = TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2));
                         offset += 2;
 
-                        pixels[x, y] = TiffUtils.ColorFromL16(l16, intensity, color);
+                        pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);
                     }
                 }
                 else
@@ -49,7 +50,7 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
                         ushort intensity = TiffUtils.ConvertToShortLittleEndian(data.Slice(offset, 2));
                         offset += 2;
 
-                        pixels[x, y] = TiffUtils.ColorFromL16(l16, intensity, color);
+                        pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);
                     }
                 }
             }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor{TPixel}.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
+using SixLabors.ImageSharp.Formats.Tiff.Utils;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -24,14 +24,11 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             var l8 = default(L8);
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     byte intensity = data[offset++];
-
-                    l8.PackedValue = intensity;
-                    color.FromL8(l8);
-
-                    pixels[x, y] = color;
+                    pixelRow[x] = TiffUtils.ColorFromL8(l8, intensity, color);
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor{TPixel}.cs
@@ -34,13 +34,14 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
 
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     int value = bitReader.ReadBits(this.bitsPerSample0);
                     float intensity = value / this.factor;
 
                     color.FromVector4(new Vector4(intensity, intensity, intensity, 1.0f));
-                    pixels[x, y] = color;
+                    pixelRow[x] = color;
                 }
 
                 bitReader.NextRow();
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor{TPixel}.cs
@@ -35,10 +35,11 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
 
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     int index = bitReader.ReadBits(this.bitsPerSample0);
-                    pixels[x, y] = this.palette[index];
+                    pixelRow[x] = this.palette[index];
                 }
 
                 bitReader.NextRow();
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb16PlanarTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb16PlanarTiffColor{TPixel}.cs
@@ -35,6 +35,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,
             var rgba = default(Rgba64);
             for (int y = top; y < top + height; y++)
             {
+                System.Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 if (this.isBigEndian)
                 {
                     for (int x = left; x < left + width; x++)
@@ -45,7 +46,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,
 
                         offset += 2;
 
-                        pixels[x, y] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);
+                        pixelRow[x] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);
                     }
                 }
                 else
@@ -58,7 +59,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,
 
                         offset += 2;
 
-                        pixels[x, y] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);
+                        pixelRow[x] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);
                     }
                 }
             }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Buffers;
 using System.Numerics;
 using SixLabors.ImageSharp.Formats.Tiff.Utils;
@@ -57,14 +58,15 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,
 
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     float r = rBitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;
                     float g = gBitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;
                     float b = bBitReader.ReadBits(this.bitsPerSampleB) / this.bFactor;
 
                     color.FromVector4(new Vector4(r, g, b, 1.0f));
-                    pixels[x, y] = color;
+                    pixelRow[x] = color;
                 }
 
                 rBitReader.NextRow();
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor{TPixel}.cs
@@ -47,14 +47,15 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
 
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     float r = bitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;
                     float g = bitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;
                     float b = bitReader.ReadBits(this.bitsPerSampleB) / this.bFactor;
 
                     color.FromVector4(new Vector4(r, g, b, 1.0f));
-                    pixels[x, y] = color;
+                    pixelRow[x] = color;
                 }
 
                 bitReader.NextRow();
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero16TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero16TiffColor{TPixel}.cs
@@ -32,14 +32,15 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             var l16 = default(L16);
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 if (this.isBigEndian)
                 {
                     for (int x = left; x < left + width; x++)
                     {
                         ushort intensity = (ushort)(ushort.MaxValue - TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2)));
                         offset += 2;
 
-                        pixels[x, y] = TiffUtils.ColorFromL16(l16, intensity, color);
+                        pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);
                     }
                 }
                 else
@@ -49,7 +50,7 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
                         ushort intensity = (ushort)(ushort.MaxValue - TiffUtils.ConvertToShortLittleEndian(data.Slice(offset, 2)));
                         offset += 2;
 
-                        pixels[x, y] = TiffUtils.ColorFromL16(l16, intensity, color);
+                        pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);
                     }
                 }
             }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor{TPixel}.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-
+using SixLabors.ImageSharp.Formats.Tiff.Utils;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -24,14 +24,11 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             var l8 = default(L8);
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     byte intensity = (byte)(255 - data[offset++]);
-
-                    l8.PackedValue = intensity;
-                    color.FromL8(l8);
-
-                    pixels[x, y] = color;
+                    pixelRow[x] = TiffUtils.ColorFromL8(l8, intensity, color);
                 }
             }
         }
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColor{TPixel}.cs
@@ -34,13 +34,14 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
 
             for (int y = top; y < top + height; y++)
             {
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
                 for (int x = left; x < left + width; x++)
                 {
                     int value = bitReader.ReadBits(this.bitsPerSample0);
                     float intensity = 1.0f - (value / this.factor);
 
                     color.FromVector4(new Vector4(intensity, intensity, intensity, 1.0f));
-                    pixels[x, y] = color;
+                    pixelRow[x] = color;
                 }
 
                 bitReader.NextRow();
diff --git a/src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs b/src/ImageSharp/Formats/Tiff/Utils/TiffUtils.cs
@@ -21,6 +21,15 @@ public static ushort ConvertToShortBigEndian(ReadOnlySpan<byte> buffer) =>
         public static ushort ConvertToShortLittleEndian(ReadOnlySpan<byte> buffer) =>
             BinaryPrimitives.ReadUInt16LittleEndian(buffer);
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static TPixel ColorFromL8<TPixel>(L8 l8, byte intensity, TPixel color)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            l8.PackedValue = intensity;
+            color.FromL8(l8);
+            return color;
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static TPixel ColorFromL16<TPixel>(L16 l16, ushort intensity, TPixel color)
             where TPixel : unmanaged, IPixel<TPixel>

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,15 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`32`	`32`	`var l16 = default(L16);`
`33`	`33`	`for (int y = top; y < top + height; y++)`
`34`	`34`	`{`
	`35`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`35`	`36`	`if (this.isBigEndian)`
`36`	`37`	`{`
`37`	`38`	`for (int x = left; x < left + width; x++)`
`38`	`39`	`{`
`39`	`40`	`ushort intensity = TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2));`
`40`	`41`	`offset += 2;`
`41`	`42`
`42`		`- pixels[x, y] = TiffUtils.ColorFromL16(l16, intensity, color);`
	`43`	`+ pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`else`
`@@ -49,7 +50,7 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`49`	`50`	`ushort intensity = TiffUtils.ConvertToShortLittleEndian(data.Slice(offset, 2));`
`50`	`51`	`offset += 2;`
`51`	`52`
`52`		`- pixels[x, y] = TiffUtils.ColorFromL16(l16, intensity, color);`
	`53`	`+ pixelRow[x] = TiffUtils.ColorFromL16(l16, intensity, color);`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-`
	`5`	`+using SixLabors.ImageSharp.Formats.Tiff.Utils;`
`6`	`6`	`using SixLabors.ImageSharp.Memory;`
`7`	`7`	`using SixLabors.ImageSharp.PixelFormats;`
`8`	`8`
`@@ -24,14 +24,11 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`24`	`24`	`var l8 = default(L8);`
`25`	`25`	`for (int y = top; y < top + height; y++)`
`26`	`26`	`{`
	`27`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`27`	`28`	`for (int x = left; x < left + width; x++)`
`28`	`29`	`{`
`29`	`30`	`byte intensity = data[offset++];`
`30`		`-`
`31`		`- l8.PackedValue = intensity;`
`32`		`- color.FromL8(l8);`
`33`		`-`
`34`		`- pixels[x, y] = color;`
	`31`	`+ pixelRow[x] = TiffUtils.ColorFromL8(l8, intensity, color);`
`35`	`32`	`}`
`36`	`33`	`}`
`37`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,14 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`34`	`34`
`35`	`35`	`for (int y = top; y < top + height; y++)`
`36`	`36`	`{`
	`37`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`37`	`38`	`for (int x = left; x < left + width; x++)`
`38`	`39`	`{`
`39`	`40`	`int value = bitReader.ReadBits(this.bitsPerSample0);`
`40`	`41`	`float intensity = value / this.factor;`
`41`	`42`
`42`	`43`	`color.FromVector4(new Vector4(intensity, intensity, intensity, 1.0f));`
`43`		`- pixels[x, y] = color;`
	`44`	`+ pixelRow[x] = color;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`bitReader.NextRow();`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,11 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`35`	`35`
`36`	`36`	`for (int y = top; y < top + height; y++)`
`37`	`37`	`{`
	`38`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`38`	`39`	`for (int x = left; x < left + width; x++)`
`39`	`40`	`{`
`40`	`41`	`int index = bitReader.ReadBits(this.bitsPerSample0);`
`41`		`- pixels[x, y] = this.palette[index];`
	`42`	`+ pixelRow[x] = this.palette[index];`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`bitReader.NextRow();`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,`
`35`	`35`	`var rgba = default(Rgba64);`
`36`	`36`	`for (int y = top; y < top + height; y++)`
`37`	`37`	`{`
	`38`	`+ System.Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`38`	`39`	`if (this.isBigEndian)`
`39`	`40`	`{`
`40`	`41`	`for (int x = left; x < left + width; x++)`
`@@ -45,7 +46,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,`
`45`	`46`
`46`	`47`	`offset += 2;`
`47`	`48`
`48`		`- pixels[x, y] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);`
	`49`	`+ pixelRow[x] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`else`
`@@ -58,7 +59,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,`
`58`	`59`
`59`	`60`	`offset += 2;`
`60`	`61`
`61`		`- pixels[x, y] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);`
	`62`	`+ pixelRow[x] = TiffUtils.ColorFromRgba64(rgba, r, g, b, color);`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,15 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`47`	`47`
`48`	`48`	`for (int y = top; y < top + height; y++)`
`49`	`49`	`{`
	`50`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`50`	`51`	`for (int x = left; x < left + width; x++)`
`51`	`52`	`{`
`52`	`53`	`float r = bitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;`
`53`	`54`	`float g = bitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;`
`54`	`55`	`float b = bitReader.ReadBits(this.bitsPerSampleB) / this.bFactor;`
`55`	`56`
`56`	`57`	`color.FromVector4(new Vector4(r, g, b, 1.0f));`
`57`		`- pixels[x, y] = color;`
	`58`	`+ pixelRow[x] = color;`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`bitReader.NextRow();`