ami pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3726af831350ac042831c628b7ae1ef1ac88cd69
commit 3726af831350ac042831c628b7ae1ef1ac88cd69
Author: Amitesh Singh <amitesh...@samsung.com>
Date: Thu Dec 14 13:42:41 2017 +0900
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
---
src/bin/eolian_mono/eolian/mono/function_blacklist.hh | 1 -
src/examples/evas/evas-object-manipulation-eo.c | 4 ++--
src/lib/efl/interfaces/efl_image_load.eo | 12 ------------
src/lib/evas/canvas/efl_canvas_image.c | 4 ++--
src/lib/evas/canvas/efl_canvas_image.eo | 2 +-
5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
b/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
index 51e0a433c1..314235b5dc 100644
--- a/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
@@ -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"
diff --git a/src/examples/evas/evas-object-manipulation-eo.c
b/src/examples/evas/evas-object-manipulation-eo.c
index dfe02bb0c2..ef61a50aec 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -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)
{
diff --git a/src/lib/efl/interfaces/efl_image_load.eo
b/src/lib/efl/interfaces/efl_image_load.eo
index 65e4853111..703dbebe1b 100644
--- a/src/lib/efl/interfaces/efl_image_load.eo
+++ b/src/lib/efl/interfaces/efl_image_load.eo
@@ -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
diff --git a/src/lib/evas/canvas/efl_canvas_image.c
b/src/lib/evas/canvas/efl_canvas_image.c
index 075b5e6c1c..4a1de7cc97 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -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);
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo
b/src/lib/evas/canvas/efl_canvas_image.eo
index 63307ef520..0164b2d038 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -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; }
--
