summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-12-14 13:42:41 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-12-14 14:16:13 +0900
commit3726af831350ac042831c628b7ae1ef1ac88cd69 (patch)
tree91540ffb13fa1e7215b6d7d4cfe175b66f8e88be
parent0722992790ccce3d9e79fd6f0fa41917f02803ea (diff)
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
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_blacklist.hh1
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c4
-rw-r--r--src/lib/efl/interfaces/efl_image_load.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.eo2
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)
8 return 8 return
9 c_name == "efl_event_callback_array_priority_add" 9 c_name == "efl_event_callback_array_priority_add"
10 || c_name == "efl_player_position_get" 10 || c_name == "efl_player_position_get"
11 || c_name == "efl_image_load_error_get"
12 || c_name == "efl_text_font_source_get" 11 || c_name == "efl_text_font_source_get"
13 || c_name == "efl_text_font_source_set" 12 || c_name == "efl_text_font_source_set"
14 || c_name == "efl_ui_focus_manager_focus_get" 13 || 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)
194 * will be deleted automatically by parent.*/ 194 * will be deleted automatically by parent.*/
195 195
196 efl_file_set(d.img, img_path, NULL); 196 efl_file_set(d.img, img_path, NULL);
197 err = efl_image_load_error_get(d.img); 197 err = efl_file_load_error_get(d.img);
198 198
199 if (err != EVAS_LOAD_ERROR_NONE) 199 if (err != EVAS_LOAD_ERROR_NONE)
200 { 200 {
@@ -212,7 +212,7 @@ main(void)
212 /* border on the image's clipper, here just to emphasize its position */ 212 /* border on the image's clipper, here just to emphasize its position */
213 d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas); 213 d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
214 efl_file_set(d.clipper_border, border_img_path, NULL); 214 efl_file_set(d.clipper_border, border_img_path, NULL);
215 err = efl_image_load_error_get(d.clipper_border); 215 err = efl_file_load_error_get(d.clipper_border);
216 216
217 if (err != EVAS_LOAD_ERROR_NONE) 217 if (err != EVAS_LOAD_ERROR_NONE)
218 { 218 {
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 ()
163 div: int; [[The scale down dividing factor.]] 163 div: int; [[The scale down dividing factor.]]
164 } 164 }
165 } 165 }
166 @property load_error {
167 get {
168 [[Retrieves a number representing any error that occurred during
169 the last loading of the given image object's source image.
170 ]]
171 return: Efl.Image.Load.Error @warn_unused; [[
172 A value giving the last error that occurred, one of
173 @Efl.Image.Load.Error values. @Efl.Image.Load.Error.none is
174 returned if there was no error.
175 ]]
176 }
177 }
178 @property load_skip_header { 166 @property load_skip_header {
179 [[Initial load should skip header check and leave it all to data load 167 [[Initial load should skip header check and leave it all to data load
180 168
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)
65} 65}
66 66
67EOLIAN static Efl_Image_Load_Error 67EOLIAN static Efl_Image_Load_Error
68_efl_canvas_image_efl_image_load_load_error_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 68_efl_canvas_image_efl_file_load_error_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
69{ 69{
70 return _evas_image_load_error_get(eo_obj); 70 return _evas_image_load_error_get(eo_obj);
71} 71}
@@ -784,7 +784,7 @@ _efl_canvas_image_efl_object_dbg_info_get(Eo *obj, void *pd EINA_UNUSED, Efl_Dbg
784{ 784{
785 efl_dbg_info_get(efl_super(obj, MY_CLASS), root); 785 efl_dbg_info_get(efl_super(obj, MY_CLASS), root);
786 786
787 if ((efl_image_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) && 787 if ((efl_file_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) &&
788 (root)) 788 (root))
789 { 789 {
790 Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 790 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,
17 Efl.Gfx.Buffer.buffer_map; 17 Efl.Gfx.Buffer.buffer_map;
18 Efl.Gfx.Buffer.buffer_unmap; 18 Efl.Gfx.Buffer.buffer_unmap;
19 Efl.File.mmap { get; set; } 19 Efl.File.mmap { get; set; }
20 Efl.File.load_error { get; }
20 Efl.Image.Animated.animated { get; } 21 Efl.Image.Animated.animated { get; }
21 Efl.Image.Animated.animated_frame { get; set; } 22 Efl.Image.Animated.animated_frame { get; set; }
22 Efl.Image.Animated.animated_frame_count { get; } 23 Efl.Image.Animated.animated_frame_count { get; }
23 Efl.Image.Animated.animated_loop_type { get; } 24 Efl.Image.Animated.animated_loop_type { get; }
24 Efl.Image.Animated.animated_loop_count { get; } 25 Efl.Image.Animated.animated_loop_count { get; }
25 Efl.Image.Animated.animated_frame_duration { get; } 26 Efl.Image.Animated.animated_frame_duration { get; }
26 Efl.Image.Load.load_error { get; }
27 Efl.Image.Load.load_async_start; 27 Efl.Image.Load.load_async_start;
28 Efl.Image.Load.load_async_cancel; 28 Efl.Image.Load.load_async_cancel;
29 Efl.Image.Load.load_dpi { get; set; } 29 Efl.Image.Load.load_dpi { get; set; }