[librsvg: 5/6] drawing_ctx: mark get_transform as private




commit d1f09cd24d9ffd6b47f3cbc6eef44dd797fa33e7
Author: Paolo Borelli <pborelli gnome org>
Date:   Mon Aug 31 18:43:56 2020 +0200

    drawing_ctx: mark get_transform as private
    
    Pass it as a parameter to the filter render function

 rsvg_internals/src/drawing_ctx.rs     | 3 ++-
 rsvg_internals/src/filters/context.rs | 3 +--
 rsvg_internals/src/filters/mod.rs     | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 130b17c3..8fbdfc58 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -170,7 +170,7 @@ impl DrawingCtx {
         self.measuring
     }
 
-    pub fn get_transform(&self) -> Transform {
+    fn get_transform(&self) -> Transform {
         Transform::from(self.cr.get_matrix())
     }
 
@@ -779,6 +779,7 @@ impl DrawingCtx {
                             child_surface,
                             acquired_nodes,
                             self,
+                            self.get_transform(),
                             node_bbox,
                         );
                     }
diff --git a/rsvg_internals/src/filters/context.rs b/rsvg_internals/src/filters/context.rs
index 6f4e3f4a..d1a4c5d2 100644
--- a/rsvg_internals/src/filters/context.rs
+++ b/rsvg_internals/src/filters/context.rs
@@ -99,10 +99,9 @@ impl FilterContext {
         computed_from_node_being_filtered: &ComputedValues,
         source_surface: SharedImageSurface,
         draw_ctx: &mut DrawingCtx,
+        draw_transform: Transform,
         node_bbox: BoundingBox,
     ) -> Self {
-        let draw_transform = draw_ctx.get_transform();
-
         // The rect can be empty (for example, if the filter is applied to an empty group).
         // However, with userSpaceOnUse it's still possible to create images with a filter.
         let bbox_rect = node_bbox.rect.unwrap_or_default();
diff --git a/rsvg_internals/src/filters/mod.rs b/rsvg_internals/src/filters/mod.rs
index d59a661a..d59eed09 100644
--- a/rsvg_internals/src/filters/mod.rs
+++ b/rsvg_internals/src/filters/mod.rs
@@ -18,6 +18,7 @@ use crate::properties::ComputedValues;
 use crate::property_bag::PropertyBag;
 use crate::property_defs::ColorInterpolationFilters;
 use crate::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+use crate::transform::Transform;
 
 mod bounds;
 use self::bounds::BoundsBuilder;
@@ -273,6 +274,7 @@ pub fn render(
     source_surface: SharedImageSurface,
     acquired_nodes: &mut AcquiredNodes,
     draw_ctx: &mut DrawingCtx,
+    transform: Transform,
     node_bbox: BoundingBox,
 ) -> Result<SharedImageSurface, RenderingError> {
     let filter_node = &*filter_node;
@@ -287,6 +289,7 @@ pub fn render(
         computed_from_node_being_filtered,
         source_surface,
         draw_ctx,
+        transform,
         node_bbox,
     );
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]