From 9a22001f89c7560ffd8c99a664048b963411002a Mon Sep 17 00:00:00 2001 From: Park SangHee Date: Mon, 23 Apr 2012 13:38:14 +0900 Subject: [PATCH] Fix bug related to pixman enable --- src/lib/engines/common/evas_convert_rgb_32.c | 2 +- src/lib/engines/common/evas_draw_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/lib/engines/common/evas_convert_rgb_32.c mode change 100644 => 100755 src/lib/engines/common/evas_draw_main.c diff --git a/src/lib/engines/common/evas_convert_rgb_32.c b/src/lib/engines/common/evas_convert_rgb_32.c old mode 100644 new mode 100755 index 0401a4a..a0f24d7 --- a/src/lib/engines/common/evas_convert_rgb_32.c +++ b/src/lib/engines/common/evas_convert_rgb_32.c @@ -193,7 +193,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int h); \ } -FAST_SIMPLE_ROTATE(8888, DATA8) +FAST_SIMPLE_ROTATE(8888, uint32_t) #endif diff --git a/src/lib/engines/common/evas_draw_main.c b/src/lib/engines/common/evas_draw_main.c old mode 100644 new mode 100755 index d08e788..eaa3eec --- a/src/lib/engines/common/evas_draw_main.c +++ b/src/lib/engines/common/evas_draw_main.c @@ -205,8 +205,6 @@ evas_common_draw_context_set_mask(RGBA_Draw_Context *dc, RGBA_Image *mask, int x EAPI void evas_common_draw_context_unset_mask(RGBA_Draw_Context *dc) { - dc->mask.mask = NULL; - #ifdef HAVE_PIXMAN RGBA_Image *mask; mask = (RGBA_Image *)dc->mask.mask; @@ -217,6 +215,7 @@ evas_common_draw_context_unset_mask(RGBA_Draw_Context *dc) mask->pixman.im = NULL; } #endif + dc->mask.mask = NULL; } -- 2.7.4