6 files changed, 101 insertions, 31 deletions

diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am
index 62b96aab6b..961b20fcfa 100644
--- a/legacy/evas/src/lib/engines/common/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/Makefile.am
@@ -11,9 +11,11 @@ AM_CPPFLAGS	     = -I. \
                        -DPACKAGE_LIB_DIR=\"$(libdir)\" \
                        -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
                        @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
+                       @PIXMAN_CFLAGS@ \
                        @EET_CFLAGS@ @pthread_cflags@ \
                        @WIN32_CFLAGS@ @EINA_CFLAGS@ \
-                       @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@
+                       @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
+                       @PIXMAN_CFLAGS@
 
 noinst_LTLIBRARIES      = libevas_engine_common.la
 libevas_engine_common_la_SOURCES  = \
diff --git a/legacy/evas/src/lib/engines/common/evas_image_data.c b/legacy/evas/src/lib/engines/common/evas_image_data.c
index 15ee166fa2..e5c2f6d73b 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_data.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_data.c
@@ -31,6 +31,7 @@ evas_common_rgba_image_from_data(Image_Entry* ie_dst, int w, int h, DATA32 *imag
      }
    dst->cache_entry.space = cspace;
    evas_common_image_colorspace_dirty(dst);
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
 
@@ -60,6 +61,7 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA3
 
    dst->cache_entry.space = cspace;
    evas_common_image_colorspace_dirty(dst);
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
 
@@ -80,6 +82,7 @@ evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, u
      dst->cs.data = calloc(1, dst->cache_entry.h * sizeof(unsigned char *) * 2);
    evas_common_image_colorspace_dirty(dst);
 
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
 
@@ -126,5 +129,6 @@ evas_common_rgba_image_colorspace_set(Image_Entry* ie_dst, int cspace)
    dst->cache_entry.space = cspace;
    evas_common_image_colorspace_dirty(dst);
 
+   _evas_common_rgba_image_post_surface(ie_dst);
    return 0;
 }
diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c
index 03a06f2227..caf20a5f9c 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_main.c
@@ -144,6 +144,7 @@ _evas_common_rgba_image_new(void)
 #endif
 
    evas_common_rgba_image_scalecache_init(&im->cache_entry);
+   
    return &im->cache_entry;
 }
 
@@ -246,6 +247,42 @@ evas_common_rgba_image_unload(Image_Entry *ie)
 #endif
 }
 
+void
+_evas_common_rgba_image_post_surface(Image_Entry *ie)
+{
+#ifdef HAVE_PIXMAN
+   RGBA_Image   *im = (RGBA_Image *) ie;
+   
+   if (im->pixman.im) pixman_image_unref(im->pixman.im);
+   if (im->cache_entry.flags.alpha)
+     {
+        im->pixman.im = pixman_image_create_bits
+        (
+// FIXME: endianess determines this            
+            PIXMAN_a8r8g8b8,
+//            PIXMAN_b8g8r8a8, 
+            im->cache_entry.w, im->cache_entry.h,
+            im->image.data, 
+            im->cache_entry.w * 4
+        );
+     }
+   else
+     {
+        im->pixman.im = pixman_image_create_bits
+        (
+// FIXME: endianess determines this            
+            PIXMAN_x8r8g8b8,
+//            PIXMAN_b8g8r8x8,
+            im->cache_entry.w, im->cache_entry.h,
+            im->image.data, 
+            im->cache_entry.w * 4
+        );
+     }
+#else
+   ie = NULL;
+#endif
+}
+
 static int
 _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned int h)
 {
@@ -275,7 +312,8 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie, unsigned int w, unsigned
 #  endif
 # endif
 #endif
-
+   _evas_common_rgba_image_post_surface(ie);
+   
    return 0;
 }
 
