Merge pull request #19 from LaurenzV/main

Fixes #9

Author: reknih

src/lib.rs

@@ -519,6 +519,8 @@ fn apply_clip_path(path_id: Option<&String>, content: &mut Content, ctx: &mut Co
         if let NodeKind::ClipPath(ref path) = *clip_path.borrow() {
             apply_clip_path(path.clip_path.as_ref(), content, ctx);
 
+            let old = ctx.c.concat_transform(path.transform);
+
             for child in clip_path.children() {
                 match *child.borrow() {
                     NodeKind::Path(ref path) => {
@@ -530,6 +532,8 @@ fn apply_clip_path(path_id: Option<&String>, content: &mut Content, ctx: &mut Co
                     _ => unreachable!(),
                 }
             }
+
+            ctx.c.set_transform(old);
         } else {
             unreachable!();
         }

src/render.rs

@@ -446,9 +446,9 @@ fn prep_pattern(
     let matrix = transform_to_matrix(pattern.transform);
     let pdf_rect = ctx.c.pdf_rect(rect);
 
-    let mut inner_matrix = if let Some(viewbox) = pattern.view_box {
+    let mut inner_transform = if let Some(viewbox) = pattern.view_box {
         CoordToPdf::new((rect.width(), rect.height()), ctx.c.dpi(), viewbox, None)
-            .uncorrected_matrix()
+            .uncorrected_transformation()
     } else if pattern.content_units == Units::ObjectBoundingBox {
         let viewbox = ViewBox {
             rect: usvg::Rect::new(0.0, 0.0, 1.0, 1.0).unwrap(),
@@ -460,20 +460,20 @@ fn prep_pattern(
         };
 
         CoordToPdf::new((bbox.width(), bbox.height()), ctx.c.dpi(), viewbox, None)
-            .uncorrected_matrix()
+            .uncorrected_transformation()
     } else {
-        [1.0, 0.0, 0.0, 1.0, 0.0, 0.0]
+        Transform::new(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)
     };
 
     ctx.push();
 
-    inner_matrix[4] += rect.x();
-    inner_matrix[5] += rect.y();
+    inner_transform.e += rect.x();
+    inner_transform.f += rect.y();
 
-    let old = ctx.c.transform(inner_matrix);
+    let old = ctx.c.concat_transform(inner_transform);
 
     let pattern_stream = content_stream(node, writer, ctx);
-    ctx.c.transform(old);
+    ctx.c.set_transform(old);
 
     let pattern_ref = ctx.alloc_ref();
     let mut pdf_pattern = writer.tiling_pattern(pattern_ref, &pattern_stream);
@@ -509,22 +509,16 @@ impl Render for usvg::Group {
         ctx.push();
 
         let group_ref = ctx.alloc_ref();
-        let child_content = content_stream(&node, writer, ctx);
 
         let bbox = node
             .calculate_bbox()
             .and_then(|b| b.to_rect())
             .unwrap_or_else(|| usvg::Rect::new(0.0, 0.0, 1.0, 1.0).unwrap());
 
         let pdf_bbox = ctx.c.pdf_rect(bbox);
-        let old = ctx.c.transform([
-            self.transform.a,
-            self.transform.b,
-            self.transform.c,
-            self.transform.d,
-            self.transform.e,
-            self.transform.f,
-        ]);
+        let old = ctx.c.concat_transform(self.transform);
+
+        let child_content = content_stream(&node, writer, ctx);
 
         // Every group is an isolated transparency group, it needs to be painted
         // onto its own canvas.
@@ -545,7 +539,7 @@ impl Render for usvg::Group {
         content.save_state();
 
         apply_clip_path(self.clip_path.as_ref(), content, ctx);
-        ctx.c.transform(old);
+        ctx.c.set_transform(old);
 
         if let Some(reference) = apply_mask(self.mask.as_ref(), bbox, pdf_bbox, ctx) {
             let num = ctx.alloc_gs();

src/scale.rs

@@ -1,6 +1,6 @@
 //! Provide transformations between PDF and SVG coordinate systems.
 
-use usvg::{Align, AspectRatio, ViewBox};
+use usvg::{Align, AspectRatio, Transform, ViewBox};
 
 /// Convert point data between two coordinate systems.
 #[derive(Debug, Copy, Clone)]
@@ -11,7 +11,7 @@ pub struct CoordToPdf {
     offset_y: f64,
     height_y: f64,
     dpi: f64,
-    matrix: [f64; 6],
+    transform: Transform,
 }
 
 impl CoordToPdf {
@@ -94,7 +94,7 @@ impl CoordToPdf {
             offset_y,
             height_y: viewport.1,
             dpi,
-            matrix: [1.0, 0.0, 0.0, 1.0, 0.0, 0.0],
+            transform: Transform::new(1.0, 0.0, 0.0, 1.0, 0.0, 0.0),
         }
     }
 
@@ -138,18 +138,18 @@ impl CoordToPdf {
         self.dpi
     }
 
-    /// Get the transformation matrix for this converter but without accounting
+    /// Get the transformation for this converter but without accounting
     /// for either DPI or that the PDF coordinate system is flipped. This is
     /// useful for converting between two SVG coordinate systems.
-    pub fn uncorrected_matrix(&self) -> [f64; 6] {
-        [
+    pub fn uncorrected_transformation(&self) -> Transform {
+        Transform::new(
             self.factor_x,
             0.0,
             0.0,
             self.factor_y,
             self.offset_x,
             self.offset_y,
-        ]
+        )
     }
 
     /// Transform a rectangle from SVG to PDF formats.
@@ -159,18 +159,19 @@ impl CoordToPdf {
         pdf_writer::Rect::new(x1, y1, x2, y2)
     }
 
-    /// Apply a transformation matrix to a point.
+    /// Apply a transformation to a point.
     fn apply(&self, point: (f64, f64)) -> (f64, f64) {
-        (
-            point.0 * self.matrix[0] + point.1 * self.matrix[1] + self.matrix[4],
-            point.0 * self.matrix[2] + point.1 * self.matrix[3] + self.matrix[5],
-        )
+        self.transform.apply(point.0, point.1)
     }
 
     /// Set a pre-transformation, overriding the old one.
-    pub fn transform(&mut self, matrix: [f64; 6]) -> [f64; 6] {
-        let old = self.matrix;
-        self.matrix = matrix;
+    pub fn concat_transform(&mut self, add_transform: Transform) -> Transform {
+        let old = self.transform.clone();
+        self.transform.append(&add_transform);
         old
     }
+
+    pub fn set_transform(&mut self, transform: Transform) {
+        self.transform = transform;
+    }
 }