summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_scale_sample.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-01-07 16:48:39 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-01-07 16:48:39 +0900
commitb601d89f45b8568e981c1a176f06c70a60120b92 (patch)
treeb69f9eaa53a04fa45b086a23464a5833c8dc8b6a /src/lib/evas/common/evas_scale_sample.c
parent21984b1d584abb66e3c575321117548655769097 (diff)
Evas masking: Fix a potential issue with pixman
Untested. Just skip pixman path when there's a mask.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_scale_sample.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c
index c888aa7450..91a75eb356 100644
--- a/src/lib/evas/common/evas_scale_sample.c
+++ b/src/lib/evas/common/evas_scale_sample.c
@@ -485,9 +485,9 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst,
485 if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h)) 485 if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h))
486 { 486 {
487#ifdef HAVE_PIXMAN 487#ifdef HAVE_PIXMAN
488# ifdef PIXMAN_IMAGE_SCALE_SAMPLE 488# ifdef PIXMAN_IMAGE_SCALE_SAMPLE
489 if ((src->pixman.im) && (dst->pixman.im) && ((!dc->mul.use) || 489 if ((src->pixman.im) && (dst->pixman.im) && (!dc->clip.mask) &&
490 ((dc->mul.use) && (dc->mul.col == 0xffffffff))) && 490 ((!dc->mul.use) || ((dc->mul.use) && (dc->mul.col == 0xffffffff))) &&
491 ((dc->render_op == _EVAS_RENDER_COPY) || 491 ((dc->render_op == _EVAS_RENDER_COPY) ||
492 (dc->render_op == _EVAS_RENDER_BLEND))) 492 (dc->render_op == _EVAS_RENDER_BLEND)))
493 { 493 {