summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-10-26 21:09:17 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-10-26 21:09:17 +0900
commitc4a45c75b15a3bcfb8bfd089a02cdaff3b7102f0 (patch)
treea2a1115ddb68e009158660b5c55ee7c73355f341 /src/lib/evas/common
parent0b8d4e4bce05d7b8f68645b54f1fed1eae123242 (diff)
evas gl engine related - fix elm image example 01 (T182).
this fixes https://phab.enlightenment.org/T182 as it is an issue with a surface alloc overwriting an already allocated surface entirely inside the general software image infra.
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_image_main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c
index 38aac783a9..b9d64ce3f5 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -571,16 +571,18 @@ _evas_common_rgba_image_dirty(Image_Entry *ie_dst, const Image_Entry *ie_src)
571 evas_common_rgba_image_scalecache_dirty((Image_Entry *)ie_src); 571 evas_common_rgba_image_scalecache_dirty((Image_Entry *)ie_src);
572 evas_common_rgba_image_scalecache_dirty(ie_dst); 572 evas_common_rgba_image_scalecache_dirty(ie_dst);
573 evas_cache_image_load_data(&src->cache_entry); 573 evas_cache_image_load_data(&src->cache_entry);
574 if (_evas_common_rgba_image_surface_alloc(&dst->cache_entry, 574 if (!evas_cache_image_pixels(ie_dst))
575 src->cache_entry.w, src->cache_entry.h))
576 { 575 {
576 if (_evas_common_rgba_image_surface_alloc(&dst->cache_entry,
577 src->cache_entry.w, src->cache_entry.h))
578 {
577#ifdef EVAS_CSERVE2 579#ifdef EVAS_CSERVE2
578 // if (ie_src->data1) evas_cserve2_image_free((Image_Entry*) ie_src); 580 // if (ie_src->data1) evas_cserve2_image_free((Image_Entry*) ie_src);
579 if (ie_src->data1) ERR("Shouldn't reach this point since we are using cache2."); 581 if (ie_src->data1) ERR("Shouldn't reach this point since we are using cache2.");
580#endif 582#endif
581 return 1; 583 return 1;
584 }
582 } 585 }
583
584#ifdef EVAS_CSERVE2 586#ifdef EVAS_CSERVE2
585 // if (ie_src->data1) evas_cserve2_image_free((Image_Entry*) ie_src); 587 // if (ie_src->data1) evas_cserve2_image_free((Image_Entry*) ie_src);
586 if (ie_src->data1) ERR("Shouldn't reach this point since we are using cache2."); 588 if (ie_src->data1) ERR("Shouldn't reach this point since we are using cache2.");