diff --git a/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs b/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs
index 74f0c1e8e..a97d17fdb 100644
--- a/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs
+++ b/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs
@@ -46,7 +46,8 @@ namespace ImageSharp
/// The maxArrayLength value
internal static int CalculateMaxArrayLength()
{
- if (typeof(IPixel).IsAssignableFrom(typeof(T)))
+ // ReSharper disable once SuspiciousTypeConversion.Global
+ if (default(T) is IPixel)
{
const int MaximumExpectedImageSize = 16384;
return MaximumExpectedImageSize * MaximumExpectedImageSize;
diff --git a/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs b/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
index 4e1083033..0e69a54f5 100644
--- a/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
@@ -9,22 +9,21 @@
{
public class Color : BulkPixelOperationsTests
{
- // MemberData does not work without redeclaring the public field in the derived test class:
- public static TheoryData ArraySizesData = new TheoryData { 7, 16, 1111 };
+ // For 4.6 test runner MemberData does not work without redeclaring the public field in the derived test class:
+ public static new TheoryData ArraySizesData => new TheoryData { 7, 16, 1111 };
}
public class Argb : BulkPixelOperationsTests
{
- // MemberData does not work without redeclaring the public field in the derived test class:
- public static TheoryData ArraySizesData = new TheoryData { 7, 16, 1111 };
+ // For 4.6 test runner MemberData does not work without redeclaring the public field in the derived test class:
+ public static new TheoryData ArraySizesData => new TheoryData { 7, 16, 1111 };
}
}
public abstract class BulkPixelOperationsTests
where TColor : struct, IPixel
{
- // The field is private so it can be safely redeclared in inherited non-abstract test classes.
- private static TheoryData ArraySizesData = new TheoryData { 7, 16, 1111 };
+ public static TheoryData ArraySizesData => new TheoryData { 7, 16, 1111 };
[Theory]
[MemberData(nameof(ArraySizesData))]