Merge branch 'master' into js/jpeg-encoder-perf

.github/workflows/build-and-test.yml

@@ -14,6 +14,18 @@ jobs:
         strategy:
             matrix:
                 options:
+                    - os: ubuntu-latest
+                      framework: net5.0
+                      runtime: -x64
+                      codecov: false
+                    - os: macos-latest
+                      framework: net5.0
+                      runtime: -x64
+                      codecov: false
+                    - os: windows-latest
+                      framework: net5.0
+                      runtime: -x64
+                      codecov: false
                     - os: ubuntu-latest
                       framework: netcoreapp3.1
                       runtime: -x64
@@ -67,12 +79,14 @@ jobs:
             - name: Build
               shell: pwsh
               run: ./ci-build.ps1 "${{matrix.options.framework}}"
+              env:
+                SIXLABORS_TESTING: True
 
             - name: Test
               shell: pwsh
               run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
               env:
-                  CI: True
+                  SIXLABORS_TESTING: True
                   XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
 
             - name: Export Failed Output

shared-infrastructure

@@ -1 +1 @@
-Subproject commit b7b9a2755e456a96acbf103494228226d92eddf3
+Subproject commit af824b8bad7307b735662e3eeab39d401c41741c

src/ImageSharp/Formats/Gif/GifDecoderCore.cs

@@ -535,7 +535,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 return;
             }
 
-            Buffer2DRegion<TPixel> pixelRegion = frame.PixelBuffer.GetRegion(this.restoreArea.Value);
+            var interest = Rectangle.Intersect(frame.Bounds(), this.restoreArea.Value);
+            Buffer2DRegion<TPixel> pixelRegion = frame.PixelBuffer.GetRegion(interest);
             pixelRegion.Clear();
 
             this.restoreArea = null;

src/ImageSharp/Image.WrapMemory.cs

