Attachment 9210 Details for Bug 9568 – fix scaling and rotation of quartz text

[patch] fix scaling and rotation of quartz text

7-of-6.patch (text/plain), 1.46 KB, created by Brian Ewins on 2007-03-18 04:46:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Ewins

Created: 2007-03-18 04:46:31 UTC

Size: 1.46 KB

patch

obsolete

>commit 125212d7a3121dabd965d7df0f9a5ae4e1f245bd
>Author: Brian Ewins <Brian.Ewins@gmail.com>
>Date:   Sun Mar 18 12:40:18 2007 +0000
>
>    [quartz] apply ctm to text
>    
>    Applies the ctm to text output on the quartz surface. This corrects
>    the text-pattern test, and also corrects the size of text when the
>    ctm includes a scale.
>
>diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
>index 1ac4c7b..33f3a10 100644
>--- a/src/cairo-quartz-surface.c
>+++ b/src/cairo-quartz-surface.c
>@@ -1285,13 +1285,20 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
>      * text matrix?
>      */
>     //ND((stderr, "show_glyphs: glyph 0 at: %f, %f\n", glyphs[0].x, glyphs[0].y));
>-    CGAffineTransform cairoTextTransform, textTransform;
>+    CGAffineTransform cairoTextTransform, textTransform, ctm;
>     _cairo_quartz_cairo_matrix_to_quartz (&scaled_font->font_matrix, &cairoTextTransform);
> 
>     textTransform = CGAffineTransformMakeTranslation (glyphs[0].x, glyphs[0].y);
>     textTransform = CGAffineTransformScale (textTransform, 1.0, -1.0);
>     textTransform = CGAffineTransformConcat (cairoTextTransform, textTransform);
> 
>+    ctm = CGAffineTransformMake (scaled_font->ctm.xx,
>+				 -scaled_font->ctm.yx,
>+				 -scaled_font->ctm.xy,
>+				 scaled_font->ctm.yy,
>+				 0., 0.);
>+    textTransform = CGAffineTransformConcat (ctm, textTransform);
>+
>     CGContextSetTextMatrix (surface->cgContext, textTransform);
>     CGContextSetFontSize (surface->cgContext, 1.0);
>

Actions: View | Splinter Review

Attachments on bug 9568: 8328 | 8468 | 9190 | 9191 | 9192 | 9193 | 9194 | 9195 | 9196 | 9197 | 9210

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.