summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-23 14:24:11 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-25 14:48:12 -0400
commite436947ff067765129a91c4acfa18206dc6f6b7a (patch)
tree6c9f5e669d79f7161532452bbe68cef2744233d9
parente4ba40c5bc69b5be6fa8bf197c09c3a94e16fea0 (diff)
evas image cache: notify preload for image objects without explicit callbacks
non-gl images do not have an explicit callback and so the preload inform callback must be triggered manually for all cases fix T5200
-rw-r--r--src/lib/evas/cache/evas_cache_image.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index ec44a2112c..138aff82a3 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -1466,22 +1466,7 @@ evas_cache_image_preload_data(Image_Entry *im, const Eo *target,
1466 (((im->flags.loaded) && (img->image.data)) || 1466 (((im->flags.loaded) && (img->image.data)) ||
1467 (im->flags.textured && !im->flags.updated_data))) 1467 (im->flags.textured && !im->flags.updated_data)))
1468 { 1468 {
1469 Evas_Cache_Target *tmp; 1469 _evas_cache_image_preloaded_notify(im);
1470
1471 while ((tmp = im->targets))
1472 {
1473 im->targets = (Evas_Cache_Target *)
1474 eina_inlist_remove(EINA_INLIST_GET(im->targets),
1475 EINA_INLIST_GET(im->targets));
1476 if (tmp->simple_cb)
1477 {
1478 if (!tmp->delete_me)
1479 {
1480 tmp->simple_cb(tmp->simple_data);
1481 }
1482 }
1483 free(tmp);
1484 }
1485 evas_object_inform_call_image_preloaded((Evas_Object*)target); 1470 evas_object_inform_call_image_preloaded((Evas_Object*)target);
1486 evas_cache_image_drop(im); 1471 evas_cache_image_drop(im);
1487 return; 1472 return;