[libgxps] gxps-brush: Fix scale of ImageBrush elements

[Carlos Garcia Campos <carlosgc src gnome org>]

commit dea3ff240e8c609bec2c2a9790168ea7be47f164
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Thu Jun 4 14:06:48 2015 +0200

    gxps-brush: Fix scale of ImageBrush elements
    
    We were not taking into account the size of the original image.

 libgxps/gxps-brush.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libgxps/gxps-brush.c b/libgxps/gxps-brush.c
index 6cad41d..5997ba1 100644
--- a/libgxps/gxps-brush.c
+++ b/libgxps/gxps-brush.c
@@ -961,7 +961,6 @@ brush_end_element (GMarkupParseContext  *context,
 
                         image->brush->pattern = cairo_pattern_create_for_surface (surface);
                         cairo_pattern_set_extend (image->brush->pattern, image->extend);
-                        cairo_surface_destroy (surface);
 
                         cairo_matrix_init (&port_matrix,
                                            image->viewport.width,
@@ -971,8 +970,8 @@ brush_end_element (GMarkupParseContext  *context,
                                            image->viewport.y);
                         cairo_matrix_multiply (&port_matrix, &port_matrix, &image->matrix);
 
-                        x_scale = image->viewbox.width / port_matrix.xx;
-                        y_scale = image->viewbox.height / port_matrix.yy;
+                        x_scale = cairo_image_surface_get_width (surface) / port_matrix.xx;
+                        y_scale = cairo_image_surface_get_height (surface) / port_matrix.yy;
                         cairo_matrix_init (&matrix, x_scale, 0, 0, y_scale,
                                            -port_matrix.x0 * x_scale,
                                            -port_matrix.y0 * y_scale);
@@ -991,6 +990,7 @@ brush_end_element (GMarkupParseContext  *context,
                                 cairo_pattern_destroy (image->brush->pattern);
                                 image->brush->pattern = NULL;
                         }
+                        cairo_surface_destroy (surface);
                 } else if (err) {
                         GXPS_DEBUG (g_debug ("%s", err->message));
                         g_error_free (err);