@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp
     {
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -52,7 +52,7 @@ namespace SixLabors.ImageSharp
         {
             Guard.NotNull(configuration, nameof(configuration));
             Guard.NotNull(metadata, nameof(metadata));
-            Guard.IsTrue(pixelMemory.Length == width * height, nameof(pixelMemory), "The length of the input memory doesn't match the specified image size");
+            Guard.IsTrue(pixelMemory.Length >= width * height, nameof(pixelMemory), "The length of the input memory is less than the specified image size");
 
             var memorySource = MemoryGroup<TPixel>.Wrap(pixelMemory);
             return new Image<TPixel>(configuration, memorySource, width, height, metadata);
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp
             => WrapMemory(Configuration.Default, pixelMemory, width, height);
 
         /// <summary>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels,
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels,
         /// allowing to view/manipulate it as an <see cref="Image{TPixel}"/> instance.
         /// The ownership of the <paramref name="pixelMemoryOwner"/> is being transferred to the new <see cref="Image{TPixel}"/> instance,
         /// meaning that the caller is not allowed to dispose <paramref name="pixelMemoryOwner"/>.
@@ -147,14 +147,14 @@ namespace SixLabors.ImageSharp
         {
             Guard.NotNull(configuration, nameof(configuration));
             Guard.NotNull(metadata, nameof(metadata));
-            Guard.IsTrue(pixelMemoryOwner.Memory.Length == width * height, nameof(pixelMemoryOwner), "The length of the input memory doesn't match the specified image size");
+            Guard.IsTrue(pixelMemoryOwner.Memory.Length >= width * height, nameof(pixelMemoryOwner), "The length of the input memory is less than the specified image size");
 
             var memorySource = MemoryGroup<TPixel>.Wrap(pixelMemoryOwner);
             return new Image<TPixel>(configuration, memorySource, width, height, metadata);
         }
 
         /// <summary>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels,
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels,
         /// allowing to view/manipulate it as an <see cref="Image{TPixel}"/> instance.
         /// The ownership of the <paramref name="pixelMemoryOwner"/> is being transferred to the new <see cref="Image{TPixel}"/> instance,
         /// meaning that the caller is not allowed to dispose <paramref name="pixelMemoryOwner"/>.
@@ -176,7 +176,7 @@ namespace SixLabors.ImageSharp
             => WrapMemory(configuration, pixelMemoryOwner, width, height, new ImageMetadata());
 
         /// <summary>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels,
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels,
         /// allowing to view/manipulate it as an <see cref="Image{TPixel}"/> instance.
         /// The ownership of the <paramref name="pixelMemoryOwner"/> is being transferred to the new <see cref="Image{TPixel}"/> instance,
         /// meaning that the caller is not allowed to dispose <paramref name="pixelMemoryOwner"/>.
@@ -196,7 +196,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -234,7 +234,7 @@ namespace SixLabors.ImageSharp
 
             var memoryManager = new ByteMemoryManager<TPixel>(byteMemory);
 
-            Guard.IsTrue(memoryManager.Memory.Length == width * height, nameof(byteMemory), "The length of the input memory doesn't match the specified image size");
+            Guard.IsTrue(memoryManager.Memory.Length >= width * height, nameof(byteMemory), "The length of the input memory is less than the specified image size");
 
             var memorySource = MemoryGroup<TPixel>.Wrap(memoryManager.Memory);
             return new Image<TPixel>(configuration, memorySource, width, height, metadata);
@@ -242,7 +242,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -275,7 +275,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -305,7 +305,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -355,7 +355,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>
@@ -393,7 +393,7 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// <para>
-        /// Wraps an existing contiguous memory area of 'width' x 'height' pixels allowing viewing/manipulation as
+        /// Wraps an existing contiguous memory area of at least 'width' x 'height' pixels allowing viewing/manipulation as
         /// an <see cref="Image{TPixel}"/> instance.
         /// </para>
         /// <para>

src/ImageSharp/ImageSharp.csproj

@@ -12,9 +12,21 @@
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageTags>Image Resize Crop Gif Jpg Jpeg Bitmap Png Tga NetCore</PackageTags>
     <Description>A new, fully featured, fully managed, cross-platform, 2D graphics API for .NET</Description>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
   </PropertyGroup>
 
+  <Choose>
+    <When Condition="$(SIXLABORS_TESTING) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="" />
   </ItemGroup>

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>ImageSharp.Benchmarks</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SixLabors.ImageSharp.Benchmarks</RootNamespace>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <!--Used to hide test project from dotnet test-->
     <IsTestProject>false</IsTestProject>

tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj

@@ -8,7 +8,7 @@
     <Prefer32Bit>false</Prefer32Bit>
     <RootNamespace>SixLabors.ImageSharp.Tests.ProfilingSandbox</RootNamespace>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <StartupObject>SixLabors.ImageSharp.Tests.ProfilingSandbox.Program</StartupObject>
     <!--Used to hide test project from dotnet test-->
     <IsTestProject>false</IsTestProject>

tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@@ -171,6 +171,17 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
             }
         }
 
+        // https://github.com/SixLabors/ImageSharp/issues/1503
+        [Theory]
+        [WithFile(TestImages.Gif.Issues.Issue1530, PixelTypes.Rgba32)]
+        public void Issue1530_BadDescriptorDimensions<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using Image<TPixel> image = provider.GetImage();
+            image.DebugSaveMultiFrame(provider);
+            image.CompareToReferenceOutputMultiFrame(provider, ImageComparer.Exact);
+        }
+
         // https://github.com/SixLabors/ImageSharp/issues/405
         [Theory]
         [WithFile(TestImages.Gif.Issues.BadAppExtLength, PixelTypes.Rgba32)]
@@ -181,6 +192,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.DebugSave(provider);
+
                 image.CompareFirstFrameToReferenceOutput(ImageComparer.Exact, provider);
             }
         }

tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs

@@ -355,8 +355,6 @@ namespace SixLabors.ImageSharp.Tests
             [Theory]
             [InlineData(0, 5, 5)]
             [InlineData(20, 5, 5)]
-            [InlineData(26, 5, 5)]
-            [InlineData(2, 1, 1)]
             [InlineData(1023, 32, 32)]
             public void WrapMemory_MemoryOfT_InvalidSize(int size, int height, int width)
             {
@@ -366,6 +364,20 @@ namespace SixLabors.ImageSharp.Tests
                 Assert.Throws<ArgumentException>(() => Image.WrapMemory(memory, height, width));
             }
 
