kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Signed-off-by: Cedric Bail <cedric.bail@samsung.com>
This commit is contained in:
Jean-Philippe Andre 2013-07-01 17:03:31 +09:00 committed by Cedric Bail
parent 48d97f7a90
commit 90d8647c02
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/evas/common/evas_image_scalecache.c
View File

@ -886,9 +886,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
if ((dounload) || if ((dounload) ||
((im->cache_entry.flags.loaded) && ((im->cache_entry.flags.loaded) &&
((!im->cs.no_free) ((!im->cs.no_free)
#ifdef EVAS_CSERVE
|| (ie->data1)
#endif
#ifdef EVAS_CSERVE2 #ifdef EVAS_CSERVE2
|| (ie->data1) || (ie->data1)
#endif #endif

8
src/modules/evas/engines/software_generic/evas_engine.c
View File

@ -1070,13 +1070,11 @@ eng_image_data_get(void *data EINA_UNUSED, void *image, int to_write, DATA32 **i
if (to_write) if (to_write)
im = (RGBA_Image *)evas_cache2_image_writable(&im->cache_entry); im = (RGBA_Image *)evas_cache2_image_writable(&im->cache_entry);
*image_data = im->image.data;
return im;
} }
else
#endif #endif
error = evas_cache_image_load_data(&im->cache_entry); error = evas_cache_image_load_data(&im->cache_entry);
switch (im->cache_entry.space) switch (im->cache_entry.space)
{ {
case EVAS_COLORSPACE_ARGB8888: 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_YCBCR420NV12601_PL:
case EVAS_COLORSPACE_YCBCR420TM12601_PL: case EVAS_COLORSPACE_YCBCR420TM12601_PL:
if (image_data != im->cs.data) if (image_data != im->cs.data)
{ {
if (im->cs.data) if (im->cs.data)
{ {
if (!im->cs.no_free) free(im->cs.data); if (!im->cs.no_free) free(im->cs.data);