[librsvg/librsvg-2.48] pixbuf_utils: Use get_geometry_sub instead of get_dimensions_sub



commit eed4bb9f7570713845309ba121de4c4a6ee109f1
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Apr 24 19:33:25 2020 -0500

    pixbuf_utils: Use get_geometry_sub instead of get_dimensions_sub

 librsvg/pixbuf_utils.rs      | 11 +++++++----
 rsvg_internals/src/handle.rs |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/librsvg/pixbuf_utils.rs b/librsvg/pixbuf_utils.rs
index 6584a413..06a015f0 100644
--- a/librsvg/pixbuf_utils.rs
+++ b/librsvg/pixbuf_utils.rs
@@ -8,7 +8,7 @@ use url::Url;
 
 use rsvg_internals::{
     Dpi, Handle, IRect, LoadOptions, LoadingError, Pixels, RenderingError, SharedImageSurface,
-    SizeCallback, SurfaceType,
+    SurfaceType,
 };
 
 use crate::c_api::set_gerror;
@@ -240,9 +240,12 @@ fn pixbuf_from_file_with_size_mode(
         };
 
         handle
-            .get_dimensions_sub(None, dpi, &SizeCallback::default(), false)
-            .and_then(|dimensions| {
-                let (document_width, document_height) = (dimensions.width, dimensions.height);
+            .get_geometry_sub(None, dpi, false)
+            .and_then(|(ink_r, _)| {
+                let (document_width, document_height) = (
+                    ink_r.width().round() as libc::c_int,
+                    ink_r.height().round() as libc::c_int,
+                );
                 let (desired_width, desired_height) =
                     get_final_size(document_width, document_height, size_mode);
 
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index f167ed50..a2fecb40 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -312,7 +312,7 @@ impl Handle {
     }
 
     /// Returns (ink_rect, logical_rect)
-    fn get_geometry_sub(
+    pub fn get_geometry_sub(
         &self,
         id: Option<&str>,
         dpi: Dpi,


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