Fix bug related to pixman enable

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 (file)
new mode 100755 (executable)
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 (file)
new mode 100755 (executable)
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;
 }