diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2013-10-02 16:32:33 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2013-10-02 16:32:33 +0900 |
commit | 48a3f299b00554fe2be209af492574e3126344eb (patch) | |
tree | 4e1ec90ddae2d41f25711ff46773748d797a2e4b /src/lib/evas/common | |
parent | 3b93896e54d82b451919484100d0cb830e759536 (diff) |
evas - fix deadlock in preload that we seemm to never have hit before...
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r-- | src/lib/evas/common/evas_image_scalecache.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index 4c83ae639a..8b08877f2c 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, | |||
658 | */ | 658 | */ |
659 | if ((dst_region_w == 0) || (dst_region_h == 0) || | 659 | if ((dst_region_w == 0) || (dst_region_h == 0) || |
660 | (src_region_w == 0) || (src_region_h == 0)) return EINA_FALSE; | 660 | (src_region_w == 0) || (src_region_h == 0)) return EINA_FALSE; |
661 | LKL(im->cache.lock); | ||
662 | if ((src_region_w == dst_region_w) && (src_region_h == dst_region_h)) | 661 | if ((src_region_w == dst_region_w) && (src_region_h == dst_region_h)) |
663 | { | 662 | { |
664 | if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888) | 663 | 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, | |||
673 | evas_common_image_colorspace_normalize(im); | 672 | evas_common_image_colorspace_normalize(im); |
674 | 673 | ||
675 | // noscales++; | 674 | // noscales++; |
676 | LKU(im->cache.lock); | ||
677 | if (im->image.data) | 675 | if (im->image.data) |
678 | { | 676 | { |
679 | return cb_sample(im, dst, dc, | 677 | return cb_sample(im, dst, dc, |
@@ -684,6 +682,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst, | |||
684 | } | 682 | } |
685 | return EINA_FALSE; | 683 | return EINA_FALSE; |
686 | } | 684 | } |
685 | LKL(im->cache.lock); | ||
687 | LKL(cache_lock); | 686 | LKL(cache_lock); |
688 | sci = _sci_find(im, dc, smooth, | 687 | sci = _sci_find(im, dc, smooth, |
689 | src_region_x, src_region_y, src_region_w, src_region_h, | 688 | src_region_x, src_region_y, src_region_w, src_region_h, |