summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-21 21:21:20 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-21 21:25:10 +0000
commit2a56a28b89810783f069200fedf6fc307a314e69 (patch)
tree5d0194ee2b91bd72e8620a0c89b630e50a0e7931
parent8cb4fe7ff4ea5227ebe416617c16c9abfa437ff0 (diff)
Resolves: tdf#93703 0 scaling is CAIRO_STATUS_INVALID_MATRIX
so more drawing to the surface fails prior to 4ac876084bb89b6460b31e090a666b395f66b1e8 we had a new cairo context each time to the error was thrown away along with the context and the new one would work Change-Id: I90ab1a943e8908e87f391bdfb8ccd5f3818e13d5 (cherry picked from commit f22d153a07231f2d41c7be9ba0e6b7ce963a0762)
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 58a860a1f043..6c25dd8697de 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -429,6 +429,14 @@ namespace cairocanvas
if (cairo_glyphs.empty())
continue;
+ vcl::Font aFont = rOutDev.GetFont();
+ long nWidth = aFont.GetWidth();
+ long nHeight = aFont.GetHeight();
+ if (nWidth == 0)
+ nWidth = nHeight;
+ if (nWidth == 0 || nHeight == 0)
+ continue;
+
/**
* Setup font
**/
@@ -463,17 +471,12 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
- vcl::Font aFont = rOutDev.GetFont();
cairo_matrix_init_identity(&m);
if (aSysLayoutData.orientation)
cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0);
- long nWidth = aFont.GetWidth();
- long nHeight = aFont.GetHeight();
- if (nWidth == 0)
- nWidth = nHeight;
cairo_matrix_scale(&m, nWidth, nHeight);
//faux italics