From ff77361e7c8277c5eddd71614dcbd808e22360cf Mon Sep 17 00:00:00 2001 From: Brian Popow <38701097+brianpopow@users.noreply.github.com> Date: Mon, 15 Nov 2021 20:00:25 +0100 Subject: [PATCH] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Günther Foidl --- .../Formats/Webp/Lossless/LosslessUtils.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ImageSharp/Formats/Webp/Lossless/LosslessUtils.cs b/src/ImageSharp/Formats/Webp/Lossless/LosslessUtils.cs index c202ad4a8b..5903ba9a29 100644 --- a/src/ImageSharp/Formats/Webp/Lossless/LosslessUtils.cs +++ b/src/ImageSharp/Formats/Webp/Lossless/LosslessUtils.cs @@ -147,7 +147,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless { int numPixels = pixelData.Length; int i; - for (i = 0; i + 4 <= numPixels; i += 4) + for (i = 0; i <= numPixels - 4; i += 4) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), i); Vector128 input = Unsafe.As>(ref pos).AsByte(); @@ -165,7 +165,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless { int numPixels = pixelData.Length; int i; - for (i = 0; i + 4 <= numPixels; i += 4) + for (i = 0; i <= numPixels - 4; i += 4) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), i); Vector128 input = Unsafe.As>(ref pos).AsByte(); @@ -209,7 +209,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless { int numPixels = pixelData.Length; int i; - for (i = 0; i + 8 <= numPixels; i += 8) + for (i = 0; i <= numPixels - 8; i += 8) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), i); Vector256 input = Unsafe.As>(ref pos).AsByte(); @@ -227,7 +227,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless { int numPixels = pixelData.Length; int i; - for (i = 0; i + 4 <= numPixels; i += 4) + for (i = 0; i <= numPixels - 4; i += 4) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), i); Vector128 input = Unsafe.As>(ref pos).AsByte(); @@ -245,7 +245,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless { int numPixels = pixelData.Length; int i; - for (i = 0; i + 4 <= numPixels; i += 4) + for (i = 0; i <= numPixels - 4; i += 4) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), i); Vector128 input = Unsafe.As>(ref pos).AsByte(); @@ -402,7 +402,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless Vector256 multsb2 = MkCst32(Cst5b(m.RedToBlue), 0); int idx; - for (idx = 0; idx + 8 <= numPixels; idx += 8) + for (idx = 0; idx <= numPixels - 8; idx += 8) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), idx); Vector256 input = Unsafe.As>(ref pos); @@ -429,7 +429,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless Vector128 multsrb = MkCst16(Cst5b(m.GreenToRed), Cst5b(m.GreenToBlue)); Vector128 multsb2 = MkCst16(Cst5b(m.RedToBlue), 0); int idx; - for (idx = 0; idx + 4 <= numPixels; idx += 4) + for (idx = 0; idx <= numPixels - 4; idx += 4) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), idx); Vector128 input = Unsafe.As>(ref pos); @@ -489,7 +489,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless Vector256 multsrb = MkCst32(Cst5b(m.GreenToRed), Cst5b(m.GreenToBlue)); Vector256 multsb2 = MkCst32(Cst5b(m.RedToBlue), 0); int idx; - for (idx = 0; idx + 8 <= pixelData.Length; idx += 8) + for (idx = 0; idx <= pixelData.Length - 8; idx += 8) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), idx); Vector256 input = Unsafe.As>(ref pos); @@ -518,7 +518,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossless Vector128 multsb2 = MkCst16(Cst5b(m.RedToBlue), 0); int idx; - for (idx = 0; idx + 4 <= pixelData.Length; idx += 4) + for (idx = 0; idx <= pixelData.Length - 4; idx += 4) { ref uint pos = ref Unsafe.Add(ref MemoryMarshal.GetReference(pixelData), idx); Vector128 input = Unsafe.As>(ref pos);