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

Evas filters: Check for EVAS_CSERVE2 when using cs2 APIs 

This broke the windows build, because cserve2 isn't available on windows.
This commit is contained in:
Jean-Philippe Andre 2014-02-10 11:05:07 +09:00
parent 6ea0566e6c
commit b9b8300f98
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/evas/filters/evas_filter.c
View File

@ -93,10 +93,12 @@ _backing_free(Evas_Filter_Context *ctx, Image_Entry *ie)
}
else
{
if (!evas_cserve2_use_get())
evas_cache_image_drop(ie);
else
#ifdef EVAS_CSERVE2
if (evas_cserve2_use_get())
evas_cache2_image_close(ie);
else
#endif
evas_cache_image_drop(ie);
}
}
@ -326,21 +328,25 @@ _rgba_image_alloc(Evas_Filter_Buffer const *fb, void *data)
if (!data)
{
if (!evas_cserve2_use_get())
#ifdef EVAS_CSERVE2
if (evas_cserve2_use_get())
image = (RGBA_Image *) evas_cache2_image_copied_data
(evas_common_image_cache2_get(), fb->w, fb->h, NULL, EINA_TRUE, cspace);
else
#endif
image = (RGBA_Image *) evas_cache_image_copied_data
(evas_common_image_cache_get(), fb->w, fb->h, NULL, EINA_TRUE, cspace);
else
image = (RGBA_Image *) evas_cache2_image_copied_data
(evas_common_image_cache2_get(), fb->w, fb->h, NULL, EINA_TRUE, cspace);
}
else
{
if (!evas_cserve2_use_get())
image = (RGBA_Image *) evas_cache_image_data
(evas_common_image_cache_get(), fb->w, fb->h, data, EINA_TRUE, cspace);
else
#ifdef EVAS_CSERVE2
if (evas_cserve2_use_get())
image = (RGBA_Image *) evas_cache2_image_data
(evas_common_image_cache2_get(), fb->w, fb->h, data, EINA_TRUE, cspace);
else
#endif
image = (RGBA_Image *) evas_cache_image_data
(evas_common_image_cache_get(), fb->w, fb->h, data, EINA_TRUE, cspace);
}
}
if (!image) return EINA_FALSE;