summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-10-02 17:06:26 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-10-02 17:06:26 +0900
commit6a2aafeac36379bb1163bb48d992d035e89366a1 (patch)
treea8555901a48675fe9e230641240253fe9a483264 /src/lib/evas/common
parent48a3f299b00554fe2be209af492574e3126344eb (diff)
evas - more deadlocks found. fixed.
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_image_scalecache.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 8b08877f2c..490d3c8d3f 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -682,7 +682,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
682 } 682 }
683 return EINA_FALSE; 683 return EINA_FALSE;
684 } 684 }
685 LKL(im->cache.lock);
686 LKL(cache_lock); 685 LKL(cache_lock);
687 sci = _sci_find(im, dc, smooth, 686 sci = _sci_find(im, dc, smooth,
688 src_region_x, src_region_y, src_region_w, src_region_h, 687 src_region_x, src_region_y, src_region_w, src_region_h,
@@ -702,7 +701,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
702 evas_common_image_colorspace_normalize(im); 701 evas_common_image_colorspace_normalize(im);
703 702
704// misses++; 703// misses++;
705 LKU(im->cache.lock);
706 if (im->image.data) 704 if (im->image.data)
707 { 705 {
708 if (smooth) 706 if (smooth)
@@ -720,6 +718,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
720 } 718 }
721 return EINA_FALSE; 719 return EINA_FALSE;
722 } 720 }
721 LKL(im->cache.lock);
723 if (sci->populate_me) 722 if (sci->populate_me)
724 { 723 {
725 int size, osize, used; 724 int size, osize, used;
@@ -781,6 +780,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
781 ct = evas_common_draw_context_new(); 780 ct = evas_common_draw_context_new();
782 evas_common_draw_context_set_render_op(ct, _EVAS_RENDER_COPY); 781 evas_common_draw_context_set_render_op(ct, _EVAS_RENDER_COPY);
783 } 782 }
783 LKU(im->cache.lock);
784 if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888) 784 if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)
785 { 785 {
786#ifdef EVAS_CSERVE2 786#ifdef EVAS_CSERVE2
@@ -790,6 +790,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
790#endif 790#endif
791 evas_cache_image_load_data(&im->cache_entry); 791 evas_cache_image_load_data(&im->cache_entry);
792 } 792 }
793 LKL(im->cache.lock);
793 evas_common_image_colorspace_normalize(im); 794 evas_common_image_colorspace_normalize(im);
794 if (im->image.data) 795 if (im->image.data)
795 { 796 {
@@ -908,6 +909,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
908 } 909 }
909 else 910 else
910 { 911 {
912 LKU(im->cache.lock);
911 if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888) 913 if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)
912 { 914 {
913#ifdef EVAS_CSERVE2 915#ifdef EVAS_CSERVE2
@@ -919,7 +921,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
919 } 921 }
920 evas_common_image_colorspace_normalize(im); 922 evas_common_image_colorspace_normalize(im);
921// misses++; 923// misses++;
922 LKU(im->cache.lock);
923 if (im->image.data) 924 if (im->image.data)
924 { 925 {
925 if (smooth) 926 if (smooth)