Really make the initial viewport have its upper-left corner at (0, 0)

1 files changed, 8 insertions, 1 deletions

diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index b7ded244..ff0aa5a8 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -205,10 +205,17 @@ impl DrawingCtx {
         // "... the initial viewport coordinate system (and therefore
         // the initial user coordinate system) must have its origin at
         // the top/left of the viewport"
+
+        // Translate so (0, 0) is at the viewport's upper-left corner.
+        cr.translate(viewport.x0, viewport.y0);
+        let transform = Transform::from(cr.get_matrix());
+
+        // Per the spec, so the viewport has (0, 0) as upper-left.
+        let viewport = viewport.translate((-viewport.x0, -viewport.y0));
         let vbox = ViewBox::from(viewport);
 
         let initial_viewport = Viewport {
-            transform: Transform::from(cr.get_matrix()),
+            transform,
             vbox,
         };