raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=48a3f299b00554fe2be209af492574e3126344eb
commit 48a3f299b00554fe2be209af492574e3126344eb Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Oct 2 16:32:33 2013 +0900 evas - fix deadlock in preload that we seemm to never have hit before... --- src/lib/evas/common/evas_image_scalecache.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index 4c83ae6..8b08877 100644 --- a/src/lib/evas/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c @@ -658,7 +658,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, */ if ((dst_region_w == 0) || (dst_region_h == 0) || (src_region_w == 0) || (src_region_h == 0)) return EINA_FALSE; - LKL(im->cache.lock); if ((src_region_w == dst_region_w) && (src_region_h == dst_region_h)) { if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888) @@ -673,7 +672,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, evas_common_image_colorspace_normalize(im); // noscales++; - LKU(im->cache.lock); if (im->image.data) { return cb_sample(im, dst, dc, @@ -684,6 +682,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, } return EINA_FALSE; } + LKL(im->cache.lock); LKL(cache_lock); sci = _sci_find(im, dc, smooth, src_region_x, src_region_y, src_region_w, src_region_h, --