jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b9b8300f9873e3224f2d3cf48f218d81bb4081e7
commit b9b8300f9873e3224f2d3cf48f218d81bb4081e7 Author: Jean-Philippe Andre <[email protected]> Date: Mon Feb 10 11:05:07 2014 +0900 Evas filters: Check for EVAS_CSERVE2 when using cs2 APIs This broke the windows build, because cserve2 isn't available on windows. --- src/lib/evas/filters/evas_filter.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c index ee510da..77066f6 100644 --- a/src/lib/evas/filters/evas_filter.c +++ b/src/lib/evas/filters/evas_filter.c @@ -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; --
