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

efl.image.load: fix eolian redefine warnings for load_error{} 

load_error{} was defined in efl.file as well.
remove load_error{} from efl.image.load intf and implement
Efl.File.load_error{} instead.

Ref T6514
This commit is contained in:
Amitesh Singh 2017-12-14 13:42:41 +09:00
parent 0722992790
commit 3726af8313
5 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/eolian_mono/eolian/mono/function_blacklist.hh
View File

@ -8,7 +8,6 @@ inline bool is_function_blacklisted(std::string const& c_name)
return
c_name == "efl_event_callback_array_priority_add"
|| c_name == "efl_player_position_get"
|| c_name == "efl_image_load_error_get"
|| c_name == "efl_text_font_source_get"
|| c_name == "efl_text_font_source_set"
|| c_name == "efl_ui_focus_manager_focus_get"

4
src/examples/evas/evas-object-manipulation-eo.c
View File

@ -194,7 +194,7 @@ main(void)
* will be deleted automatically by parent.*/
efl_file_set(d.img, img_path, NULL);
err = efl_image_load_error_get(d.img);
err = efl_file_load_error_get(d.img);
if (err != EVAS_LOAD_ERROR_NONE)
{
@ -212,7 +212,7 @@ main(void)
/* border on the image's clipper, here just to emphasize its position */
d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
efl_file_set(d.clipper_border, border_img_path, NULL);
err = efl_image_load_error_get(d.clipper_border);
err = efl_file_load_error_get(d.clipper_border);
if (err != EVAS_LOAD_ERROR_NONE)
{

12
src/lib/efl/interfaces/efl_image_load.eo
View File

@ -163,18 +163,6 @@ interface Efl.Image.Load ()
div: int; [[The scale down dividing factor.]]
}
}
@property load_error {
get {
[[Retrieves a number representing any error that occurred during
the last loading of the given image object's source image.
]]
return: Efl.Image.Load.Error @warn_unused; [[
A value giving the last error that occurred, one of
@Efl.Image.Load.Error values. @Efl.Image.Load.Error.none is
returned if there was no error.
]]
}
}
@property load_skip_header {
[[Initial load should skip header check and leave it all to data load

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

@ -65,7 +65,7 @@ _evas_image_load_error_get(const Eo *eo_obj)
}
EOLIAN static Efl_Image_Load_Error
_efl_canvas_image_efl_image_load_load_error_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_file_load_error_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_error_get(eo_obj);
}
@ -784,7 +784,7 @@ _efl_canvas_image_efl_object_dbg_info_get(Eo *obj, void *pd EINA_UNUSED, Efl_Dbg
{
efl_dbg_info_get(efl_super(obj, MY_CLASS), root);
if ((efl_image_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) &&
if ((efl_file_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) &&
(root))
{
Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);

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

@ -17,13 +17,13 @@ class Efl.Canvas.Image (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer,
Efl.Gfx.Buffer.buffer_map;
Efl.Gfx.Buffer.buffer_unmap;
Efl.File.mmap { get; set; }
Efl.File.load_error { get; }
Efl.Image.Animated.animated { get; }
Efl.Image.Animated.animated_frame { get; set; }
Efl.Image.Animated.animated_frame_count { get; }
Efl.Image.Animated.animated_loop_type { get; }
Efl.Image.Animated.animated_loop_count { get; }
Efl.Image.Animated.animated_frame_duration { get; }
Efl.Image.Load.load_error { get; }
Efl.Image.Load.load_async_start;
Efl.Image.Load.load_async_cancel;
Efl.Image.Load.load_dpi { get; set; }