[librsvg: 2/6] rsvg_internals::Dpi - Make the x/y fields public and remove the accessor functions

[Federico Mena Quintero <federico src gnome org>]

commit dd98f9d0516ad89c9211548b3c9a7c14f471cd25
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue May 5 13:09:43 2020 -0500

    rsvg_internals::Dpi - Make the x/y fields public and remove the accessor functions

 rsvg_internals/src/dpi.rs         | 12 ++----------
 rsvg_internals/src/drawing_ctx.rs |  8 ++++----
 rsvg_internals/src/structure.rs   |  4 ++--
 3 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/rsvg_internals/src/dpi.rs b/rsvg_internals/src/dpi.rs
index cf2efae8..e205ec75 100644
--- a/rsvg_internals/src/dpi.rs
+++ b/rsvg_internals/src/dpi.rs
@@ -2,20 +2,12 @@
 
 #[derive(Debug, Copy, Clone)]
 pub struct Dpi {
-    x: f64,
-    y: f64,
+    pub x: f64,
+    pub y: f64,
 }
 
 impl Dpi {
     pub fn new(x: f64, y: f64) -> Dpi {
         Dpi { x, y }
     }
-
-    pub fn x(&self) -> f64 {
-        self.x
-    }
-
-    pub fn y(&self) -> f64 {
-        self.y
-    }
 }
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 6e7b90ba..55aaba03 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -244,8 +244,8 @@ impl DrawingCtx {
         let top_rect = &view_box_stack[last].0;
 
         ViewParams {
-            dpi_x: self.dpi.x(),
-            dpi_y: self.dpi.y(),
+            dpi_x: self.dpi.x,
+            dpi_y: self.dpi.y,
             view_box_width: top_rect.width(),
             view_box_height: top_rect.height(),
             view_box_stack: None,
@@ -265,8 +265,8 @@ impl DrawingCtx {
             .push(ViewBox(Rect::from_size(width, height)));
 
         ViewParams {
-            dpi_x: self.dpi.x(),
-            dpi_y: self.dpi.y(),
+            dpi_x: self.dpi.x,
+            dpi_y: self.dpi.y,
             view_box_width: width,
             view_box_height: height,
             view_box_stack: Some(Rc::downgrade(&self.view_box_stack)),
diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
index c766d400..1cab9f83 100644
--- a/rsvg_internals/src/structure.rs
+++ b/rsvg_internals/src/structure.rs
@@ -127,13 +127,13 @@ impl Svg {
 
         match (w, h, self.vbox) {
             (w, h, Some(vbox)) => {
-                let params = ViewParams::new(dpi.x(), dpi.y(), vbox.0.width(), vbox.0.height());
+                let params = ViewParams::new(dpi.x, dpi.y, vbox.0.width(), vbox.0.height());
 
                 Some((w.normalize(values, &params), h.normalize(values, &params)))
             }
 
             (w, h, None) if w.unit != LengthUnit::Percent && h.unit != LengthUnit::Percent => {
-                let params = ViewParams::new(dpi.x(), dpi.y(), 0.0, 0.0);
+                let params = ViewParams::new(dpi.x, dpi.y, 0.0, 0.0);
 
                 Some((w.normalize(values, &params), h.normalize(values, &params)))
             }