dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Marcel Hollerbach 2016-11-07 14:40:58 -08:00 committed by Cedric BAIL
parent 6d7c6445f8
commit b56e508224
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/evas/canvas/efl_canvas_image.c
View File

@ -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"

1
src/lib/evas/canvas/efl_canvas_image.eo
View File

@ -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;
}
}

8
src/lib/evas/canvas/evas_object_image.c
View File

@ -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