[librsvg: 19/27] handle.rs: use NormalizeParams




commit 8e39fa35b77c9dc656c8978d4ef679ce1019ec66
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri May 7 21:25:16 2021 -0500

    handle.rs: use NormalizeParams

 src/handle.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/handle.rs b/src/handle.rs
index 2f9c0e70..122c252e 100644
--- a/src/handle.rs
+++ b/src/handle.rs
@@ -8,6 +8,7 @@ use crate::document::{AcquiredNodes, Document, NodeId};
 use crate::dpi::Dpi;
 use crate::drawing_ctx::{draw_tree, DrawingMode, ViewParams};
 use crate::error::{DefsLookupErrorKind, LoadingError, RenderingError};
+use crate::length::*;
 use crate::node::{CascadedValues, Node, NodeBorrow};
 use crate::rect::Rect;
 use crate::structure::IntrinsicDimensions;
@@ -130,12 +131,14 @@ impl Handle {
             return None;
         }
 
-        let params = ViewParams::new(dpi, 0.0, 0.0);
+        let view_params = ViewParams::new(dpi, 0.0, 0.0);
         let root = self.document.root();
         let cascaded = CascadedValues::new_from_node(&root);
         let values = cascaded.get();
 
-        Some((w.normalize(values, &params), h.normalize(values, &params)))
+        let params = NormalizeParams::new(&values, &view_params);
+
+        Some((w.to_user(&params), h.to_user(&params)))
     }
 
     fn get_node_or_root(&self, id: Option<&str>) -> Result<Node, RenderingError> {


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