summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-19 22:36:13 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-19 22:36:13 +0000
commit7c19e1b34d28d224dfb50f2b942209e3986b9eeb (patch)
treedbcab6321966c7e26d2da0555d93406fe9d40c91
parent3a22bb3d5bf3f69f33a56e7a3af04e995a9be09a (diff)
efl/evas_cache: copied images should be considered loaded.
Whenever we copy an image, making it write-able (evas_object_image_data_get(o, 1)) or just start painting a pristine buffer (evas_object_image_size_set(o, w, h)), we must mark the image as loaded to avoid trying to load it (and failing, marking the whole thing as EVAS_LOAD_ERROR_GENERIC). SVN revision: 81409
-rw-r--r--ChangeLog8
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/cache/evas_cache_image.c1
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a55c304790..590e0e864e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
12012-12-20 Carsten Haitzler (The Rasterman) 12012-12-19 Gustavo Sverzut Barbieri (k-s)
2
3 * Fixed RGBA_Image->flags.loaded for copied images.
4
52012-12-19 Carsten Haitzler (The Rasterman)
2 6
3 * Fixed 24bpp issue with rendering in evas. It shows itself 7 * Fixed 24bpp issue with rendering in evas. It shows itself
4 only under qemu/kvm with the cirruse driver that I have found. 8 only under qemu/kvm with the cirruse driver that I have found.
@@ -6,7 +10,7 @@
6 just never comes up on any vaguely modern gfx system. 10 just never comes up on any vaguely modern gfx system.
7 * Fixed 24bpp ximage convert back from 24bpp to 32bpp in 11 * Fixed 24bpp ximage convert back from 24bpp to 32bpp in
8 ecore-x. Only shows itself in qemu/kvm. 12 ecore-x. Only shows itself in qemu/kvm.
9 13
102012-12-18 Gustavo Sverzut Barbieri (k-s) 142012-12-18 Gustavo Sverzut Barbieri (k-s)
11 15
12 * Fixed many memory problems with ecore_evas_extn 16 * Fixed many memory problems with ecore_evas_extn
diff --git a/NEWS b/NEWS
index a0440973d8..03a352826d 100644
--- a/NEWS
+++ b/NEWS
@@ -84,3 +84,4 @@ Fixes:
84 * Fix uninitialized data in Evas OpenGL engine. 84 * Fix uninitialized data in Evas OpenGL engine.
85 * Fix the line drawing clipping problem on arm gl driver. 85 * Fix the line drawing clipping problem on arm gl driver.
86 * Fix many memory problems with ecore_evas_extn. 86 * Fix many memory problems with ecore_evas_extn.
87 * Fix Evas RGBA_Image->flags.loaded for copied images.
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index b399f1a009..83d8370f7b 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -877,6 +877,7 @@ evas_cache_image_copied_data(Evas_Cache_Image *cache,
877 return NULL; 877 return NULL;
878 } 878 }
879 im->references = 1; 879 im->references = 1;
880 im->flags.loaded = EINA_TRUE;
880 if (cache->func.debug) cache->func.debug("copied-data", im); 881 if (cache->func.debug) cache->func.debug("copied-data", im);
881 return im; 882 return im;
882} 883}