[librsvg/librsvg-2.40] bgo#587721: Update the PangoLayout for the new matrix before rendering

[Federico Mena Quintero <federico src gnome org>]

commit bf717d5c6a521e53cd455f9a19b6761164715d28
Author: Massimo <sixtysix inwind it>
Date:   Wed Aug 30 09:55:48 2017 -0500

    bgo#587721: Update the PangoLayout for the new matrix before rendering
    
    If the cairo_t's transformation changes between the time the
    PangoLayout is created and the time it is shown, one needs to
    pango_cairo_update_layout() first.

 rsvg-cairo-draw.c                                  |    4 ++++
 .../reftests/bugs/587721-text-transform-ref.png    |  Bin 0 -> 3910 bytes
 .../reftests/bugs/587721-text-transform.svg        |   13 +++++++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
index f100d9f..6ae8e07 100644
--- a/rsvg-cairo-draw.c
+++ b/rsvg-cairo-draw.c
@@ -422,6 +422,8 @@ rsvg_cairo_render_pango_layout (RsvgDrawingCtx * ctx, PangoLayout * layout, doub
                                        bbox, rsvg_current_state (ctx)->current_color);
         if (rotation != 0.)
             cairo_rotate (render->cr, -rotation);
+
+        pango_cairo_update_layout (render->cr, layout);
         pango_cairo_show_layout (render->cr, layout);
         cairo_restore (render->cr);
     }
@@ -439,6 +441,8 @@ rsvg_cairo_render_pango_layout (RsvgDrawingCtx * ctx, PangoLayout * layout, doub
 
         if (rotation != 0.)
             cairo_rotate (render->cr, -rotation);
+
+        pango_cairo_update_layout (render->cr, layout);
         pango_cairo_layout_path (render->cr, layout);
 
         cairo_set_line_width (render->cr, _rsvg_css_normalize_length (&state->stroke_width, ctx, 'h'));
diff --git a/tests/fixtures/reftests/bugs/587721-text-transform-ref.png 
b/tests/fixtures/reftests/bugs/587721-text-transform-ref.png
new file mode 100644
index 0000000..f9c7ec0
Binary files /dev/null and b/tests/fixtures/reftests/bugs/587721-text-transform-ref.png differ
diff --git a/tests/fixtures/reftests/bugs/587721-text-transform.svg 
b/tests/fixtures/reftests/bugs/587721-text-transform.svg
new file mode 100644
index 0000000..d86b6ef
--- /dev/null
+++ b/tests/fixtures/reftests/bugs/587721-text-transform.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg width="1179.75118pt" height="687.74173pt"
+     viewBox="0 0 1179.75118 687.74173"
+     enable-background="new 0 0 1179.75118 687.74173"
+     version="1.1" xmlns="http://www.w3.org/2000/svg";
+     xmlns:xlink="http://www.w3.org/1999/xlink"; >
+
+  <g font-family="'DejaVu Sans'" font-size="1" kerning="0" font-weight="400" fill="#000000">
+    <text transform="matrix(12 0 0 12 929.88438 660.96434)">Frenchtown</text>
+  </g>
+               
+</svg>