diff options
| author | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2016-11-07 14:40:58 -0800 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-11-07 14:41:06 -0800 |
| commit | b56e508224e4de1b19d34d9aa7e36b19b7e634ad (patch) | |
| tree | 66d2e45a6036e0e42d6d3662857e8cc3377375d2 | |
| parent | 6d7c6445f80b8fbcec47de57769703d87d9541d2 (diff) | |
| download | efl-b56e508224e4de1b19d34d9aa7e36b19b7e634ad.tar.gz | |
evas: move the error listing in dbg info to the canvas image
Summary:
the canvas image is the only one presenting the load api, in all other
implementations you would only see error messages.
Reviewers: jpeg
Subscribers: cedric, raster
Differential Revision: https://phab.enlightenment.org/D4380
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
| -rw-r--r-- | src/lib/evas/canvas/efl_canvas_image.c | 18 | ||||
| -rw-r--r-- | src/lib/evas/canvas/efl_canvas_image.eo | 1 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_image.c | 8 |
3 files changed, 19 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c index 6e0f7e07d1..c59f331933 100644 --- a/src/lib/evas/canvas/efl_canvas_image.c +++ b/src/lib/evas/canvas/efl_canvas_image.c @@ -2,6 +2,7 @@ #include "efl_canvas_image.eo.h" #define MY_CLASS EFL_CANVAS_IMAGE_CLASS +#define MY_CLASS_NAME efl_class_name_get(MY_CLASS) Eina_Bool _evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key) @@ -812,4 +813,21 @@ _efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED, return EINA_TRUE; } +EOLIAN static void +_efl_canvas_image_efl_object_dbg_info_get(Eo *obj, void *pd EINA_UNUSED, Efl_Dbg_Info *root) +{ + efl_dbg_info_get(efl_super(obj, MY_CLASS), root); + + if (efl_image_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) + { + Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); + Evas_Load_Error error = EVAS_LOAD_ERROR_GENERIC; + + error = (Evas_Load_Error) _evas_image_load_error_get(obj); + EFL_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING, + evas_load_error_str(error)); + } +} + + #include "efl_canvas_image.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_image.eo b/src/lib/evas/canvas/efl_canvas_image.eo index 2a7b807043..83d24e8eaa 100644 --- a/src/lib/evas/canvas/efl_canvas_image.eo +++ b/src/lib/evas/canvas/efl_canvas_image.eo @@ -41,5 +41,6 @@ class Efl.Canvas.Image (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer, Efl.Image.Load.load_region.get; Efl.Image.Load.load_region.set; Efl.Image.Load.load_region_support.get; + Efl.Object.dbg_info_get; } } diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index bf488f8ffb..77a5a05d9a 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -479,14 +479,6 @@ _efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data * EFL_DBG_INFO_APPEND(group, "Key", EINA_VALUE_TYPE_STRING, key); EFL_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64, (uint64_t) (uintptr_t) evas_object_image_source_get(eo_obj)); - - if (efl_image_load_error_get(eo_obj) != EFL_IMAGE_LOAD_ERROR_NONE) - { - Evas_Load_Error error = EVAS_LOAD_ERROR_GENERIC; - error = (Evas_Load_Error) _evas_image_load_error_get(eo_obj); - EFL_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING, - evas_load_error_str(error)); - } } EOLIAN static void |