skip ArrayPool<byte>.Shared.Return when buffer is null (#34)

saucecontrol · Jan 7, 2020 · b334866 · b334866
1 parent a55840f
commit b334866
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/src/MagicScaler/Magic/ConversionTransform.cs b/src/MagicScaler/Magic/ConversionTransform.cs
@@ -148,7 +148,10 @@ unsafe private void copyPixelsDirect(in PixelArea prc, int cbStride, int cbBuffe
 
 		public void Dispose()
 		{
-			ArrayPool<byte>.Shared.Return(lineBuff ?? Array.Empty<byte>());
+			if (lineBuff is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(lineBuff);
 			lineBuff = null;
 		}
 

diff --git a/src/MagicScaler/Magic/ConvolutionTransform.cs b/src/MagicScaler/Magic/ConvolutionTransform.cs
@@ -208,7 +208,10 @@ public virtual void Dispose()
 			SrcBuff?.Dispose();
 			WorkBuff?.Dispose();
 
-			ArrayPool<byte>.Shared.Return(lineBuff ?? Array.Empty<byte>());
+			if (lineBuff is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(lineBuff);
 			lineBuff = null;
 		}
 
@@ -261,7 +264,10 @@ public override void Dispose()
 		{
 			base.Dispose();
 
-			ArrayPool<byte>.Shared.Return(blurBuff ?? Array.Empty<byte>());
+			if (blurBuff is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(blurBuff);
 			blurBuff = null!;
 		}
 

diff --git a/src/MagicScaler/Magic/HybridScaleTransform.cs b/src/MagicScaler/Magic/HybridScaleTransform.cs
@@ -364,7 +364,11 @@ unsafe private void process(byte* ipstart, byte* opstart, uint stride, bool rup)
 
 		public void Dispose()
 		{
-			ArrayPool<byte>.Shared.Return(lineBuff ?? Array.Empty<byte>());
+			if (lineBuff is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(lineBuff);
+
 			lineBuff = null!;
 		}
 

diff --git a/src/MagicScaler/Magic/KernelMap.cs b/src/MagicScaler/Magic/KernelMap.cs
@@ -224,7 +224,10 @@ unsafe public static KernelMap<T> CreateBlur(int size, double radius, int ichann
 
 		public void Dispose()
 		{
-			ArrayPool<byte>.Shared.Return(map ?? Array.Empty<byte>());
+			if (map is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(map);
 			map = null!;
 		}
 	}

diff --git a/src/MagicScaler/Magic/OrientationTransform.cs b/src/MagicScaler/Magic/OrientationTransform.cs
@@ -246,7 +246,10 @@ public void Dispose()
 		{
 			srcBuff?.Dispose();
 
-			ArrayPool<byte>.Shared.Return(lineBuff ?? Array.Empty<byte>());
+			if (lineBuff is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(lineBuff);
 			lineBuff = null;
 		}
 	}

diff --git a/src/MagicScaler/Magic/PlanarConversionTransform.cs b/src/MagicScaler/Magic/PlanarConversionTransform.cs
@@ -224,7 +224,10 @@ unsafe private void copyPixelsAvx(byte* bstart, byte* opstart, uint bstride, uin
 
 		public void Dispose()
 		{
-			ArrayPool<byte>.Shared.Return(lineBuff ?? Array.Empty<byte>());
+			if (lineBuff is null)
+				return;
+
+			ArrayPool<byte>.Shared.Return(lineBuff);
 			lineBuff = null!;
 		}
 	}