[librsvg: 2/8] handle.rs: Extract function to create a unit rectangle
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/8] handle.rs: Extract function to create a unit rectangle
- Date: Mon, 26 Aug 2019 12:52:42 +0000 (UTC)
commit c8540b910a87173bb185ea565c0b8f2e176ede83
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Aug 26 11:44:44 2019 +0300
handle.rs: Extract function to create a unit rectangle
This is just used when measuring geometries.
rsvg_internals/src/handle.rs | 37 ++++++++++++-------------------------
1 file changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 81042bbd..270b266e 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -234,15 +234,7 @@ impl Handle {
}
}
- // This is just to start with an unknown viewport size
- let viewport = cairo::Rectangle {
- x: 0.0,
- y: 0.0,
- width: 1.0,
- height: 1.0,
- };
-
- self.get_node_geometry_with_viewport(&node, &viewport, dpi, is_testing)
+ self.get_node_geometry_with_viewport(&node, &unit_rectangle(), dpi, is_testing)
}
fn get_node_or_root(&self, id: Option<&str>) -> Result<RsvgNode, RenderingError> {
@@ -378,18 +370,11 @@ impl Handle {
let target = ImageSurface::create(cairo::Format::Rgb24, 1, 1)?;
let cr = cairo::Context::new(&target);
- let viewport = cairo::Rectangle {
- x: 0.0,
- y: 0.0,
- width: 1.0,
- height: 1.0,
- };
-
let mut draw_ctx = DrawingCtx::new(
self.svg.clone(),
None,
&cr,
- &viewport,
+ &unit_rectangle(),
dpi,
true,
is_testing,
@@ -472,18 +457,11 @@ impl Handle {
cr.scale(factor, factor);
cr.translate(-ink_r.x, -ink_r.y);
- let viewport = cairo::Rectangle {
- x: 0.0,
- y: 0.0,
- width: 1.0,
- height: 1.0,
- };
-
let mut draw_ctx = DrawingCtx::new(
self.svg.clone(),
None,
&cr,
- &viewport,
+ &unit_rectangle(),
dpi,
false,
is_testing,
@@ -563,3 +541,12 @@ fn locale_from_environment() -> Locale {
locale
}
+
+fn unit_rectangle() -> cairo::Rectangle {
+ cairo::Rectangle {
+ x: 0.0,
+ y: 0.0,
+ width: 1.0,
+ height: 1.0,
+ }
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]