Avoid bounds checks

brianpopow · brianpopow · commit f1834c7816d9 · 2021-08-03T16:40:33.000+02:00
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero16TiffColor{TPixel}.cs
@@ -34,10 +34,10 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             int offset = 0;
             for (int y = top; y < top + height; y++)
             {
-                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
                 if (this.isBigEndian)
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ushort intensity = TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2));
                         offset += 2;
@@ -47,7 +47,7 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
                 }
                 else
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ushort intensity = TiffUtils.ConvertToShortLittleEndian(data.Slice(offset, 2));
                         offset += 2;
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZero8TiffColor{TPixel}.cs
@@ -24,8 +24,8 @@ 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++)
+                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);
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColor{TPixel}.cs
@@ -34,8 +34,8 @@ 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++)
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     int value = bitReader.ReadBits(this.bitsPerSample0);
                     float intensity = value / this.factor;
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/PaletteTiffColor{TPixel}.cs
@@ -35,8 +35,8 @@ 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++)
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     int index = bitReader.ReadBits(this.bitsPerSample0);
                     pixelRow[x] = this.palette[index];
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb161616TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb161616TiffColor{TPixel}.cs
@@ -35,11 +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);
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
 
                 if (this.isBigEndian)
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ulong r = TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2));
                         offset += 2;
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb16PlanarTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb16PlanarTiffColor{TPixel}.cs
@@ -1,8 +1,8 @@
 // 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;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
@@ -32,17 +32,17 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,
             var color = default(TPixel);
             color.FromVector4(TiffUtils.Vector4Default);
 
-            System.Span<byte> redData = data[0].GetSpan();
-            System.Span<byte> greenData = data[1].GetSpan();
-            System.Span<byte> blueData = data[2].GetSpan();
+            Span<byte> redData = data[0].GetSpan();
+            Span<byte> greenData = data[1].GetSpan();
+            Span<byte> blueData = data[2].GetSpan();
 
             int offset = 0;
             for (int y = top; y < top + height; y++)
             {
-                System.Span<TPixel> pixelRow = pixels.GetRowSpan(y);
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
                 if (this.isBigEndian)
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ulong r = TiffUtils.ConvertToShortBigEndian(redData.Slice(offset, 2));
                         ulong g = TiffUtils.ConvertToShortBigEndian(greenData.Slice(offset, 2));
@@ -55,7 +55,7 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,
                 }
                 else
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ulong r = TiffUtils.ConvertToShortLittleEndian(redData.Slice(offset, 2));
                         ulong g = TiffUtils.ConvertToShortLittleEndian(greenData.Slice(offset, 2));
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/Rgb888TiffColor{TPixel}.cs
@@ -24,9 +24,9 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             var rgba = default(Rgba32);
             for (int y = top; y < top + height; y++)
             {
-                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
 
-                for (int x = left; x < left + width; x++)
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     byte r = data[offset++];
                     byte g = data[offset++];
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs
@@ -58,8 +58,8 @@ 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++)
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     float r = rBitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;
                     float g = gBitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbTiffColor{TPixel}.cs
@@ -47,8 +47,8 @@ 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++)
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     float r = bitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;
                     float g = bitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero16TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero16TiffColor{TPixel}.cs
@@ -34,10 +34,10 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
             int offset = 0;
             for (int y = top; y < top + height; y++)
             {
-                Span<TPixel> pixelRow = pixels.GetRowSpan(y);
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
                 if (this.isBigEndian)
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ushort intensity = (ushort)(ushort.MaxValue - TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2)));
                         offset += 2;
@@ -47,7 +47,7 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in
                 }
                 else
                 {
-                    for (int x = left; x < left + width; x++)
+                    for (int x = 0; x < pixelRow.Length; x++)
                     {
                         ushort intensity = (ushort)(ushort.MaxValue - TiffUtils.ConvertToShortLittleEndian(data.Slice(offset, 2)));
                         offset += 2;
diff --git a/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor{TPixel}.cs b/src/ImageSharp/Formats/Tiff/PhotometricInterpretation/WhiteIsZero8TiffColor{TPixel}.cs
@@ -24,8 +24,8 @@ 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++)
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     byte intensity = (byte)(255 - data[offset++]);
                     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,8 +34,8 @@ 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++)
