fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-06 08:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

spans,traps: Undo device transform from source matrix for recording replays

Browse source 
As the replay of the recording surface applies the device_transform of
the matrix once again to all its operations, we end up with a repeated
transform through the source matrix of the recording surface. We need to
remove one of these, and the easiest way to do that appears to be to
undo the application to the source matrix.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-06-03 20:32:45 +01:00
parent f0e2cd4494
commit 38217d67fc
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cairo-spans-compositor.c
View file

@ -585,6 +585,8 @@ composite_aligned_boxes (const cairo_spans_compositor_t *compositor,
{
cairo_clip_t *recording_clip;
const cairo_pattern_t *source = &extents->source_pattern.base;
const cairo_matrix_t *m;
cairo_matrix_t matrix;
/* XXX could also do tiling repeat modes... */
@ -600,10 +602,17 @@ composite_aligned_boxes (const cairo_spans_compositor_t *compositor,
dst->is_clear = TRUE;
}
m = &source->matrix;
if (_cairo_surface_has_device_transform (dst)) {
cairo_matrix_multiply (&matrix,
&source->matrix,
&dst->device_transform);
m = &matrix;
}
recording_clip = _cairo_clip_from_boxes (boxes);
status = _cairo_recording_surface_replay_with_clip (unwrap_source (source),
&source->matrix,
dst, recording_clip);
m, dst, recording_clip);
_cairo_clip_destroy (recording_clip);
return status;

15
src/cairo-traps-compositor.c
View file

@ -1206,7 +1206,9 @@ composite_aligned_boxes (const cairo_traps_compositor_t *compositor,
&extents->source_sample_area))
{
cairo_clip_t *recording_clip;
cairo_pattern_t *source = &extents->source_pattern.base;
const cairo_pattern_t *source = &extents->source_pattern.base;
const cairo_matrix_t *m;
cairo_matrix_t matrix;
/* XXX could also do tiling repeat modes... */
@ -1225,10 +1227,17 @@ composite_aligned_boxes (const cairo_traps_compositor_t *compositor,
return status;
}
m = &source->matrix;
if (_cairo_surface_has_device_transform (dst)) {
cairo_matrix_multiply (&matrix,
&source->matrix,
&dst->device_transform);
m = &matrix;
}
recording_clip = _cairo_clip_from_boxes (boxes);
status = _cairo_recording_surface_replay_with_clip (recording_pattern_get_surface (source),
&source->matrix,
dst, recording_clip);
m, dst, recording_clip);
_cairo_clip_destroy (recording_clip);
return status;