From 00a36e46524790deb36048fddd911daa1cbcbe38 Mon Sep 17 00:00:00 2001
From: Adrian Johnson <ajohnson@redneon.com>
Date: Sat, 16 Apr 2016 18:05:41 +0930
Subject: [PATCH] svg2png: fix deprecated warning

rsvg_pixbuf_from_file() is deprecated, replaced by
rsvg_handle_new_from_file() + rsvg_handle_render_cairo().
---
 test/svg2png.c | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/test/svg2png.c b/test/svg2png.c
index 1eecaf7b2..9a5c8c045 100644
--- a/test/svg2png.c
+++ b/test/svg2png.c
@@ -37,9 +37,13 @@
 int main (int argc, char *argv[])
 {
     GError *error = NULL;
-    GdkPixbuf *pixbuf;
+    RsvgHandle *handle;
+    RsvgDimensionData dimensions;
     const char *filename = argv[1];
     const char *output_filename = argv[2];
+    cairo_surface_t *surface;
+    cairo_t *cr;
+    cairo_status_t status;
 
     if (argc != 3)
 	FAIL ("usage: svg2png input_file.svg output_file.png");
@@ -51,14 +55,37 @@ int main (int argc, char *argv[])
     error = NULL;
 
     rsvg_set_default_dpi (72.0);
-    pixbuf = rsvg_pixbuf_from_file (filename, &error);
-    if (error != NULL)
+
+    handle = rsvg_handle_new_from_file (filename, &error);
+    if (!handle)
 	FAIL (error->message);
 
-    gdk_pixbuf_save (pixbuf, output_filename, "png", &error, NULL);
-    if (error != NULL)
+    rsvg_handle_get_dimensions (handle, &dimensions);
+
+    surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+					  dimensions.width, dimensions.height);
+    cr = cairo_create (surface);
+    cairo_surface_destroy (surface);
+
+    cairo_set_source_rgb (cr, 1,1,1);
+    cairo_paint (cr);
+    cairo_push_group_with_content (cr, CAIRO_CONTENT_COLOR_ALPHA);
+
+    if (!rsvg_handle_render_cairo (handle, cr))
 	FAIL (error->message);
 
-    g_object_unref (pixbuf);
+    cairo_pop_group_to_source (cr);
+    cairo_paint (cr);
+
+    status = cairo_surface_write_to_png (cairo_get_target (cr),
+					 output_filename);
+    cairo_destroy (cr);
+    if (status)
+	FAIL (cairo_status_to_string (status));
+
+    if (!rsvg_handle_close (handle, &error))
+	FAIL (error->message);
+
+    g_object_unref (handle);
     return 0;
 }