+                Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);
+                for (int x = 0; x < pixelRow.Length; x++)
                 {
                     int value = bitReader.ReadBits(this.bitsPerSample0);
                     float intensity = 1.0f - (value / this.factor);

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`34`	`34`	`int offset = 0;`
`35`	`35`	`for (int y = top; y < top + height; y++)`
`36`	`36`	`{`
`37`		`- Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
	`37`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
`38`	`38`	`if (this.isBigEndian)`
`39`	`39`	`{`
`40`		`- for (int x = left; x < left + width; x++)`
	`40`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`41`	`41`	`{`
`42`	`42`	`ushort intensity = TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2));`
`43`	`43`	`offset += 2;`
`@@ -47,7 +47,7 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`47`	`47`	`}`
`48`	`48`	`else`
`49`	`49`	`{`
`50`		`- for (int x = left; x < left + width; x++)`
	`50`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`51`	`51`	`{`
`52`	`52`	`ushort intensity = TiffUtils.ConvertToShortLittleEndian(data.Slice(offset, 2));`
`53`	`53`	`offset += 2;`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ 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);`
`28`		`- for (int x = left; x < left + width; x++)`
	`27`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
	`28`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`29`	`29`	`{`
`30`	`30`	`byte intensity = data[offset++];`
`31`	`31`	`pixelRow[x] = TiffUtils.ColorFromL8(l8, intensity, color);`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ 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);`
`38`		`- for (int x = left; x < left + width; x++)`
	`37`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
	`38`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`39`	`39`	`{`
`40`	`40`	`int value = bitReader.ReadBits(this.bitsPerSample0);`
`41`	`41`	`float intensity = value / this.factor;`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ 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);`
`39`		`- for (int x = left; x < left + width; x++)`
	`38`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
	`39`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`40`	`40`	`{`
`41`	`41`	`int index = bitReader.ReadBits(this.bitsPerSample0);`
`42`	`42`	`pixelRow[x] = this.palette[index];`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +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`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
`39`	`39`
`40`	`40`	`if (this.isBigEndian)`
`41`	`41`	`{`
`42`		`- for (int x = left; x < left + width; x++)`
	`42`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`43`	`43`	`{`
`44`	`44`	`ulong r = TiffUtils.ConvertToShortBigEndian(data.Slice(offset, 2));`
`45`	`45`	`offset += 2;`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ public override void Decode(ReadOnlySpan<byte> data, Buffer2D<TPixel> pixels, in`
`24`	`24`	`var rgba = default(Rgba32);`
`25`	`25`	`for (int y = top; y < top + height; y++)`
`26`	`26`	`{`
`27`		`- Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
	`27`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
`28`	`28`
`29`		`- for (int x = left; x < left + width; x++)`
	`29`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`30`	`30`	`{`
`31`	`31`	`byte r = data[offset++];`
`32`	`32`	`byte g = data[offset++];`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ public override void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels,`
`58`	`58`
`59`	`59`	`for (int y = top; y < top + height; y++)`
`60`	`60`	`{`
`61`		`- Span<TPixel> pixelRow = pixels.GetRowSpan(y);`
`62`		`- for (int x = left; x < left + width; x++)`
	`61`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
	`62`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`63`	`63`	`{`
`64`	`64`	`float r = rBitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;`
`65`	`65`	`float g = gBitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ 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);`
`51`		`- for (int x = left; x < left + width; x++)`
	`50`	`+ Span<TPixel> pixelRow = pixels.GetRowSpan(y).Slice(left, width);`
	`51`	`+ for (int x = 0; x < pixelRow.Length; x++)`
`52`	`52`	`{`
`53`	`53`	`float r = bitReader.ReadBits(this.bitsPerSampleR) / this.rFactor;`
`54`	`54`	`float g = bitReader.ReadBits(this.bitsPerSampleG) / this.gFactor;`