From 3ee73a89c535e379ec36e6edf032332a7d466bf5 Mon Sep 17 00:00:00 2001 From: Ynse Hoornenborg Date: Thu, 16 Dec 2021 17:50:55 +0100 Subject: [PATCH] Update IComponentShuffle back to int again --- .../Helpers/Shuffle/IComponentShuffle.cs | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ImageSharp/Common/Helpers/Shuffle/IComponentShuffle.cs b/src/ImageSharp/Common/Helpers/Shuffle/IComponentShuffle.cs index a1224a767..049c61185 100644 --- a/src/ImageSharp/Common/Helpers/Shuffle/IComponentShuffle.cs +++ b/src/ImageSharp/Common/Helpers/Shuffle/IComponentShuffle.cs @@ -97,15 +97,15 @@ namespace SixLabors.ImageSharp { ref uint sBase = ref Unsafe.As(ref MemoryMarshal.GetReference(source)); ref uint dBase = ref Unsafe.As(ref MemoryMarshal.GetReference(dest)); - nuint n = (nuint)(uint)source.Length / 4; + int n = source.Length / 4; - for (nuint i = 0; i < n; i++) + for (int i = 0; i < n; i++) { - uint packed = Unsafe.Add(ref sBase, (IntPtr)(uint)i); + uint packed = Unsafe.Add(ref sBase, i); // packed = [W Z Y X] // ROTL(8, packed) = [Z Y X W] - Unsafe.Add(ref dBase, (IntPtr)(uint)i) = (packed << 8) | (packed >> 24); + Unsafe.Add(ref dBase, i) = (packed << 8) | (packed >> 24); } } } @@ -123,15 +123,15 @@ namespace SixLabors.ImageSharp { ref uint sBase = ref Unsafe.As(ref MemoryMarshal.GetReference(source)); ref uint dBase = ref Unsafe.As(ref MemoryMarshal.GetReference(dest)); - nuint n = (nuint)(uint)source.Length / 4; + int n = source.Length / 4; - for (nuint i = 0; i < n; i++) + for (int i = 0; i < n; i++) { - uint packed = Unsafe.Add(ref sBase, (IntPtr)(uint)i); + uint packed = Unsafe.Add(ref sBase, i); // packed = [W Z Y X] // REVERSE(packedArgb) = [X Y Z W] - Unsafe.Add(ref dBase, (IntPtr)(uint)i) = BinaryPrimitives.ReverseEndianness(packed); + Unsafe.Add(ref dBase, i) = BinaryPrimitives.ReverseEndianness(packed); } } } @@ -149,15 +149,15 @@ namespace SixLabors.ImageSharp { ref uint sBase = ref Unsafe.As(ref MemoryMarshal.GetReference(source)); ref uint dBase = ref Unsafe.As(ref MemoryMarshal.GetReference(dest)); - nuint n = (nuint)(uint)source.Length / 4; + int n = source.Length / 4; - for (nuint i = 0; i < n; i++) + for (int i = 0; i < n; i++) { - uint packed = Unsafe.Add(ref sBase, (IntPtr)(uint)i); + uint packed = Unsafe.Add(ref sBase, i); // packed = [W Z Y X] // ROTR(8, packedArgb) = [Y Z W X] - Unsafe.Add(ref dBase, (IntPtr)(uint)i) = Numerics.RotateRight(packed, 8); + Unsafe.Add(ref dBase, i) = Numerics.RotateRight(packed, 8); } } } @@ -175,11 +175,11 @@ namespace SixLabors.ImageSharp { ref uint sBase = ref Unsafe.As(ref MemoryMarshal.GetReference(source)); ref uint dBase = ref Unsafe.As(ref MemoryMarshal.GetReference(dest)); - nuint n = (nuint)(uint)source.Length / 4; + int n = source.Length / 4; - for (nuint i = 0; i < n; i++) + for (int i = 0; i < n; i++) { - uint packed = Unsafe.Add(ref sBase, (IntPtr)(uint)i); + uint packed = Unsafe.Add(ref sBase, i); // packed = [W Z Y X] // tmp1 = [W 0 Y 0] @@ -190,7 +190,7 @@ namespace SixLabors.ImageSharp uint tmp2 = packed & 0x00FF00FF; uint tmp3 = Numerics.RotateLeft(tmp2, 16); - Unsafe.Add(ref dBase, (IntPtr)(uint)i) = tmp1 + tmp3; + Unsafe.Add(ref dBase, i) = tmp1 + tmp3; } } } @@ -208,11 +208,11 @@ namespace SixLabors.ImageSharp { ref uint sBase = ref Unsafe.As(ref MemoryMarshal.GetReference(source)); ref uint dBase = ref Unsafe.As(ref MemoryMarshal.GetReference(dest)); - nuint n = (nuint)(uint)source.Length / 4; + int n = source.Length / 4; - for (nuint i = 0; i < n; i++) + for (int i = 0; i < n; i++) { - uint packed = Unsafe.Add(ref sBase, (IntPtr)(uint)i); + uint packed = Unsafe.Add(ref sBase, i); // packed = [W Z Y X] // tmp1 = [0 Z 0 X] @@ -223,7 +223,7 @@ namespace SixLabors.ImageSharp uint tmp2 = packed & 0xFF00FF00; uint tmp3 = Numerics.RotateLeft(tmp2, 16); - Unsafe.Add(ref dBase, (IntPtr)(uint)i) = tmp1 + tmp3; + Unsafe.Add(ref dBase, i) = tmp1 + tmp3; } } }