raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2bfc9190d96a04ff031570531ff68a610b418285
commit 2bfc9190d96a04ff031570531ff68a610b418285 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Mon Aug 18 19:39:10 2014 +0900 Revert "evas scalecache - fix thread deadlock posssibility" This reverts commit 24a1c444b02f090578ac34774264fdaa6d102dd0. --- src/lib/evas/common/evas_image_scalecache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index 1accf2b..1a8229f 100644 --- a/src/lib/evas/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c @@ -788,11 +788,10 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, { static RGBA_Draw_Context *ct = NULL; + SLKL(cache_lock); im->cache.orig_usage++; im->cache.usage_count = use_counter; im->cache.populate_count--; - SLKU(im->cache.lock); - SLKL(cache_lock); // pops++; if (!ct) { @@ -801,6 +800,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, ct = evas_common_draw_context_new(); evas_common_draw_context_set_render_op(ct, _EVAS_RENDER_COPY); } + SLKU(im->cache.lock); if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888) { #ifdef EVAS_CSERVE2 --
