Pass correct output size in ResizeMode.Min #892 (#893)

SixLabors · Apr 23, 2019 · af0d3dd · af0d3dd
1 parent 87c0a66
commit af0d3dd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeHelper.cs b/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeHelper.cs
@@ -296,7 +296,7 @@ private static (Size, Rectangle) CalculateMinRectangle(
             // Don't upscale
             if (width > sourceWidth || height > sourceHeight)
             {
-                return (new Size(sourceWidth, sourceWidth), new Rectangle(0, 0, sourceWidth, sourceHeight));
+                return (new Size(sourceWidth, sourceHeight), new Rectangle(0, 0, sourceWidth, sourceHeight));
             }
 
             // Find the shortest distance to go.

diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeHelperTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeHelperTests.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors.Transforms;
+using SixLabors.Primitives;
 
 using Xunit;
 
@@ -31,5 +33,24 @@ public void CalculateResizeWorkerHeightInWindowBands(
             int actualCount = ResizeHelper.CalculateResizeWorkerHeightInWindowBands(windowDiameter, width, sizeLimitHintInBytes);
             Assert.Equal(expectedCount, actualCount);
         }
+
+        [Fact]
+        public void CalculateMinRectangleWhenSourceIsSmallerThanTarget()
+        {
+            var sourceSize = new Size(200, 100);
+            var target = new Size(400, 200);
+
+            var actual = ResizeHelper.CalculateTargetLocationAndBounds(
+                sourceSize,
+                new ResizeOptions{
+                    Mode = ResizeMode.Min,
+                    Size = target
+                },
+                target.Width,
+                target.Height);
+
+            Assert.Equal(sourceSize, actual.Item1);
+            Assert.Equal(new Rectangle(0, 0, sourceSize.Width, sourceSize.Height), actual.Item2);
+        }
     }
 }