summaryrefslogtreecommitdiff
path: root/src/cairo-surface-wrapper.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-03-06 14:11:49 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-03-06 14:11:49 +0000
commit5bd29eda63ee54daecfdfe36b12a1b6c4b592740 (patch)
tree3843e9addb1a26100178a04fb358ebd8a36551d1 /src/cairo-surface-wrapper.c
parentc65ed9c79dea9c906db5f34d074500c821ad3228 (diff)
downloadcairo-5bd29eda63ee54daecfdfe36b12a1b6c4b592740.tar.gz
surface-wrapper: Only apply the wrapped transform to the scaled-font
And not the device_transform of the target. This smells fishy, but appears to make the test suite happy. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/cairo-surface-wrapper.c')
-rw-r--r--src/cairo-surface-wrapper.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c
index 52d250c45..fe9c42a44 100644
--- a/src/cairo-surface-wrapper.c
+++ b/src/cairo-surface-wrapper.c
@@ -436,11 +436,13 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
_cairo_surface_wrapper_get_transform (wrapper, &m);
- if (! _cairo_matrix_is_translation (&m)) {
+ if (! _cairo_matrix_is_translation (&wrapper->transform)) {
cairo_matrix_t ctm;
- _cairo_matrix_multiply (&ctm, &m, &scaled_font->ctm);
-
+ /* XXX No device-transform? A bug in the tangle of layers? */
+ _cairo_matrix_multiply (&ctm,
+ &wrapper->transform,
+ &scaled_font->ctm);
dev_scaled_font = cairo_scaled_font_create (scaled_font->font_face,
&scaled_font->font_matrix,
&ctm, &options);