Fix the interactions between Bounds and Width/Height (ignoring DPI)

sungaila · Mar 14, 2024 · 744e66c · 744e66c
1 parent 87335f3
commit 744e66c
Show file tree

Hide file tree

Showing 38 changed files with 205 additions and 7 deletions.
diff --git a/src/PDFtoImage/Internals/PdfDocument.cs b/src/PDFtoImage/Internals/PdfDocument.cs
@@ -73,9 +73,13 @@ public SKBitmap Render(int page, float width, float height, float dpiX, float dp
             if (_disposed)
                 throw new ObjectDisposedException(GetType().Name);
 
+            var originalWidth = PageSizes[page].Width;
+            var originalHeight = PageSizes[page].Height;
+
             if (rotate == PdfRotation.Rotate90 || rotate == PdfRotation.Rotate270)
             {
                 (width, height) = (height, width);
+                (originalWidth, originalHeight) = (originalHeight, originalWidth);
                 (dpiX, dpiY) = (dpiY, dpiX);
             }
 
@@ -84,6 +88,9 @@ public SKBitmap Render(int page, float width, float height, float dpiX, float dp
                 width *= dpiX / 72f;
                 height *= dpiY / 72f;
 
+                originalWidth *= dpiX / 72f;
+                originalHeight *= dpiY / 72f;
+
                 if (bounds != null)
                 {
                     bounds = new RectangleF(
@@ -97,10 +104,13 @@ public SKBitmap Render(int page, float width, float height, float dpiX, float dp
 
             if (bounds != null)
             {
+                var factorX = width / originalWidth;
+                var factorY = height / originalHeight;
+
                 if (rotate == PdfRotation.Rotate90)
                 {
                     bounds = new RectangleF(
-                        width - bounds.Value.Height - bounds.Value.Y,
+                        ((originalWidth - bounds.Value.Height) * factorX) - bounds.Value.Y,
                         bounds.Value.X,
                         bounds.Value.Height,
                         bounds.Value.Width
@@ -110,16 +120,16 @@ public SKBitmap Render(int page, float width, float height, float dpiX, float dp
                 {
                     bounds = new RectangleF(
                         bounds.Value.Y,
-                        height - bounds.Value.Width - bounds.Value.X,
+                        ((originalHeight - bounds.Value.Width) * factorY) - bounds.Value.X,
                         bounds.Value.Height,
                         bounds.Value.Width
                         );
                 }
                 else if (rotate == PdfRotation.Rotate180)
                 {
                     bounds = new RectangleF(
-                        width - bounds.Value.Width - bounds.Value.X,
-                        height - bounds.Value.Height - bounds.Value.Y,
+                        ((originalWidth - bounds.Value.Width) * factorX) - bounds.Value.X,
+                        ((originalHeight - bounds.Value.Height) * factorY) - bounds.Value.Y,
                         bounds.Value.Width,
                         bounds.Value.Height
                         );
@@ -133,7 +143,7 @@ public SKBitmap Render(int page, float width, float height, float dpiX, float dp
 
             if (!useTiling || (horizontalTileCount == 1 && verticalTileCount == 1))
             {
-                bitmap = RenderSubset(_file!, page, width, height, rotate, flags, renderFormFill, backgroundColor, bounds, width, height, cancellationToken);
+                bitmap = RenderSubset(_file!, page, width, height, rotate, flags, renderFormFill, backgroundColor, bounds, originalWidth, originalHeight, cancellationToken);
             }
             else
             {
@@ -143,8 +153,8 @@ public SKBitmap Render(int page, float width, float height, float dpiX, float dp
 
                 float currentTileWidth = width / horizontalTileCount;
                 float currentTileHeight = height / verticalTileCount;
-                float boundsWidthFactor = bounds != null ? bounds.Value.Width / width : 0f;
-                float boundsHeightFactor = bounds != null ? bounds.Value.Height / height : 0f;
+                float boundsWidthFactor = bounds != null ? bounds.Value.Width / originalWidth : 0f;
+                float boundsHeightFactor = bounds != null ? bounds.Value.Height / originalHeight : 0f;
 
                 using var canvas = new SKCanvas(bitmap);
                 canvas.Clear(backgroundColor);

diff --git a/...s/Expected/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_500x500.png b/...s/Expected/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_500x500.png
diff --git a/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate180_500x500.png b/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate180_500x500.png
diff --git a/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate180_nullxnull.png b/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate180_nullxnull.png
diff --git a/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate270_500x500.png b/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate270_500x500.png
diff --git a/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate270_nullxnull.png b/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate270_nullxnull.png
diff --git a/...d/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate90_500x500.png b/...d/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate90_500x500.png
diff --git a/...WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate90_nullxnull.png b/...WINDOWS/Bounds/Wikimedia_Commons_web_0-0-209,764-297,638_Rotate90_nullxnull.png
diff --git a/...s/Expected/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_500x500.png b/...s/Expected/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_500x500.png
diff --git a/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate180_500x500.png b/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate180_500x500.png
diff --git a/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate180_nullxnull.png b/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate180_nullxnull.png
diff --git a/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate270_500x500.png b/.../WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate270_500x500.png
diff --git a/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate270_nullxnull.png b/...INDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate270_nullxnull.png
diff --git a/...d/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate90_500x500.png b/...d/WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate90_500x500.png
diff --git a/...WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate90_nullxnull.png b/...WINDOWS/Bounds/Wikimedia_Commons_web_0-0-419,528-595,276_Rotate90_nullxnull.png
diff --git a/...cted/WINDOWS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_500x500.png b/...cted/WINDOWS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_500x500.png
diff --git a/...WS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate180_500x500.png b/...WS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate180_500x500.png
diff --git a/.../Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate180_nullxnull.png b/.../Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate180_nullxnull.png
diff --git a/...WS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate270_500x500.png b/...WS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate270_500x500.png
diff --git a/.../Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate270_nullxnull.png b/.../Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate270_nullxnull.png
diff --git a/...OWS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate90_500x500.png b/...OWS/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate90_500x500.png
diff --git a/...S/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate90_nullxnull.png b/...S/Bounds/Wikimedia_Commons_web_0-297,638-209,764-297,638_Rotate90_nullxnull.png
diff --git a/...cted/WINDOWS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_500x500.png b/...cted/WINDOWS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_500x500.png
diff --git a/...WS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate180_500x500.png b/...WS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate180_500x500.png
diff --git a/.../Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate180_nullxnull.png b/.../Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate180_nullxnull.png
diff --git a/...WS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate270_500x500.png b/...WS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate270_500x500.png
diff --git a/.../Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate270_nullxnull.png b/.../Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate270_nullxnull.png
diff --git a/...OWS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate90_500x500.png b/...OWS/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate90_500x500.png
diff --git a/...S/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate90_nullxnull.png b/...S/Bounds/Wikimedia_Commons_web_209,764-0-209,764-297,638_Rotate90_nullxnull.png
diff --git a/...INDOWS/Bounds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_500x500.png b/...INDOWS/Bounds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_500x500.png
diff --git a/...nds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate180_500x500.png b/...nds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate180_500x500.png
diff --git a/...s/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate180_nullxnull.png b/...s/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate180_nullxnull.png
diff --git a/...nds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate270_500x500.png b/...nds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate270_500x500.png
diff --git a/...s/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate270_nullxnull.png b/...s/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate270_nullxnull.png
diff --git a/...unds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate90_500x500.png b/...unds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate90_500x500.png
diff --git a/...ds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate90_nullxnull.png b/...ds/Wikimedia_Commons_web_209,764-297,638-209,764-297,638_Rotate90_nullxnull.png
diff --git a/src/Tests/BoundsTests.cs b/src/Tests/BoundsTests.cs
@@ -188,6 +188,74 @@ public void WithWidthAndHeight(float x, float y, float width, float height, int?
             CompareStreams(expectedPath, outputStream);
         }
 
+        [TestMethod]
+        [DataRow(0f, 0f, 419.528f, 595.276f, default, default, default)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, default, default, default)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, default, default, default)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, default, default, default)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, default, default, default)]
+        [DataRow(0f, 0f, 419.528f, 595.276f, 500, 500, default)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, 500, 500, default)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, 500, 500, default)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, 500, 500, default)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, 500, 500, default)]
+
+        [DataRow(0f, 0f, 419.528f, 595.276f, default, default, PdfRotation.Rotate0)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate0)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate0)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate0)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate0)]
+        [DataRow(0f, 0f, 419.528f, 595.276f, 500, 500, PdfRotation.Rotate0)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate0)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate0)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate0)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate0)]
+
+        [DataRow(0f, 0f, 419.528f, 595.276f, default, default, PdfRotation.Rotate90)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate90)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate90)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate90)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate90)]
+        [DataRow(0f, 0f, 419.528f, 595.276f, 500, 500, PdfRotation.Rotate90)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate90)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate90)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate90)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate90)]
+
+        [DataRow(0f, 0f, 419.528f, 595.276f, default, default, PdfRotation.Rotate180)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate180)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate180)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate180)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate180)]
+        [DataRow(0f, 0f, 419.528f, 595.276f, 500, 500, PdfRotation.Rotate180)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate180)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate180)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate180)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate180)]
+
+        [DataRow(0f, 0f, 419.528f, 595.276f, default, default, PdfRotation.Rotate270)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate270)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, default, default, PdfRotation.Rotate270)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate270)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, default, default, PdfRotation.Rotate270)]
+        [DataRow(0f, 0f, 419.528f, 595.276f, 500, 500, PdfRotation.Rotate270)]
+        [DataRow(0f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate270)]
+        [DataRow(209.764f, 0f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate270)]
+        [DataRow(0f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate270)]
+        [DataRow(209.764f, 297.638f, 209.764f, 297.638f, 500, 500, PdfRotation.Rotate270)]
+        public void WithWidthAndHeightAndRotation(float x, float y, float width, float height, int? outputWidth = null, int? outputHeight = null, PdfRotation? rotation = null)
+        {
+            var bounds = new RectangleF(x, y, width, height);
+            var expectedPath = Path.Combine("Assets", "Expected", GetPlatformAsString(), "Bounds", $"Wikimedia_Commons_web_{GetFileName(bounds, rotation, default, default)}_{outputWidth?.ToString() ?? "null"}x{outputHeight?.ToString() ?? "null"}.png");
+
+            using var inputStream = GetInputStream(Path.Combine("Assets", "Wikimedia_Commons_web.pdf"));
+            using var outputStream = CreateOutputStream(expectedPath);
+
+            SavePng(outputStream, inputStream, options: new(Width: outputWidth, Height: outputHeight, Bounds: bounds, Rotation: rotation ?? default));
+
+            CompareStreams(expectedPath, outputStream);
+        }
+
         private static string GetFileName(RectangleF? input, PdfRotation? rotation, bool? withAnnotations, bool? withFormFill)
         {
             if (input == null)