+            [Theory]
+            [InlineData(25, 5, 5)]
+            [InlineData(26, 5, 5)]
+            [InlineData(2, 1, 1)]
+            [InlineData(1024, 32, 32)]
+            [InlineData(2048, 32, 32)]
+            public void WrapMemory_MemoryOfT_ValidSize(int size, int height, int width)
+            {
+                var array = new Rgba32[size];
+                var memory = new Memory<Rgba32>(array);
+
+               Image.WrapMemory(memory, height, width);
+            }
+
             private class TestMemoryOwner<T> : IMemoryOwner<T>
             {
                 public Memory<T> Memory { get; set; }
@@ -378,8 +390,6 @@ namespace SixLabors.ImageSharp.Tests
             [Theory]
             [InlineData(0, 5, 5)]
             [InlineData(20, 5, 5)]
-            [InlineData(26, 5, 5)]
-            [InlineData(2, 1, 1)]
             [InlineData(1023, 32, 32)]
             public void WrapMemory_IMemoryOwnerOfT_InvalidSize(int size, int height, int width)
             {
@@ -390,10 +400,22 @@ namespace SixLabors.ImageSharp.Tests
             }
 
             [Theory]
-            [InlineData(0, 5, 5)]
-            [InlineData(20, 5, 5)]
+            [InlineData(25, 5, 5)]
             [InlineData(26, 5, 5)]
             [InlineData(2, 1, 1)]
+            [InlineData(1024, 32, 32)]
+            [InlineData(2048, 32, 32)]
+            public void WrapMemory_IMemoryOwnerOfT_ValidSize(int size, int height, int width)
+            {
+                var array = new Rgba32[size];
+                var memory = new TestMemoryOwner<Rgba32> { Memory = array };
+
+                Image.WrapMemory(memory, height, width);
+            }
+
+            [Theory]
+            [InlineData(0, 5, 5)]
+            [InlineData(20, 5, 5)]
             [InlineData(1023, 32, 32)]
             public void WrapMemory_MemoryOfByte_InvalidSize(int size, int height, int width)
             {
@@ -403,6 +425,20 @@ namespace SixLabors.ImageSharp.Tests
                 Assert.Throws<ArgumentException>(() => Image.WrapMemory<Rgba32>(memory, height, width));
             }
 
+            [Theory]
+            [InlineData(25, 5, 5)]
+            [InlineData(26, 5, 5)]
+            [InlineData(2, 1, 1)]
+            [InlineData(1024, 32, 32)]
+            [InlineData(2048, 32, 32)]
+            public void WrapMemory_MemoryOfByte_ValidSize(int size, int height, int width)
+            {
+                var array = new byte[size * Unsafe.SizeOf<Rgba32>()];
+                var memory = new Memory<byte>(array);
+
+                Image.WrapMemory<Rgba32>(memory, height, width);
+            }
+
             [Theory]
             [InlineData(0, 5, 5)]
             [InlineData(20, 5, 5)]

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <DebugSymbols>True</DebugSymbols>
     <AssemblyName>SixLabors.ImageSharp.Tests</AssemblyName>
     <Platforms>AnyCPU;x64;x86</Platforms>

tests/ImageSharp.Tests/TestImages.cs

@@ -416,6 +416,7 @@ namespace SixLabors.ImageSharp.Tests
                 public const string BadAppExtLength_2 = "Gif/issues/issue405_badappextlength252-2.gif";
                 public const string BadDescriptorWidth = "Gif/issues/issue403_baddescriptorwidth.gif";
                 public const string Issue1505 = "Gif/issues/issue1505_argumentoutofrange.png";
+                public const string Issue1530 = "Gif/issues/issue1530.gif";
             }
 
             public static readonly string[] All = { Rings, Giphy, Cheers, Trans, Kumin, Leo, Ratio4x1, Ratio1x4 };

tests/Images/External

@@ -1 +1 @@
-Subproject commit 346070e5ba538f1a3bbafc0ea7367404c5f8c9ab
+Subproject commit 1df65162448996332449387a46da942e181043c8

tests/Images/Input/Gif/issues/issue1530.gif

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08b33cab34de2622a7d22edff25fe479a5018c2e0fbc65870b2f21ea7901fc61
+size 1844876