forked from enlightenment/efl
oops. fix scalecache issue - would do a LOT of unload/reload thanks to extra
dump code. moved into dump code as opposed to unload. SVN revision: 47982
This commit is contained in:
parent
e0dedc5eb9
commit
a6e4ee23f5
|
@ -1199,6 +1199,7 @@ evas_cache_image_unload_data(Image_Entry *im)
|
|||
#endif
|
||||
return;
|
||||
}
|
||||
evas_common_rgba_image_scalecache_dirty(im);
|
||||
cache->func.destructor(im);
|
||||
|
||||
#ifdef BUILD_ASYNC_PRELOAD
|
||||
|
|
|
@ -238,6 +238,8 @@ evas_common_load_rgba_image_data_from_file(Image_Entry *ie)
|
|||
|
||||
if (!ie->info.module) return EVAS_LOAD_ERROR_GENERIC;
|
||||
|
||||
// printf("load data [%p] %s %s\n", ie, ie->file, ie->key);
|
||||
|
||||
evas_image_load_func = ie->info.loader;
|
||||
evas_module_use((Evas_Module*) ie->info.module);
|
||||
if (!evas_image_load_func->file_data(ie, ie->file, ie->key, &ret))
|
||||
|
|
|
@ -186,8 +186,6 @@ evas_common_rgba_image_unload(Image_Entry *ie)
|
|||
if ((!ie->info.module) && (!ie->data1)) return;
|
||||
if (!ie->file) return;
|
||||
|
||||
evas_common_rgba_image_scalecache_dirty(ie);
|
||||
|
||||
ie->flags.loaded = 0;
|
||||
|
||||
if ((im->cs.data) && (im->image.data))
|
||||
|
@ -259,6 +257,8 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie)
|
|||
{
|
||||
RGBA_Image *im = (RGBA_Image *) ie;
|
||||
|
||||
if (ie->file)
|
||||
printf("unload: [%p] %s %s\n", ie, ie->file, ie->key);
|
||||
if ((im->cs.data) && (im->image.data))
|
||||
{
|
||||
if (im->cs.data != im->image.data)
|
||||
|
@ -285,6 +285,7 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie)
|
|||
static void
|
||||
_evas_common_rgba_image_unload(Image_Entry *im)
|
||||
{
|
||||
// printf("unload: [%p] %s %s\n", im, im->file, im->key);
|
||||
evas_common_rgba_image_unload(im);
|
||||
}
|
||||
|
||||
|
@ -307,7 +308,7 @@ _evas_common_rgba_image_dirty(Image_Entry *ie_dst, const Image_Entry *ie_src)
|
|||
RGBA_Image *dst = (RGBA_Image *) ie_dst;
|
||||
RGBA_Image *src = (RGBA_Image *) ie_src;
|
||||
|
||||
evas_common_rgba_image_scalecache_dirty((Image_Entry*) ie_src);
|
||||
evas_common_rgba_image_scalecache_dirty((Image_Entry *)ie_src);
|
||||
evas_common_rgba_image_scalecache_dirty(ie_dst);
|
||||
evas_cache_image_load_data(&src->cache_entry);
|
||||
if (_evas_common_rgba_image_surface_alloc(&dst->cache_entry,
|
||||
|
|
Loading…
Reference in New Issue