Attachment 20245 Details for Bug 18254 – Ensure font matrix is invertable

[patch] Ensure font matrix is invertable

0001-Ensure-cairo-font-matrix-is-invertable.patch (text/plain), 1.45 KB, created by Adrian Johnson on 2008-11-12 02:15:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2008-11-12 02:15:37 UTC

Size: 1.45 KB

patch

obsolete

>From dbc38b9c3f5994345acc28003b225bb2b2bbdb14 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Wed, 12 Nov 2008 20:40:57 +1030
>Subject: [PATCH] Ensure cairo font matrix is invertable
>
>Fixes bugs #18254 and #18429
>---
> poppler/CairoOutputDev.cc |   15 ++++++++++++++-
> 1 files changed, 14 insertions(+), 1 deletions(-)
>
>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
>index 26b8010..8ac2201 100644
>--- a/poppler/CairoOutputDev.cc
>+++ b/poppler/CairoOutputDev.cc
>@@ -410,7 +410,7 @@ void CairoOutputDev::updateStrokeOpacity(GfxState *state) {
> 
> void CairoOutputDev::updateFont(GfxState *state) {
>   cairo_font_face_t *font_face;
>-  cairo_matrix_t matrix;
>+  cairo_matrix_t matrix, invert_matrix;
> 
>   LOG(printf ("updateFont() font=%s\n", state->getFont()->getName()->getCString()));
> 
>@@ -438,6 +438,19 @@ void CairoOutputDev::updateFont(GfxState *state) {
>   matrix.yy = -m[3] * fontSize;
>   matrix.x0 = 0;
>   matrix.y0 = 0;
>+
>+ /* Make sure the font matrix is invertible before setting it.  cairo
>+  * will blow up if we give it a matrix that's not invertible, so we
>+  * need to check before passing it to cairo_set_font_matrix. Ignoring it
>+  * is likely to give better results than not rendering anything at
>+  * all. See #18254.
>+  */
>+  invert_matrix = matrix;
>+  if (cairo_matrix_invert(&invert_matrix)) {
>+    warning("font matrix not invertible\n");
>+    return;
>+  }
>+
>   cairo_set_font_matrix (cairo, &matrix);
> }
> 
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 18254: 19891 | 19892 | 20245

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.