diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-12-20 11:07:14 -0500 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2015-12-21 08:53:51 +0900 |
| commit | 655f48e3150fddf64048b7e5eade2fb246c867f1 (patch) | |
| tree | 260253354eebb400b8a1313c833626cd9ee0761c | |
| parent | a470e464afca3f2d9568d6c5318b86158f83ae47 (diff) | |
| download | elementary-655f48e3150fddf64048b7e5eade2fb246c867f1.tar.gz | |
image: do not block null image loading in the elm layer
this is handled correctly in evas. checking load errors from
the engine/loaders is sufficient, but the printed ERR messages
for these cases have been improved
partially reverts 865383aa0da5d1eb6d29f4ed5447a73f63800a33
reverts ee7d5425628942a45e23a2cb6be253db8ec0b3fd
ref 840dcc618ead292414b0de64a7a3ae38d778311f
ref a915229dc87606472480a8b2eacce9514055ac27
fix Titalia
| -rw-r--r-- | src/lib/elm_image.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c index f76eb9ac8..b7d5482e9 100644 --- a/src/lib/elm_image.c +++ b/src/lib/elm_image.c @@ -893,8 +893,6 @@ _elm_image_file_set_do(Evas_Object *obj) EOLIAN static Eina_Bool _elm_image_memfile_set(Eo *obj, Elm_Image_Data *sd, const void *img, size_t size, const char *format, const char *key) { - EINA_SAFETY_ON_NULL_RETURN_VAL(img, EINA_FALSE); - _elm_image_file_set_do(obj); evas_object_image_memfile_set @@ -905,8 +903,11 @@ _elm_image_memfile_set(Eo *obj, Elm_Image_Data *sd, const void *img, size_t size if (evas_object_image_load_error_get(sd->img) != EVAS_LOAD_ERROR_NONE) { - ERR("Things are going bad for some random " FMT_SIZE_T - " byte chunk of memory (%p)", size, sd->img); + if (img) + ERR("Things are going bad for some random " FMT_SIZE_T + " byte chunk of memory (%p)", size, sd->img); + else + ERR("NULL image data passed (%p)", sd->img); return EINA_FALSE; } @@ -957,7 +958,6 @@ elm_image_file_set(Evas_Object *obj, Eina_Bool ret = EINA_FALSE; ELM_IMAGE_CHECK(obj) EINA_FALSE; - EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); eo_do(obj, ret = efl_file_set(file, group); elm_obj_image_sizing_eval()); @@ -978,7 +978,6 @@ elm_image_mmap_set(Evas_Object *obj, Eina_Bool ret = EINA_FALSE; ELM_IMAGE_CHECK(obj) EINA_FALSE; - EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); eo_do(obj, ret = efl_file_mmap_set(file, group)); return ret; } @@ -989,7 +988,6 @@ _elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *pd EINA_UNUSED, { Eina_Bool ret = EINA_FALSE; - EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); eo_do(obj, ret = elm_obj_image_mmap_set(file, key), elm_obj_image_sizing_eval()); @@ -1017,7 +1015,10 @@ _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd, if (evas_object_image_load_error_get(sd->img) != EVAS_LOAD_ERROR_NONE) { - ERR("Things are going bad for '%s' (%p)", file, sd->img); + if (file) + ERR("Things are going bad for '%s' (%p)", file, sd->img); + else + ERR("NULL image file passed (%p)", sd->img); if (ret) *ret = EINA_FALSE; return; } |