[librsvg: 15/29] Don't use rsvg_set_default_dpi*() in the utilities nor in the tests

[Federico Mena Quintero <federico src gnome org>]

commit 4bcf1fa312f71a0a94b5b69b4afecaf40540ed27
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Feb 6 11:24:51 2018 -0600

    Don't use rsvg_set_default_dpi*() in the utilities nor in the tests

 rsvg-convert.c    | 14 ++++++++++++--
 rsvg-view.c       |  9 ++++++++-
 tests/rsvg-test.c |  3 +--
 3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/rsvg-convert.c b/rsvg-convert.c
index 8fc414c..c4130ea 100644
--- a/rsvg-convert.c
+++ b/rsvg-convert.c
@@ -230,6 +230,14 @@ main (int argc, char **argv)
         exit (1);
     }
 
+    if (dpi_x <= 0.0) {
+        dpi_x = 90.0;
+    }
+
+    if (dpi_y <= 0.0) {
+        dpi_y = 90.0;
+    }
+
     if (format != NULL &&
         (g_str_equal (format, "ps") || g_str_equal (format, "eps") || g_str_equal (format, "pdf")) &&
         !no_keep_image_data)
@@ -238,8 +246,6 @@ main (int argc, char **argv)
     if (zoom != 1.0)
         x_zoom = y_zoom = zoom;
 
-    rsvg_set_default_dpi_x_y (dpi_x, dpi_y);
-
     if (unlimited)
         flags |= RSVG_HANDLE_FLAG_UNLIMITED;
 
@@ -286,6 +292,10 @@ main (int argc, char **argv)
             exit (1);
         }
 
+        g_assert (rsvg != NULL);
+
+        rsvg_handle_set_dpi_x_y (rsvg, dpi_x, dpi_y);
+
         export_lookup_id = get_lookup_id_from_command_line (export_id);
         if (export_lookup_id != NULL
             && !rsvg_handle_has_sub (rsvg, export_lookup_id)) {
diff --git a/rsvg-view.c b/rsvg-view.c
index 96aa70d..ce58144 100644
--- a/rsvg-view.c
+++ b/rsvg-view.c
@@ -664,7 +664,13 @@ main (int argc, char **argv)
         return 1;
     }
 
-    rsvg_set_default_dpi_x_y (dpi_x, dpi_y);
+    if (dpi_x <= 0.0) {
+        dpi_x = 90.0;
+    }
+
+    if (dpi_y <= 0.0) {
+        dpi_y = 90.0;
+    }
 
     if (unlimited)
         flags |= RSVG_HANDLE_FLAG_UNLIMITED;
@@ -718,6 +724,7 @@ main (int argc, char **argv)
         return 1;
     }
 
+    rsvg_handle_set_dpi_x_y (info.handle, dpi_x, dpi_y);
     rsvg_handle_get_dimensions (info.handle, &info.dimensions);
 
     if (width != -1) {
diff --git a/tests/rsvg-test.c b/tests/rsvg-test.c
index 51bab0a..22e668e 100644
--- a/tests/rsvg-test.c
+++ b/tests/rsvg-test.c
@@ -297,6 +297,7 @@ rsvg_cairo_check (gconstpointer data)
 
     rsvg_handle_internal_set_testing (rsvg, TRUE);
 
+    rsvg_handle_set_dpi_x_y (rsvg, 72.0, 72.0);
     rsvg_handle_get_dimensions (rsvg, &dimensions);
     g_assert (dimensions.width > 0);
     g_assert (dimensions.height > 0);
@@ -361,8 +362,6 @@ main (int argc, char **argv)
 
     g_test_init (&argc, &argv, NULL);
 
-    rsvg_set_default_dpi_x_y (72, 72);
-
     if (argc < 2) {
         GFile *base, *tests;