From bcfd3f3ca48fb3b73eb4d6f73b183398350f0ee4 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sun, 3 Oct 2021 23:02:35 +0200 Subject: [PATCH] use nint with Unsafe.Add --- .../ColorConverters/JpegColorConverter.FromCmykAvx2.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromCmykVector8.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromGrayScaleAvx2.cs | 4 ++-- .../Decoder/ColorConverters/JpegColorConverter.FromRgbAvx2.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromRgbVector8.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromYCbCrAvx2.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromYCbCrVector4.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromYCbCrVector8.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromYccKAvx2.cs | 4 ++-- .../ColorConverters/JpegColorConverter.FromYccKVector8.cs | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykAvx2.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykAvx2.cs index 2c77a42a0..216c12735 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykAvx2.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykAvx2.cs @@ -37,8 +37,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters // Used for the color conversion var scale = Vector256.Create(1 / this.MaximumValue); - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { ref Vector256 c = ref Unsafe.Add(ref c0Base, i); ref Vector256 m = ref Unsafe.Add(ref c1Base, i); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykVector8.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykVector8.cs index 7a272d148..0da4c9ec2 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykVector8.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromCmykVector8.cs @@ -32,8 +32,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters var scale = new Vector(1 / this.MaximumValue); // Walking 8 elements at one step: - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { ref Vector c = ref Unsafe.Add(ref cBase, i); ref Vector m = ref Unsafe.Add(ref mBase, i); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromGrayScaleAvx2.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromGrayScaleAvx2.cs index c54ecdedc..eca6b6292 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromGrayScaleAvx2.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromGrayScaleAvx2.cs @@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters // Used for the color conversion var scale = Vector256.Create(1 / this.MaximumValue); - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { ref Vector256 c0 = ref Unsafe.Add(ref c0Base, i); c0 = Avx.Multiply(c0, scale); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbAvx2.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbAvx2.cs index 2ec78c527..557e4e417 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbAvx2.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbAvx2.cs @@ -34,8 +34,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters // Used for the color conversion var scale = Vector256.Create(1 / this.MaximumValue); - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { ref Vector256 r = ref Unsafe.Add(ref rBase, i); ref Vector256 g = ref Unsafe.Add(ref gBase, i); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbVector8.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbVector8.cs index 3def60186..a00361d97 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbVector8.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromRgbVector8.cs @@ -30,8 +30,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters var scale = new Vector(1 / this.MaximumValue); // Walking 8 elements at one step: - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { ref Vector r = ref Unsafe.Add(ref rBase, i); ref Vector g = ref Unsafe.Add(ref gBase, i); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrAvx2.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrAvx2.cs index 67447aae5..5aae1faa2 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrAvx2.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrAvx2.cs @@ -47,8 +47,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters Vector256 vcontrol = Unsafe.As>(ref control); // Walking 8 elements at one step: - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { // y = yVals[i]; // cb = cbVals[i] - 128F; diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector4.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector4.cs index f65ba3026..1ebc3e879 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector4.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector4.cs @@ -35,9 +35,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters var maxValue = this.MaximumValue; // Walking 8 elements at one step: - int n = values.Component0.Length / 8; + nint n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + for (nint i = 0; i < n; i++) { // y = yVals[i]; ref Vector4Pair c0 = ref Unsafe.Add(ref c0Base, i); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector8.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector8.cs index 633c7f41d..a077b9ed8 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector8.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrVector8.cs @@ -31,10 +31,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters var chromaOffset = new Vector(-this.HalfValue); // Walking 8 elements at one step: - int n = values.Component0.Length / 8; + nint n = values.Component0.Length / 8; var scale = new Vector(1 / this.MaximumValue); - for (int i = 0; i < n; i++) + for (nint i = 0; i < n; i++) { // y = yVals[i]; // cb = cbVals[i] - 128F; diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKAvx2.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKAvx2.cs index 5fc2fe75b..a3500a096 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKAvx2.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKAvx2.cs @@ -44,8 +44,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters var bCbMult = Vector256.Create(1.772F); // Walking 8 elements at one step: - int n = values.Component0.Length / 8; - for (int i = 0; i < n; i++) + nint n = values.Component0.Length / 8; + for (nint i = 0; i < n; i++) { // y = yVals[i]; // cb = cbVals[i] - 128F; diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKVector8.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKVector8.cs index de516980e..0a4c3f528 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKVector8.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYccKVector8.cs @@ -32,12 +32,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters var chromaOffset = new Vector(-this.HalfValue); // Walking 8 elements at one step: - int n = values.Component0.Length / 8; + nint n = values.Component0.Length / 8; var scale = new Vector(1 / (this.MaximumValue * this.MaximumValue)); var max = new Vector(this.MaximumValue); - for (int i = 0; i < n; i++) + for (nint i = 0; i < n; i++) { // y = yVals[i]; // cb = cbVals[i] - 128F;