Fix groups in clipping paths

Author: reknih

src/lib.rs

@@ -506,14 +506,15 @@ fn content_stream(
 fn apply_clip_path(
     path: Option<Rc<usvg::ClipPath>>,
     content: &mut Content,
+    writer: &mut PdfWriter,
     ctx: &mut Context,
 ) {
     let path = match path {
         Some(path) => path,
         None => return,
     };
 
-    apply_clip_path(path.clip_path.clone(), content, ctx);
+    apply_clip_path(path.clip_path.clone(), content, writer, ctx);
 
     let old = ctx.c.concat_transform(path.transform);
 
@@ -524,6 +525,9 @@ fn apply_clip_path(
                 content.clip_nonzero();
                 content.end_path();
             }
+            NodeKind::Group(ref group) => {
+                group.render(&child, writer, content, ctx);
+            }
             _ => unreachable!(),
         }
     }

src/render.rs

@@ -522,8 +522,10 @@ impl Render for usvg::Group {
         let num = ctx.alloc_xobject();
         let name = format!("xo{}", num);
         content.save_state();
+        resources.finish();
+        form.finish();
 
-        apply_clip_path(self.clip_path.clone(), content, ctx);
+        apply_clip_path(self.clip_path.clone(), content, writer, ctx);
 
         if let Some(reference) = apply_mask(self.mask.clone(), bbox, pdf_bbox, ctx) {
             let num = ctx.alloc_gs();

src/scale.rs

@@ -179,13 +179,6 @@ impl CoordToPdf {
         pdf_writer::Rect::new(x1, y1, x2, y2)
     }
 
-    /// Transform a rectangle from SVG to PDF formats, disregarding transforms.
-    pub fn pdf_rect_raw(&self, rect: usvg::Rect) -> pdf_writer::Rect {
-        let (x1, y1) = self.point_raw((rect.x(), rect.y() + rect.height()));
-        let (x2, y2) = self.point_raw((rect.x() + rect.width(), rect.y()));
-        pdf_writer::Rect::new(x1, y1, x2, y2)
-    }
-
     /// Apply a transformation to a point.
     fn apply(&self, point: (f64, f64)) -> (f64, f64) {
         self.transform.apply(point.0, point.1)