diff options
| author | Alexander Larsson <alexl@redhat.com> | 2013-05-30 20:53:29 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-05 16:08:19 +0100 |
| commit | 900fc4a890026e46a3b0a00967632f57074b8b93 (patch) | |
| tree | 9bccd996bdf3faa161770ae2aa5365485f0a3ab2 /src/cairo-surface-wrapper.c | |
| parent | 25eaec0a3874a2090e1bb97547a328eb5c00b0b1 (diff) | |
| download | cairo-900fc4a890026e46a3b0a00967632f57074b8b93.tar.gz | |
gstate: Move device-scale font scaling to gstate
If we do this in surface it will be applied twice then
we chain to a different surface, like e.g. a subsurface.
We also remove a hack in cairo-surface-wrapper where it compensated
for the device scale not being applied.
v2: Compute the backend CTM in ensure_scaled_font().
Diffstat (limited to 'src/cairo-surface-wrapper.c')
| -rw-r--r-- | src/cairo-surface-wrapper.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c index 578e8e2be..030de670a 100644 --- a/src/cairo-surface-wrapper.c +++ b/src/cairo-surface-wrapper.c @@ -437,12 +437,11 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper, _cairo_surface_wrapper_get_transform (wrapper, &m); - if (! _cairo_matrix_is_translation (&wrapper->transform)) { + if (! _cairo_matrix_is_translation (&m)) { cairo_matrix_t ctm; - /* XXX No device-transform? A bug in the tangle of layers? */ _cairo_matrix_multiply (&ctm, - &wrapper->transform, + &m, &scaled_font->ctm); dev_scaled_font = cairo_scaled_font_create (scaled_font->font_face, &scaled_font->font_matrix, |