@@ -284,6 +322,13 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie)
 {
    RGBA_Image   *im = (RGBA_Image *) ie;
 
+#ifdef HAVE_PIXMAN
+   if (im->pixman.im)
+     {
+        pixman_image_unref(im->pixman.im);
+        im->pixman.im = NULL;
+     }
+#endif   
    if (ie->file)
      DBG("unload: [%p] %s %s", ie, ie->file, ie->key);
    if ((im->cs.data) && (im->image.data))
diff --git a/legacy/evas/src/lib/engines/common/evas_image_private.h b/legacy/evas/src/lib/engines/common/evas_image_private.h
index d9aeea795d..cf613696fd 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_private.h
+++ b/legacy/evas/src/lib/engines/common/evas_image_private.h
@@ -13,5 +13,7 @@ void evas_common_rgba_image_scalecache_shutdown(Image_Entry *ie);
 void evas_common_rgba_image_scalecache_dirty(Image_Entry *ie);
 void evas_common_rgba_image_scalecache_orig_use(Image_Entry *ie);
 int evas_common_rgba_image_scalecache_usage_get(Image_Entry *ie);
-    
+
+void _evas_common_rgba_image_post_surface(Image_Entry *ie);
+
 #endif /* _EVAS_IMAGE_PRIVATE_H */
diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
index 63d4c47eb3..dc9ade6a19 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
@@ -518,18 +518,11 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
         LKU(im->cache.lock);
         if (im->image.data)
           {
-             if (smooth)
-               evas_common_scale_rgba_in_to_out_clip_smooth(im, dst, dc,
-                                                            src_region_x, src_region_y, 
-                                                            src_region_w, src_region_h,
-                                                            dst_region_x, dst_region_y, 
-                                                            dst_region_w, dst_region_h);
-             else
-               evas_common_scale_rgba_in_to_out_clip_sample(im, dst, dc,
-                                                            src_region_x, src_region_y, 
-                                                            src_region_w, src_region_h,
-                                                            dst_region_x, dst_region_y, 
-                                                            dst_region_w, dst_region_h);
+             evas_common_scale_rgba_in_to_out_clip_sample(im, dst, dc,
+                                                          src_region_x, src_region_y, 
+                                                          src_region_w, src_region_h,
+                                                          dst_region_x, dst_region_y, 
+                                                          dst_region_w, dst_region_h);
           }
         return;
      }
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_sample.c b/legacy/evas/src/lib/engines/common/evas_scale_sample.c
index 9eefe14c4e..68d9e4990d 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_sample.c
+++ b/legacy/evas/src/lib/engines/common/evas_scale_sample.c
@@ -257,24 +257,48 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst,
 
    if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h))
      {
-        ptr = src_data + ((dst_clip_y - dst_region_y + src_region_y) * src_w) + (dst_clip_x - dst_region_x) + src_region_x;
-        for (y = 0; y < dst_clip_h; y++)
-          {
-            /* * blend here [clip_w *] ptr -> dst_ptr * */
-            if (mask)
-              {
-                  mask += dst_clip_x - dc->mask.x;
-                  mask += (dst_clip_y - dc->mask.y) * maskobj->cache_entry.w;
-              }
+#ifdef HAVE_PIXMAN
+        if ((1) &&
+            (src->pixman.im) && (dst->pixman.im) && 
+            ((!dc->mul.use) ||
+                ((dc->mul.use) && (dc->mul.col == 0xffffffff))) &&
+            ((dc->render_op == _EVAS_RENDER_COPY) ||
+                (dc->render_op == _EVAS_RENDER_BLEND))
+            )
+          {
+             pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY
+             if (dc->render_op == _EVAS_RENDER_BLEND) op = PIXMAN_OP_OVER;
+             pixman_image_composite(op,
+                                    src->pixman.im, NULL,
+                                    dst->pixman.im,
+                                    (dst_clip_x - dst_region_x) + src_region_x,
+                                    (dst_clip_y - dst_region_y) + src_region_y, 
+                                    0, 0,
+                                    dst_clip_x, dst_clip_y, 
+                                    dst_clip_w, dst_clip_h);
+          }
+        else
+#endif
+          {
+             ptr = src_data + ((dst_clip_y - dst_region_y + src_region_y) * src_w) + (dst_clip_x - dst_region_x) + src_region_x;
+             for (y = 0; y < dst_clip_h; y++)
+               {
+                  /* * blend here [clip_w *] ptr -> dst_ptr * */
+                  if (mask)
+                    {
+                       mask += dst_clip_x - dc->mask.x;
+                       mask += (dst_clip_y - dc->mask.y) * maskobj->cache_entry.w;
+                    }
 #ifdef EVAS_SLI
-             if (((y + dst_clip_y) % dc->sli.h) == dc->sli.y)
+                  if (((y + dst_clip_y) % dc->sli.h) == dc->sli.y)
 #endif
-               {
-                  func(ptr, mask, dc->mul.col, dst_ptr, dst_clip_w);
-               }
-            ptr += src_w;
-            dst_ptr += dst_w;
-            if (mask) mask += maskobj->cache_entry.w;
+                    {
+                       func(ptr, mask, dc->mul.col, dst_ptr, dst_clip_w);
+                    }
+                  ptr += src_w;
+                  dst_ptr += dst_w;
+                  if (mask) mask += maskobj->cache_entry.w;
+               }
           }
      }
    else