evas/cserve2: fix crash with YUV tests in expedite.

Signed-off-by: Cedric Bail <cedric.bail@samsung.com>

diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 5d7a440..4c83ae6 100644 (file)
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -886,9 +886,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
              if ((dounload) ||
                  ((im->cache_entry.flags.loaded) &&
                      ((!im->cs.no_free)
-#ifdef EVAS_CSERVE
-                      || (ie->data1)
-#endif
 #ifdef EVAS_CSERVE2
                       || (ie->data1)
 #endif

diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 660249c..24016b8 100644 (file)
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -1070,13 +1070,11 @@ eng_image_data_get(void *data EINA_UNUSED, void *image, int to_write, DATA32 **i
 
         if (to_write)
           im = (RGBA_Image *)evas_cache2_image_writable(&im->cache_entry);
-
-        *image_data = im->image.data;
-        return im;
      }
+   else
 #endif
-
    error = evas_cache_image_load_data(&im->cache_entry);
+
    switch (im->cache_entry.space)
      {
       case EVAS_COLORSPACE_ARGB8888:
@@ -1136,7 +1134,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
       case EVAS_COLORSPACE_YCBCR420NV12601_PL:
       case EVAS_COLORSPACE_YCBCR420TM12601_PL:
        if (image_data != im->cs.data)
-         {
+          {
             if (im->cs.data)
               {
                  if (!im->cs.no_free) free(im->cs.data);