Fixed implementation of methods and corrected unit tests.

dlemstra · Oct 15, 2023 · 58fbcd1 · 58fbcd1
1 parent 4972151
commit 58fbcd1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Magick.NET/MagickImage.cs b/src/Magick.NET/MagickImage.cs
@@ -3351,7 +3351,7 @@ public void ImportPixels(QuantumType[] data, int offset, IPixelImportSettings se
         Throw.IfTrue(nameof(settings), settings.StorageType != StorageType.Quantum, $"Storage type should be {nameof(StorageType.Quantum)}.");
 
         var length = data.Length - offset;
-        var expectedLength = GetExpectedByteLength(settings);
+        var expectedLength = GetExpectedLength(settings);
         Throw.IfTrue(nameof(data), length < expectedLength, "The data length is {0} but should be at least {1}.", data.Length, expectedLength + offset);
 
         _nativeInstance.ImportPixels(settings.X, settings.Y, settings.Width, settings.Height, settings.Mapping, settings.StorageType, data, offset);

diff --git a/src/Magick.NET/Netstandard21/MagickImage.cs b/src/Magick.NET/Netstandard21/MagickImage.cs
@@ -103,7 +103,7 @@ public void ImportPixels(ReadOnlySpan<byte> data, IPixelImportSettings settings)
         Throw.IfTrue(nameof(settings), settings.StorageType == StorageType.Undefined, "Storage type should not be undefined.");
 
         var length = data.Length;
-        var expectedLength = GetExpectedByteLength(settings);
+        var expectedLength = GetExpectedLength(settings);
         Throw.IfTrue(nameof(data), length < expectedLength, "The data length is {0} but should be at least {1}.", length, expectedLength);
 
         _nativeInstance.ImportPixels(settings.X, settings.Y, settings.Width, settings.Height, settings.Mapping, settings.StorageType, data, 0);
@@ -124,7 +124,7 @@ public void ImportPixels(ReadOnlySpan<QuantumType> data, IPixelImportSettings se
         Throw.IfTrue(nameof(settings), settings.StorageType != StorageType.Quantum, $"Storage type should be {nameof(StorageType.Quantum)}.");
 
         var length = data.Length;
-        var expectedLength = GetExpectedByteLength(settings);
+        var expectedLength = GetExpectedLength(settings);
         Throw.IfTrue(nameof(data), length < expectedLength, "The data length is {0} but should be at least {1}.", length, expectedLength);
 
         _nativeInstance.ImportPixels(settings.X, settings.Y, settings.Width, settings.Height, settings.Mapping, settings.StorageType, data, 0);
@@ -274,7 +274,7 @@ public void ReadPixels(ReadOnlySpan<QuantumType> data, IPixelReadSettings<Quantu
         SetSettings(newReadSettings);
 
         var length = data.Length;
-        var expectedLength = GetExpectedByteLength(settings);
+        var expectedLength = GetExpectedLength(settings);
         Throw.IfTrue(nameof(data), length < expectedLength, "The data length is {0} but should be at least {1}.", length, expectedLength);
 
         _nativeInstance.ReadPixels(settings.ReadSettings.Width!.Value, settings.ReadSettings.Height!.Value, settings.Mapping, settings.StorageType, data, 0);

diff --git a/tests/Magick.NET.Tests/Netstandard21/MagickImageTests/TheImportPixelsMethod.cs b/tests/Magick.NET.Tests/Netstandard21/MagickImageTests/TheImportPixelsMethod.cs
@@ -170,7 +170,7 @@ public void ShouldThrowExceptionWhenStorageTypeIsNotQuantum()
                 [Fact]
                 public void ShouldThrowExceptionWhenLengthIsTooLow()
                 {
-                    var settings = new PixelImportSettings(1, 1, StorageType.Char, PixelMapping.RGB);
+                    var settings = new PixelImportSettings(1, 1, StorageType.Quantum, PixelMapping.RGB);
 
                     using var image = new MagickImage();
 

diff --git a/tests/Magick.NET.Tests/Netstandard21/MagickImageTests/TheReadPixelsMethod.cs b/tests/Magick.NET.Tests/Netstandard21/MagickImageTests/TheReadPixelsMethod.cs
@@ -189,7 +189,7 @@ public void ShouldThrowExceptionWhenStorageTypeIsNotQuantum()
                 [Fact]
                 public void ShouldThrowExceptionWhenLengthIsTooLow()
                 {
-                    var settings = new PixelReadSettings(2, 2, StorageType.Char, "R");
+                    var settings = new PixelReadSettings(2, 2, StorageType.Quantum, "R");
                     using var image = new MagickImage();
 
                     var exception = Assert.Throws<ArgumentException>("data", () => image.ReadPixels(new Span<QuantumType>(new QuantumType[] { 215, 215 }), settings));