summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-19 13:26:59 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:40 -0700
commit5697f6e94b69ab1b5dd0e7b2f62b550fa226d56d (patch)
tree1eaf97d0f46d36b47feafbe98901e591c3cb9ccb /src/lib
parent6073833b903f321dca982c6d79934f9d4df6ebe4 (diff)
Efl.Gfx.Image* (From Efl.Image*)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c4
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_load.c28
-rw-r--r--src/lib/efl/Efl.h10
-rw-r--r--src/lib/efl/interfaces/efl_file.c8
-rw-r--r--src/lib/efl/interfaces/efl_file.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image.eo (renamed from src/lib/efl/interfaces/efl_image.eo)20
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo (renamed from src/lib/efl/interfaces/efl_image_animation_controller.eo)16
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image_load_controller.eo (renamed from src/lib/efl/interfaces/efl_image_load_controller.eo)10
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c6
-rw-r--r--src/lib/elementary/efl_ui_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.c50
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.eo6
-rw-r--r--src/lib/elementary/efl_ui_image.c52
-rw-r--r--src/lib/elementary/efl_ui_image.eo10
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_images.c2
-rw-r--r--src/lib/elementary/efl_ui_widget.c10
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h2
-rw-r--r--src/lib/elementary/efl_ui_widget_part_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/emotion/efl_canvas_video.eo8
-rw-r--r--src/lib/emotion/emotion_smart.c16
-rw-r--r--src/lib/evas/Evas_Common.h8
-rw-r--r--src/lib/evas/Evas_Loader.h20
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c62
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.eo32
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo18
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c6
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c24
-rw-r--r--src/lib/evas/canvas/evas_image_private.h8
-rw-r--r--src/lib/evas/canvas/evas_object_image.c32
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c6
35 files changed, 246 insertions, 246 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index a64a048d60..40bdbd54f3 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3090,7 +3090,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3090 } 3090 }
3091 3091
3092 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill); 3092 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill);
3093 efl_image_smooth_scale_set(ep->object, p3->smooth); 3093 efl_gfx_image_smooth_scale_set(ep->object, p3->smooth);
3094 evas_object_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible); 3094 evas_object_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible);
3095 evas_object_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip); 3095 evas_object_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip);
3096} 3096}
@@ -3130,7 +3130,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3130 } 3130 }
3131 3131
3132 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill); 3132 efl_gfx_fill_set(ep->object, (Eina_Rect) p3->type.common->fill);
3133 efl_image_smooth_scale_set(ep->object, p3->smooth); 3133 efl_gfx_image_smooth_scale_set(ep->object, p3->smooth);
3134 if (chosen_desc->image.border.scale) 3134 if (chosen_desc->image.border.scale)
3135 { 3135 {
3136 if (p3->type.common->spec.image.border_scale_by > FROM_DOUBLE(0.0)) 3136 if (p3->type.common->spec.image.border_scale_by > FROM_DOUBLE(0.0))
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index c31f3cb028..3549eee059 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -5,10 +5,10 @@
5EAPI Edje_Load_Error 5EAPI Edje_Load_Error
6edje_object_load_error_get(const Eo *obj) 6edje_object_load_error_get(const Eo *obj)
7{ 7{
8 Efl_Image_Load_Error p = efl_file_load_error_get(obj); 8 Efl_Gfx_Image_Load_Error p = efl_file_load_error_get(obj);
9 Edje *ed; 9 Edje *ed;
10 10
11 if (p != EFL_IMAGE_LOAD_ERROR_NONE) return EDJE_LOAD_ERROR_DOES_NOT_EXIST; 11 if (p != EFL_GFX_IMAGE_LOAD_ERROR_NONE) return EDJE_LOAD_ERROR_DOES_NOT_EXIST;
12 12
13 ed = _edje_fetch(obj); 13 ed = _edje_fetch(obj);
14 if (!ed) return EDJE_LOAD_ERROR_GENERIC; 14 if (!ed) return EDJE_LOAD_ERROR_GENERIC;
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 230c556af2..c0d0ac25a3 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -166,25 +166,25 @@ _efl_canvas_layout_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char *
166 if (group) *group = ed->group; 166 if (group) *group = ed->group;
167} 167}
168 168
169EOLIAN Efl_Image_Load_Error 169EOLIAN Efl_Gfx_Image_Load_Error
170_efl_canvas_layout_efl_file_load_error_get(const Eo *obj, Edje *ed) 170_efl_canvas_layout_efl_file_load_error_get(const Eo *obj, Edje *ed)
171{ 171{
172 Efl_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EFL_CANVAS_LAYOUT_CLASS)); 172 Efl_Gfx_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EFL_CANVAS_LAYOUT_CLASS));
173 173
174 if (p != EFL_IMAGE_LOAD_ERROR_NONE) return p; 174 if (p != EFL_GFX_IMAGE_LOAD_ERROR_NONE) return p;
175 switch (ed->load_error) 175 switch (ed->load_error)
176 { 176 {
177 case EDJE_LOAD_ERROR_NONE: return EFL_IMAGE_LOAD_ERROR_NONE; 177 case EDJE_LOAD_ERROR_NONE: return EFL_GFX_IMAGE_LOAD_ERROR_NONE;
178 case EDJE_LOAD_ERROR_GENERIC: return EFL_IMAGE_LOAD_ERROR_GENERIC; 178 case EDJE_LOAD_ERROR_GENERIC: return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
179 case EDJE_LOAD_ERROR_DOES_NOT_EXIST: return EFL_IMAGE_LOAD_ERROR_DOES_NOT_EXIST; 179 case EDJE_LOAD_ERROR_DOES_NOT_EXIST: return EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
180 case EDJE_LOAD_ERROR_PERMISSION_DENIED: return EFL_IMAGE_LOAD_ERROR_PERMISSION_DENIED; 180 case EDJE_LOAD_ERROR_PERMISSION_DENIED: return EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED;
181 case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: return EFL_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; 181 case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: return EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
182 case EDJE_LOAD_ERROR_CORRUPT_FILE: return EFL_IMAGE_LOAD_ERROR_CORRUPT_FILE; 182 case EDJE_LOAD_ERROR_CORRUPT_FILE: return EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE;
183 case EDJE_LOAD_ERROR_UNKNOWN_FORMAT: return EFL_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT; 183 case EDJE_LOAD_ERROR_UNKNOWN_FORMAT: return EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
184 case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE: return EFL_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE; 184 case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE: return EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE;
185 case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION: return EFL_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION; 185 case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION: return EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION;
186 case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE: return EFL_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE; 186 case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE: return EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE;
187 default: return EFL_IMAGE_LOAD_ERROR_GENERIC; 187 default: return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
188 } 188 }
189} 189}
190 190
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 9b2713bce1..22175bf086 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -72,9 +72,9 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
72#include "interfaces/efl_control.eo.h" 72#include "interfaces/efl_control.eo.h"
73#include "interfaces/efl_duplicate.eo.h" 73#include "interfaces/efl_duplicate.eo.h"
74#include "interfaces/efl_file.eo.h" 74#include "interfaces/efl_file.eo.h"
75#include "interfaces/efl_image.eo.h" 75#include "interfaces/efl_gfx_image.eo.h"
76#include "interfaces/efl_image_animation_controller.eo.h" 76#include "interfaces/efl_gfx_image_animation_controller.eo.h"
77#include "interfaces/efl_image_load_controller.eo.h" 77#include "interfaces/efl_gfx_image_load_controller.eo.h"
78#include "interfaces/efl_part.eo.h" 78#include "interfaces/efl_part.eo.h"
79#include "interfaces/efl_playable.eo.h" 79#include "interfaces/efl_playable.eo.h"
80#include "interfaces/efl_player.eo.h" 80#include "interfaces/efl_player.eo.h"
@@ -174,8 +174,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
174#include "interfaces/efl_input_types.eot.h" 174#include "interfaces/efl_input_types.eot.h"
175#include "interfaces/efl_gfx_fill.eo.legacy.h" 175#include "interfaces/efl_gfx_fill.eo.legacy.h"
176#include "interfaces/efl_gfx_entity.eo.legacy.h" 176#include "interfaces/efl_gfx_entity.eo.legacy.h"
177#include "interfaces/efl_image.eo.legacy.h" 177#include "interfaces/efl_gfx_image.eo.legacy.h"
178#include "interfaces/efl_image_animation_controller.eo.legacy.h" 178#include "interfaces/efl_gfx_image_animation_controller.eo.legacy.h"
179#include "interfaces/efl_input_device.eo.legacy.h" 179#include "interfaces/efl_input_device.eo.legacy.h"
180#include "interfaces/efl_text_types.eot.h" 180#include "interfaces/efl_text_types.eot.h"
181#endif 181#endif
diff --git a/src/lib/efl/interfaces/efl_file.c b/src/lib/efl/interfaces/efl_file.c
index b38bad6c87..8edbbfb463 100644
--- a/src/lib/efl/interfaces/efl_file.c
+++ b/src/lib/efl/interfaces/efl_file.c
@@ -7,7 +7,7 @@
7typedef struct _Efl_File_Data Efl_File_Data; 7typedef struct _Efl_File_Data Efl_File_Data;
8struct _Efl_File_Data 8struct _Efl_File_Data
9{ 9{
10 Efl_Image_Load_Error error; 10 Efl_Gfx_Image_Load_Error error;
11}; 11};
12 12
13static Eina_Bool 13static Eina_Bool
@@ -17,7 +17,7 @@ _efl_file_file_set(Eo *obj, Efl_File_Data *pd, const char *file, const char *key
17 Eina_File *f = NULL; 17 Eina_File *f = NULL;
18 Eina_Bool r = EINA_FALSE; 18 Eina_Bool r = EINA_FALSE;
19 19
20 pd->error = EFL_IMAGE_LOAD_ERROR_DOES_NOT_EXIST; 20 pd->error = EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
21 21
22 tmp = (char*)(file); 22 tmp = (char*)(file);
23 if (tmp) 23 if (tmp)
@@ -31,7 +31,7 @@ _efl_file_file_set(Eo *obj, Efl_File_Data *pd, const char *file, const char *key
31 if (!f) goto on_error; 31 if (!f) goto on_error;
32 } 32 }
33 33
34 pd->error = EFL_IMAGE_LOAD_ERROR_NONE; 34 pd->error = EFL_GFX_IMAGE_LOAD_ERROR_NONE;
35 35
36 r = efl_file_mmap_set(obj, f, key); 36 r = efl_file_mmap_set(obj, f, key);
37 if (f) eina_file_close(f); 37 if (f) eina_file_close(f);
@@ -53,7 +53,7 @@ _efl_file_file_get(const Eo *obj, Efl_File_Data *pd EINA_UNUSED, const char **fi
53 else if (file) *file = NULL; 53 else if (file) *file = NULL;
54} 54}
55 55
56static Efl_Image_Load_Error 56static Efl_Gfx_Image_Load_Error
57_efl_file_load_error_get(const Eo *obj EINA_UNUSED, Efl_File_Data *pd) 57_efl_file_load_error_get(const Eo *obj EINA_UNUSED, Efl_File_Data *pd)
58{ 58{
59 return pd->error; 59 return pd->error;
diff --git a/src/lib/efl/interfaces/efl_file.eo b/src/lib/efl/interfaces/efl_file.eo
index e351a5eaa3..9260c16bf1 100644
--- a/src/lib/efl/interfaces/efl_file.eo
+++ b/src/lib/efl/interfaces/efl_file.eo
@@ -9,7 +9,7 @@ mixin Efl.File {
9 [[Gets the (last) file loading error for a given object.]] 9 [[Gets the (last) file loading error for a given object.]]
10 } 10 }
11 values { 11 values {
12 error: Efl.Image.Load.Error(Efl.Image.Load.Error.none); [[The load error code.]] 12 error: Efl.Gfx.Image_Load_Error(Efl.Gfx.Image_Load_Error.none); [[The load error code.]]
13 } 13 }
14 } 14 }
15 @property mmap { 15 @property mmap {
diff --git a/src/lib/efl/interfaces/efl_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index 4cc912ce76..f71c23fe0b 100644
--- a/src/lib/efl/interfaces/efl_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -1,7 +1,7 @@
1import efl_gfx_types; 1import efl_gfx_types;
2import efl_gfx_fill; 2import efl_gfx_fill;
3 3
4enum Efl.Image_Content_Hint 4enum Efl.Gfx.Image_Content_Hint
5{ 5{
6 [[How an image's data is to be treated by EFL, for optimization.]] 6 [[How an image's data is to be treated by EFL, for optimization.]]
7 none = 0, [[No hint on the content (default).]] 7 none = 0, [[No hint on the content (default).]]
@@ -9,7 +9,7 @@ enum Efl.Image_Content_Hint
9 static = 2 [[The content won't change over time.]] 9 static = 2 [[The content won't change over time.]]
10} 10}
11 11
12enum Efl.Image_Scale_Hint 12enum Efl.Gfx.Image_Scale_Hint
13{ 13{
14 /* FIXME: Legacy is in Emile, where it does not belong. */ 14 /* FIXME: Legacy is in Emile, where it does not belong. */
15 [[How an image's data is to be treated by EFL, with regard to scaling cache.]] 15 [[How an image's data is to be treated by EFL, with regard to scaling cache.]]
@@ -18,7 +18,7 @@ enum Efl.Image_Scale_Hint
18 static = 2 [[Image will not be re-scaled over time, thus turning scaling cache ON for its data.]] 18 static = 2 [[Image will not be re-scaled over time, thus turning scaling cache ON for its data.]]
19} 19}
20 20
21enum Efl.Image_Scale_Type 21enum Efl.Gfx.Image_Scale_Type
22{ 22{
23 [[Enumeration that defines scale types of an image.]] 23 [[Enumeration that defines scale types of an image.]]
24 fill, [[Scale the image so that it matches 24 fill, [[Scale the image so that it matches
@@ -40,7 +40,7 @@ enum Efl.Image_Scale_Type
40 none [[Not scale the image]] 40 none [[Not scale the image]]
41} 41}
42 42
43interface Efl.Image () 43interface Efl.Gfx.Image ()
44{ 44{
45 [[Common APIs for all 2D images that can be rendered on the canvas.]] 45 [[Common APIs for all 2D images that can be rendered on the canvas.]]
46 46
@@ -64,7 +64,7 @@ interface Efl.Image ()
64 @property scale_type { 64 @property scale_type {
65 [[Control how the image is scaled.]] 65 [[Control how the image is scaled.]]
66 values { 66 values {
67 scale_type: Efl.Image_Scale_Type; [[Image scale type]] 67 scale_type: Efl.Gfx.Image_Scale_Type; [[Image scale type]]
68 } 68 }
69 } 69 }
70 @property ratio { 70 @property ratio {
@@ -157,7 +157,7 @@ interface Efl.Image ()
157 } 157 }
158 } 158 }
159 159
160 /* Note: those are obscure features of evas image. Expose in Efl.Image? */ 160 /* Note: those are obscure features of evas image. Expose in Efl.Gfx.Image? */
161 @property content_hint { 161 @property content_hint {
162 set { 162 set {
163 [[Set the content hint setting of a given image object of the 163 [[Set the content hint setting of a given image object of the
@@ -178,8 +178,8 @@ interface Efl.Image ()
178 ]] 178 ]]
179 } 179 }
180 values { 180 values {
181 hint: Efl.Image_Content_Hint; [[Dynamic or static content hint, 181 hint: Efl.Gfx.Image_Content_Hint; [[Dynamic or static content hint,
182 see @Efl.Image_Content_Hint]] 182 see @Efl.Gfx.Image_Content_Hint]]
183 } 183 }
184 } 184 }
185 @property scale_hint { 185 @property scale_hint {
@@ -199,8 +199,8 @@ interface Efl.Image ()
199 ]] 199 ]]
200 } 200 }
201 values { 201 values {
202 hint: Efl.Image_Scale_Hint; [[Scalable or static size hint, 202 hint: Efl.Gfx.Image_Scale_Hint; [[Scalable or static size hint,
203 see @Efl.Image_Scale_Hint]] 203 see @Efl.Gfx.Image_Scale_Hint]]
204 } 204 }
205 } 205 }
206 } 206 }
diff --git a/src/lib/efl/interfaces/efl_image_animation_controller.eo b/src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo
index 2ec43b1139..54560e6d7e 100644
--- a/src/lib/efl/interfaces/efl_image_animation_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo
@@ -1,19 +1,19 @@
1/* FIXME: invalid type from evas/emile! */ 1/* FIXME: invalid type from evas/emile! */
2/* type @extern Evas.Animated_Loop_Hint: int; */ 2/* type @extern Evas.Animated_Loop_Hint: int; */
3 3
4enum Efl.Image_Animation_Controller_Loop_Hint { 4enum Efl.Gfx.Image_Animation_Controller_Loop_Hint {
5 [[Image animation loop modes]] 5 [[Image animation loop modes]]
6 none = 0, [[No looping order specified.]] 6 none = 0, [[No looping order specified.]]
7 loop = 1, [[Standard loop: 1->2->3->1->2->3->1]] 7 loop = 1, [[Standard loop: 1->2->3->1->2->3->1]]
8 pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]] 8 pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]]
9} 9}
10 10
11/* FIXME: rename to Efl.Image_Animation_Controller when eo/eolian are fixed */ 11/* FIXME: rename to Efl.Gfx.Image_Animation_Controller when eo/eolian are fixed */
12 12
13interface Efl.Image_Animation_Controller () 13interface Efl.Gfx.Image_Animation_Controller ()
14{ 14{
15 [[Efl animated image interface]] 15 [[Efl animated image interface]]
16 eo_prefix: efl_image; 16 eo_prefix: efl_gfx_image;
17 17
18 methods { 18 methods {
19 @property animated { 19 @property animated {
@@ -65,18 +65,18 @@ interface Efl.Image_Animation_Controller ()
65 65
66 This returns the kind of looping the image object wants to do. 66 This returns the kind of looping the image object wants to do.
67 67
68 If it returns @Efl.Image_Animation_Controller_Loop_Hint.loop, you should 68 If it returns @Efl.Gfx.Image_Animation_Controller_Loop_Hint.loop, you should
69 display frames in a sequence like: 1->2->3->1->2->3->1... 69 display frames in a sequence like: 1->2->3->1->2->3->1...
70 70
71 If it returns @Efl.Image_Animation_Controller_Loop_Hint.pingpong, it is 71 If it returns @Efl.Gfx.Image_Animation_Controller_Loop_Hint.pingpong, it is
72 better to display frames in a sequence like: 72 better to display frames in a sequence like:
73 1->2->3->2->1->2->3->1... 73 1->2->3->2->1->2->3->1...
74 74
75 The default type is @Efl.Image_Animation_Controller_Loop_Hint.loop. 75 The default type is @Efl.Gfx.Image_Animation_Controller_Loop_Hint.loop.
76 76
77 @since 1.1 77 @since 1.1
78 ]] 78 ]]
79 return: Efl.Image_Animation_Controller_Loop_Hint; [[Loop type of the image object.]] 79 return: Efl.Gfx.Image_Animation_Controller_Loop_Hint; [[Loop type of the image object.]]
80 } 80 }
81 } 81 }
82 @property animated_loop_count { 82 @property animated_loop_count {
diff --git a/src/lib/efl/interfaces/efl_image_load_controller.eo b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
index ac0163d3e4..e05ddfc49c 100644
--- a/src/lib/efl/interfaces/efl_image_load_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
@@ -2,18 +2,18 @@ import eina_types;
2import efl_gfx_types; 2import efl_gfx_types;
3 3
4/* 4/*
5enum Efl.Image_Load_Controller_State 5enum Efl.Gfx.Image_Load_Controller_State
6{ 6{
7 none = 0, [[Not loading any image.]] 7 none = 0, [[Not loading any image.]]
8 loaded = 1, [[Image data is loaded, nothing is pending.]] 8 loaded = 1, [[Image data is loaded, nothing is pending.]]
9 pending = 2, [[The image has been queued for load, but actual loading may not have started yet.]] 9 pending = 2, [[The image has been queued for load, but actual loading may not have started yet.]]
10 loading = 3, [[The image is currently loading.]] 10 loading = 3, [[The image is currently loading.]]
11 error = 4, [[Image load has failed. Call @Efl.Image_Load_Controller.load_error.get to know why.]] 11 error = 4, [[Image load has failed. Call @Efl.Gfx.Image_Load_Controller.load_error.get to know why.]]
12 cancelled = 5 [[Image load has been cancelled.]] 12 cancelled = 5 [[Image load has been cancelled.]]
13} 13}
14*/ 14*/
15 15
16interface Efl.Image_Load_Controller () 16interface Efl.Gfx.Image_Load_Controller ()
17{ 17{
18 [[Common APIs for all loadable 2D images.]] 18 [[Common APIs for all loadable 2D images.]]
19 19
@@ -44,7 +44,7 @@ interface Efl.Image_Load_Controller ()
44 ]] 44 ]]
45 } 45 }
46 values { 46 values {
47 state: Efl.Image_Load_Controller_State; [[Image loading status]] 47 state: Efl.Gfx.Image_Load_Controller_State; [[Image loading status]]
48 } 48 }
49 } 49 }
50 */ 50 */
@@ -182,7 +182,7 @@ interface Efl.Image_Load_Controller ()
182 } 182 }
183 events { 183 events {
184 load,done; [[Called when he image was loaded]] 184 load,done; [[Called when he image was loaded]]
185 load,error: Efl.Image.Load.Error; [[Called when an error happened during image loading]] 185 load,error: Efl.Gfx.Image_Load_Error; [[Called when an error happened during image loading]]
186 load,cancelled; [[Called when the image loading was cancelled]] 186 load,cancelled; [[Called when the image loading was cancelled]]
187 } 187 }
188} 188}
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index efadc8ff61..72d26885ba 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -188,7 +188,7 @@ enum Efl.Gfx.Size_Hint_Aspect
188 aspect.]] 188 aspect.]]
189} 189}
190 190
191enum Efl.Image.Load.Error 191enum Efl.Gfx.Image_Load_Error
192{ 192{
193 [[Image or Edje load error type]] 193 [[Image or Edje load error type]]
194 none = 0, [[No error on load]] 194 none = 0, [[No error on load]]
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index b9410591c0..d245e4afeb 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -11,9 +11,9 @@
11#include "interfaces/efl_config.eo.c" 11#include "interfaces/efl_config.eo.c"
12#include "interfaces/efl_control.eo.c" 12#include "interfaces/efl_control.eo.c"
13#include "interfaces/efl_duplicate.eo.c" 13#include "interfaces/efl_duplicate.eo.c"
14#include "interfaces/efl_image.eo.c" 14#include "interfaces/efl_gfx_image.eo.c"
15#include "interfaces/efl_image_animation_controller.eo.c" 15#include "interfaces/efl_gfx_image_animation_controller.eo.c"
16#include "interfaces/efl_image_load_controller.eo.c" 16#include "interfaces/efl_gfx_image_load_controller.eo.c"
17#include "interfaces/efl_part.eo.c" 17#include "interfaces/efl_part.eo.c"
18#include "interfaces/efl_playable.eo.c" 18#include "interfaces/efl_playable.eo.c"
19#include "interfaces/efl_player.eo.c" 19#include "interfaces/efl_player.eo.c"
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index 786402b54d..ac94ebc0ca 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -1,4 +1,4 @@
1interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx.Entity, Efl.Image, Efl.File) 1interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx.Entity, Efl.Gfx.Image, Efl.File)
2{ 2{
3 [[The bg (background) widget is used for setting (solid) background decorations 3 [[The bg (background) widget is used for setting (solid) background decorations
4 4
diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c
index 74f5165047..90fe2b8f5e 100644
--- a/src/lib/elementary/efl_ui_bg_widget.c
+++ b/src/lib/elementary/efl_ui_bg_widget.c
@@ -43,7 +43,7 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd)
43 efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added)); 43 efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added));
44 44
45 pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj, 45 pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj,
46 efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE), 46 efl_gfx_image_scale_type_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE),
47 efl_content_set(efl_part(obj, "elm.swallow.background"), efl_added)); 47 efl_content_set(efl_part(obj, "elm.swallow.background"), efl_added));
48 pd->file = NULL; 48 pd->file = NULL;
49 pd->key = NULL; 49 pd->key = NULL;
@@ -67,51 +67,51 @@ _efl_ui_bg_widget_efl_object_destructor(Eo *obj, Efl_Ui_Bg_Widget_Data *sd)
67EAPI void 67EAPI void
68elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option) 68elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option)
69{ 69{
70 Efl_Image_Scale_Type type; 70 Efl_Gfx_Image_Scale_Type type;
71 71
72 switch (option) 72 switch (option)
73 { 73 {
74 case ELM_BG_OPTION_CENTER: 74 case ELM_BG_OPTION_CENTER:
75 type = EFL_IMAGE_SCALE_TYPE_NONE; 75 type = EFL_GFX_IMAGE_SCALE_TYPE_NONE;
76 break; 76 break;
77 case ELM_BG_OPTION_SCALE: 77 case ELM_BG_OPTION_SCALE:
78 type = EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 78 type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
79 break; 79 break;
80 case ELM_BG_OPTION_TILE: 80 case ELM_BG_OPTION_TILE:
81 type = EFL_IMAGE_SCALE_TYPE_TILE; 81 type = EFL_GFX_IMAGE_SCALE_TYPE_TILE;
82 break; 82 break;
83 case ELM_BG_OPTION_STRETCH: 83 case ELM_BG_OPTION_STRETCH:
84 type = EFL_IMAGE_SCALE_TYPE_FILL; 84 type = EFL_GFX_IMAGE_SCALE_TYPE_FILL;
85 break; 85 break;
86 case ELM_BG_OPTION_LAST: 86 case ELM_BG_OPTION_LAST:
87 default: 87 default:
88 type = EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 88 type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
89 } 89 }
90 efl_image_scale_type_set(obj, type); 90 efl_gfx_image_scale_type_set(obj, type);
91} 91}
92 92
93EAPI Elm_Bg_Option 93EAPI Elm_Bg_Option
94elm_bg_option_get(const Evas_Object *obj) 94elm_bg_option_get(const Evas_Object *obj)
95{ 95{
96 Efl_Image_Scale_Type type; 96 Efl_Gfx_Image_Scale_Type type;
97 Elm_Bg_Option option = ELM_BG_OPTION_LAST; 97 Elm_Bg_Option option = ELM_BG_OPTION_LAST;
98 98
99 type = efl_image_scale_type_get(obj); 99 type = efl_gfx_image_scale_type_get(obj);
100 switch (type) 100 switch (type)
101 { 101 {
102 case EFL_IMAGE_SCALE_TYPE_NONE: 102 case EFL_GFX_IMAGE_SCALE_TYPE_NONE:
103 option = ELM_BG_OPTION_CENTER; 103 option = ELM_BG_OPTION_CENTER;
104 break; 104 break;
105 case EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE: 105 case EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE:
106 option = ELM_BG_OPTION_SCALE; 106 option = ELM_BG_OPTION_SCALE;
107 break; 107 break;
108 case EFL_IMAGE_SCALE_TYPE_TILE: 108 case EFL_GFX_IMAGE_SCALE_TYPE_TILE:
109 option = ELM_BG_OPTION_TILE; 109 option = ELM_BG_OPTION_TILE;
110 break; 110 break;
111 case EFL_IMAGE_SCALE_TYPE_FILL: 111 case EFL_GFX_IMAGE_SCALE_TYPE_FILL:
112 option = ELM_BG_OPTION_STRETCH; 112 option = ELM_BG_OPTION_STRETCH;
113 break; 113 break;
114 case EFL_IMAGE_SCALE_TYPE_FIT_INSIDE: 114 case EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE:
115 default: 115 default:
116 ERR("Scale type %d cannot be converted to Elm_Bg_Option", type); 116 ERR("Scale type %d cannot be converted to Elm_Bg_Option", type);
117 break; 117 break;
@@ -121,15 +121,15 @@ elm_bg_option_get(const Evas_Object *obj)
121} 121}
122 122
123EOLIAN static void 123EOLIAN static void
124_efl_ui_bg_widget_efl_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, Efl_Image_Scale_Type scale_type) 124_efl_ui_bg_widget_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, Efl_Gfx_Image_Scale_Type scale_type)
125{ 125{
126 efl_image_scale_type_set(sd->img, scale_type); 126 efl_gfx_image_scale_type_set(sd->img, scale_type);
127} 127}
128 128
129EOLIAN static Efl_Image_Scale_Type 129EOLIAN static Efl_Gfx_Image_Scale_Type
130_efl_ui_bg_widget_efl_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd) 130_efl_ui_bg_widget_efl_gfx_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd)
131{ 131{
132 return efl_image_scale_type_get(sd->img); 132 return efl_gfx_image_scale_type_get(sd->img);
133} 133}
134 134
135EAPI void 135EAPI void
@@ -178,19 +178,19 @@ EAPI void
178elm_bg_load_size_set(Evas_Object *obj, int w, int h) 178elm_bg_load_size_set(Evas_Object *obj, int w, int h)
179{ 179{
180 EFL_UI_BG_WIDGET_DATA_GET_OR_RETURN(obj, sd); 180 EFL_UI_BG_WIDGET_DATA_GET_OR_RETURN(obj, sd);
181 efl_image_load_controller_load_size_set(sd->img, EINA_SIZE2D(w, h)); 181 efl_gfx_image_load_controller_load_size_set(sd->img, EINA_SIZE2D(w, h));
182} 182}
183 183
184EOLIAN static void 184EOLIAN static void
185_efl_ui_bg_widget_efl_image_load_controller_load_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, Eina_Size2D sz) 185_efl_ui_bg_widget_efl_gfx_image_load_controller_load_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, Eina_Size2D sz)
186{ 186{
187 efl_image_load_controller_load_size_set(sd->img, sz); 187 efl_gfx_image_load_controller_load_size_set(sd->img, sz);
188} 188}
189 189
190EOLIAN static Eina_Size2D 190EOLIAN static Eina_Size2D
191_efl_ui_bg_widget_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd) 191_efl_ui_bg_widget_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd)
192{ 192{
193 return efl_image_load_controller_load_size_get(sd->img); 193 return efl_gfx_image_load_controller_load_size_get(sd->img);
194} 194}
195 195
196EAPI Eina_Bool 196EAPI Eina_Bool
diff --git a/src/lib/elementary/efl_ui_bg_widget.eo b/src/lib/elementary/efl_ui_bg_widget.eo
index c6572546ea..6af5aa5ae5 100644
--- a/src/lib/elementary/efl_ui_bg_widget.eo
+++ b/src/lib/elementary/efl_ui_bg_widget.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Image_Load_Controller) 1class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller)
2{ 2{
3 [[The bg (background) widget is used for setting (solid) background decorations 3 [[The bg (background) widget is used for setting (solid) background decorations
4 4
@@ -13,7 +13,7 @@ class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Image_Load_Controller)
13 Efl.File.file { get; set; } 13 Efl.File.file { get; set; }
14 Efl.File.mmap { get; set; } 14 Efl.File.mmap { get; set; }
15 Efl.Gfx.Color.color { get; set; } 15 Efl.Gfx.Color.color { get; set; }
16 Efl.Image.scale_type { get; set; } 16 Efl.Gfx.Image.scale_type { get; set; }
17 Efl.Image_Load_Controller.load_size { get; set; } 17 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
18 } 18 }
19} 19}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index ce099671d3..c0f7dcdcf4 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -181,15 +181,15 @@ _image_sizing_eval(Efl_Ui_Image_Data *sd, Evas_Object *img)
181 // according to (iw x ih), (sd->img_w x sd->img_h), and scale_type 181 // according to (iw x ih), (sd->img_w x sd->img_h), and scale_type
182 switch (sd->scale_type) 182 switch (sd->scale_type)
183 { 183 {
184 case EFL_IMAGE_SCALE_TYPE_NONE: 184 case EFL_GFX_IMAGE_SCALE_TYPE_NONE:
185 w = iw; 185 w = iw;
186 h = ih; 186 h = ih;
187 break; 187 break;
188 case EFL_IMAGE_SCALE_TYPE_FILL: 188 case EFL_GFX_IMAGE_SCALE_TYPE_FILL:
189 w = sd->img_w; 189 w = sd->img_w;
190 h = sd->img_h; 190 h = sd->img_h;
191 break; 191 break;
192 case EFL_IMAGE_SCALE_TYPE_FIT_INSIDE: 192 case EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE:
193 w = sd->img_w; 193 w = sd->img_w;
194 h = ((double)ih * w) / (double)iw; 194 h = ((double)ih * w) / (double)iw;
195 195
@@ -206,7 +206,7 @@ _image_sizing_eval(Efl_Ui_Image_Data *sd, Evas_Object *img)
206 h = ih; 206 h = ih;
207 } 207 }
208 break; 208 break;
209 case EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE: 209 case EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE:
210 w = sd->img_w; 210 w = sd->img_w;
211 h = ((double)ih * w) / (double)iw; 211 h = ((double)ih * w) / (double)iw;
212 if (h < sd->img_h) 212 if (h < sd->img_h)
@@ -222,7 +222,7 @@ _image_sizing_eval(Efl_Ui_Image_Data *sd, Evas_Object *img)
222 h = ih; 222 h = ih;
223 } 223 }
224 break; 224 break;
225 case EFL_IMAGE_SCALE_TYPE_TILE: 225 case EFL_GFX_IMAGE_SCALE_TYPE_TILE:
226 x = sd->img_x; 226 x = sd->img_x;
227 y = sd->img_y; 227 y = sd->img_y;
228 w = sd->img_w; 228 w = sd->img_w;
@@ -524,14 +524,14 @@ _efl_ui_image_edje_file_set(Evas_Object *obj,
524} 524}
525 525
526EOLIAN static void 526EOLIAN static void
527_efl_ui_image_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Eina_Bool smooth) 527_efl_ui_image_efl_gfx_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Eina_Bool smooth)
528{ 528{
529 sd->smooth = smooth; 529 sd->smooth = smooth;
530 if (!sd->edje) evas_object_image_smooth_scale_set(sd->img, smooth); 530 if (!sd->edje) evas_object_image_smooth_scale_set(sd->img, smooth);
531} 531}
532 532
533EOLIAN static Eina_Bool 533EOLIAN static Eina_Bool
534_efl_ui_image_efl_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 534_efl_ui_image_efl_gfx_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
535{ 535{
536 return sd->smooth; 536 return sd->smooth;
537} 537}
@@ -762,7 +762,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
762 EFL_UI_IMAGE_DATA_GET_OR_RETURN(obj, sd); 762 EFL_UI_IMAGE_DATA_GET_OR_RETURN(obj, sd);
763 763
764 _efl_ui_image_internal_sizing_eval(obj, sd); 764 _efl_ui_image_internal_sizing_eval(obj, sd);
765 efl_image_smooth_scale_set(obj, sd->smooth); 765 efl_gfx_image_smooth_scale_set(obj, sd->smooth);
766 766
767 if (sd->no_scale) 767 if (sd->no_scale)
768 _efl_ui_image_internal_scale_set(obj, sd, 1.0); 768 _efl_ui_image_internal_scale_set(obj, sd, 1.0);
@@ -857,7 +857,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
857 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 857 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
858 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); 858 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
859 859
860 pd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE; 860 pd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE;
861 pd->self = obj; 861 pd->self = obj;
862 862
863 return obj; 863 return obj;
@@ -1257,12 +1257,12 @@ _efl_ui_image_efl_gfx_view_view_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image
1257} 1257}
1258 1258
1259EOLIAN static Eina_Size2D 1259EOLIAN static Eina_Size2D
1260_efl_ui_image_efl_image_image_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1260_efl_ui_image_efl_gfx_image_image_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1261{ 1261{
1262 if (sd->edje) 1262 if (sd->edje)
1263 return EINA_SIZE2D(0, 0); 1263 return EINA_SIZE2D(0, 0);
1264 1264
1265 return efl_image_size_get(sd->img); 1265 return efl_gfx_image_size_get(sd->img);
1266} 1266}
1267 1267
1268EAPI void 1268EAPI void
@@ -1270,11 +1270,11 @@ elm_image_prescale_set(Evas_Object *obj,
1270 int size) 1270 int size)
1271{ 1271{
1272 EFL_UI_IMAGE_CHECK(obj); 1272 EFL_UI_IMAGE_CHECK(obj);
1273 efl_image_load_controller_load_size_set(obj, EINA_SIZE2D(size, size)); 1273 efl_gfx_image_load_controller_load_size_set(obj, EINA_SIZE2D(size, size));
1274} 1274}
1275 1275
1276EOLIAN static void 1276EOLIAN static void
1277_efl_ui_image_efl_image_load_controller_load_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz) 1277_efl_ui_image_efl_gfx_image_load_controller_load_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
1278{ 1278{
1279 sd->load_size = sz; 1279 sd->load_size = sz;
1280 _efl_ui_image_load_size_set_internal(obj, sd); 1280 _efl_ui_image_load_size_set_internal(obj, sd);
@@ -1286,13 +1286,13 @@ elm_image_prescale_get(const Evas_Object *obj)
1286 Eina_Size2D sz; 1286 Eina_Size2D sz;
1287 EFL_UI_IMAGE_CHECK(obj) 0; 1287 EFL_UI_IMAGE_CHECK(obj) 0;
1288 1288
1289 sz = efl_image_load_controller_load_size_get(obj); 1289 sz = efl_gfx_image_load_controller_load_size_get(obj);
1290 1290
1291 return MAX(sz.w, sz.h); 1291 return MAX(sz.w, sz.h);
1292} 1292}
1293 1293
1294EOLIAN static Eina_Size2D 1294EOLIAN static Eina_Size2D
1295_efl_ui_image_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1295_efl_ui_image_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1296{ 1296{
1297 return sd->load_size; 1297 return sd->load_size;
1298} 1298}
@@ -1506,7 +1506,7 @@ _efl_ui_image_efl_player_play_get(const Eo *obj, Efl_Ui_Image_Data *sd)
1506} 1506}
1507 1507
1508EOLIAN static void 1508EOLIAN static void
1509_efl_ui_image_efl_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Image_Scale_Type scale_type) 1509_efl_ui_image_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Gfx_Image_Scale_Type scale_type)
1510{ 1510{
1511 if (scale_type == sd->scale_type) return; 1511 if (scale_type == sd->scale_type) return;
1512 1512
@@ -1515,8 +1515,8 @@ _efl_ui_image_efl_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *s
1515 _efl_ui_image_internal_sizing_eval(obj, sd); 1515 _efl_ui_image_internal_sizing_eval(obj, sd);
1516} 1516}
1517 1517
1518EOLIAN static Efl_Image_Scale_Type 1518EOLIAN static Efl_Gfx_Image_Scale_Type
1519_efl_ui_image_efl_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1519_efl_ui_image_efl_gfx_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1520{ 1520{
1521 return sd->scale_type; 1521 return sd->scale_type;
1522} 1522}
@@ -1961,7 +1961,7 @@ EAPI void
1961elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth) 1961elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth)
1962{ 1962{
1963 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(obj, MY_CLASS)); 1963 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(obj, MY_CLASS));
1964 efl_image_smooth_scale_set(obj, smooth); 1964 efl_gfx_image_smooth_scale_set(obj, smooth);
1965 _efl_ui_image_sizing_eval(obj); 1965 _efl_ui_image_sizing_eval(obj);
1966} 1966}
1967 1967
@@ -1969,7 +1969,7 @@ EAPI Eina_Bool
1969elm_image_smooth_get(const Evas_Object *obj) 1969elm_image_smooth_get(const Evas_Object *obj)
1970{ 1970{
1971 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(obj, MY_CLASS), EINA_FALSE); 1971 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(obj, MY_CLASS), EINA_FALSE);
1972 return efl_image_smooth_scale_get(obj); 1972 return efl_gfx_image_smooth_scale_get(obj);
1973} 1973}
1974 1974
1975// A11Y - END 1975// A11Y - END
@@ -2063,11 +2063,11 @@ elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
2063 2063
2064 if (sd->aspect_fixed) 2064 if (sd->aspect_fixed)
2065 { 2065 {
2066 if (sd->fill_inside) sd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE; 2066 if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE;
2067 else sd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 2067 else sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
2068 } 2068 }
2069 else 2069 else
2070 sd->scale_type = EFL_IMAGE_SCALE_TYPE_FILL; 2070 sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FILL;
2071 2071
2072 _efl_ui_image_internal_sizing_eval(obj, sd); 2072 _efl_ui_image_internal_sizing_eval(obj, sd);
2073} 2073}
@@ -2237,11 +2237,11 @@ elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
2237 2237
2238 if (sd->aspect_fixed) 2238 if (sd->aspect_fixed)
2239 { 2239 {
2240 if (sd->fill_inside) sd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE; 2240 if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE;
2241 else sd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE; 2241 else sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
2242 } 2242 }
2243 else 2243 else
2244 sd->scale_type = EFL_IMAGE_SCALE_TYPE_FILL; 2244 sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FILL;
2245 2245
2246 _efl_ui_image_sizing_eval(obj); 2246 _efl_ui_image_sizing_eval(obj);
2247} 2247}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index c524179234..786f0eea21 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -19,7 +19,7 @@ struct Efl.Ui.Image.Error
19} 19}
20 20
21class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, 21class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
22 Efl.File, Efl.Image, Efl.Image_Load_Controller, Efl.Player, Efl.Gfx.View, 22 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
23 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color, 23 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
24 Efl.Orientation, 24 Efl.Orientation,
25 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc, 25 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
@@ -96,10 +96,10 @@ class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
96 Efl.Gfx.Entity.position { set; } 96 Efl.Gfx.Entity.position { set; }
97 Efl.Gfx.Entity.size { set; } 97 Efl.Gfx.Entity.size { set; }
98 Efl.Gfx.View.view_size { get; } 98 Efl.Gfx.View.view_size { get; }
99 Efl.Image.image_size { get; } 99 Efl.Gfx.Image.image_size { get; }
100 Efl.Image_Load_Controller.load_size { get; set; } 100 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
101 Efl.Image.smooth_scale { get; set; } 101 Efl.Gfx.Image.smooth_scale { get; set; }
102 Efl.Image.scale_type { get; set; } 102 Efl.Gfx.Image.scale_type { get; set; }
103 Efl.Orientation.orientation { get; set; } 103 Efl.Orientation.orientation { get; set; }
104 Efl.Orientation.flip { get; set; } 104 Efl.Orientation.flip { get; set; }
105 Efl.Player.playable { get; } 105 Efl.Player.playable { get; }
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 4e336202db..248368f3f4 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1795,7 +1795,7 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Dat
1795} 1795}
1796 1796
1797EOLIAN static Eina_Size2D 1797EOLIAN static Eina_Size2D
1798_efl_ui_image_zoomable_efl_image_image_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd) 1798_efl_ui_image_zoomable_efl_gfx_image_image_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd)
1799{ 1799{
1800 return EINA_SIZE2D(pd->size.imw, pd->size.imh); 1800 return EINA_SIZE2D(pd->size.imw, pd->size.imh);
1801} 1801}
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 191db4f8c9..88aa8925aa 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -50,7 +50,7 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
50 Efl.Gfx.Entity.position { set; } 50 Efl.Gfx.Entity.position { set; }
51 Efl.Gfx.Entity.size { set; } 51 Efl.Gfx.Entity.size { set; }
52 Efl.Gfx.View.view_size { get; } 52 Efl.Gfx.View.view_size { get; }
53 Efl.Image.image_size { get; } 53 Efl.Gfx.Image.image_size { get; }
54 Efl.Ui.Image.icon { set; get; } 54 Efl.Ui.Image.icon { set; get; }
55 Efl.Player.playable { get; } 55 Efl.Player.playable { get; }
56 Efl.Player.play { get; set; } 56 Efl.Player.play { get; set; }
diff --git a/src/lib/elementary/efl_ui_text_factory_images.c b/src/lib/elementary/efl_ui_text_factory_images.c
index 91325f15b2..54c5c43aa9 100644
--- a/src/lib/elementary/efl_ui_text_factory_images.c
+++ b/src/lib/elementary/efl_ui_text_factory_images.c
@@ -68,7 +68,7 @@ _efl_ui_text_factory_images_efl_canvas_text_factory_create(Eo *obj EINA_UNUSED,
68 efl_file_set(o, key, NULL); 68 efl_file_set(o, key, NULL);
69 } 69 }
70 70
71 if (efl_file_load_error_get(o) != EFL_IMAGE_LOAD_ERROR_NONE) 71 if (efl_file_load_error_get(o) != EFL_GFX_IMAGE_LOAD_ERROR_NONE)
72 { 72 {
73 efl_del(o); 73 efl_del(o);
74 o = NULL; 74 o = NULL;
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index e5f5b9e1ff..e81f82ac05 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -6045,19 +6045,19 @@ _efl_ui_widget_part_bg_efl_gfx_color_color_get(const Eo *obj, void *pd EINA_UNUS
6045} 6045}
6046 6046
6047EOLIAN static void 6047EOLIAN static void
6048_efl_ui_widget_part_bg_efl_image_scale_type_set(Eo *obj, void *pd EINA_UNUSED, Efl_Image_Scale_Type scale_type) 6048_efl_ui_widget_part_bg_efl_gfx_image_scale_type_set(Eo *obj, void *pd EINA_UNUSED, Efl_Gfx_Image_Scale_Type scale_type)
6049{ 6049{
6050 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj); 6050 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
6051 6051
6052 efl_image_scale_type_set(bg_obj, scale_type); 6052 efl_gfx_image_scale_type_set(bg_obj, scale_type);
6053} 6053}
6054 6054
6055EOLIAN static Efl_Image_Scale_Type 6055EOLIAN static Efl_Gfx_Image_Scale_Type
6056_efl_ui_widget_part_bg_efl_image_scale_type_get(const Eo *obj, void *pd EINA_UNUSED) 6056_efl_ui_widget_part_bg_efl_gfx_image_scale_type_get(const Eo *obj, void *pd EINA_UNUSED)
6057{ 6057{
6058 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj); 6058 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
6059 6059
6060 return efl_image_scale_type_get(bg_obj); 6060 return efl_gfx_image_scale_type_get(bg_obj);
6061} 6061}
6062 6062
6063#include "efl_ui_widget_part_bg.eo.c" 6063#include "efl_ui_widget_part_bg.eo.c"
diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index 48e995296e..18fd8536aa 100644
--- a/src/lib/elementary/efl_ui_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -76,7 +76,7 @@ struct _Efl_Ui_Image_Data
76 } async; 76 } async;
77 77
78 Efl_Ui_Image_Preload_Status preload_status; 78 Efl_Ui_Image_Preload_Status preload_status;
79 Efl_Image_Scale_Type scale_type; 79 Efl_Gfx_Image_Scale_Type scale_type;
80 80
81 const char *stdicon; 81 const char *stdicon;
82 82
diff --git a/src/lib/elementary/efl_ui_widget_part_bg.eo b/src/lib/elementary/efl_ui_widget_part_bg.eo
index be56ad1443..eb3827f3db 100644
--- a/src/lib/elementary/efl_ui_widget_part_bg.eo
+++ b/src/lib/elementary/efl_ui_widget_part_bg.eo
@@ -6,6 +6,6 @@ class Efl.Ui.Widget.Part_Bg (Efl.Ui.Widget.Part, Efl.Gfx.Color, Efl.Ui.Bg)
6 Efl.File.file { get; set; } 6 Efl.File.file { get; set; }
7 //Efl.File.mmap { get; set; } 7 //Efl.File.mmap { get; set; }
8 Efl.Gfx.Color.color { set; get; } 8 Efl.Gfx.Color.color { set; get; }
9 Efl.Image.scale_type { get; set; } 9 Efl.Gfx.Image.scale_type { get; set; }
10 } 10 }
11} 11}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 916fa7de8d..e5294d0c56 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7235,7 +7235,7 @@ _efl_ui_win_part_file_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *part, const
7235 if (file) 7235 if (file)
7236 { 7236 {
7237 bg = efl_add(EFL_UI_IMAGE_CLASS, obj); 7237 bg = efl_add(EFL_UI_IMAGE_CLASS, obj);
7238 efl_image_scale_type_set(bg, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE); 7238 efl_gfx_image_scale_type_set(bg, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE);
7239 ok = efl_file_set(bg, file, key); 7239 ok = efl_file_set(bg, file, key);
7240 if (!ok) ELM_SAFE_DEL(bg); 7240 if (!ok) ELM_SAFE_DEL(bg);
7241 _elm_win_bg_set(sd, bg); 7241 _elm_win_bg_set(sd, bg);
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index c08720e565..9bd0c82859 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image_Load_Controller) 1class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller)
2{ 2{
3 [[Efl canvas video class]] 3 [[Efl canvas video class]]
4 methods { 4 methods {
@@ -63,9 +63,9 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
63 Efl.Player.mute { get; set; } 63 Efl.Player.mute { get; set; }
64 Efl.Player.length { get; } 64 Efl.Player.length { get; }
65 Efl.Player.seekable { get; } 65 Efl.Player.seekable { get; }
66 Efl.Image_Load_Controller.load_size { get; } 66 Efl.Gfx.Image_Load_Controller.load_size { get; }
67 Efl.Image.ratio { get; } 67 Efl.Gfx.Image.ratio { get; }
68 Efl.Image.smooth_scale { get; set; } 68 Efl.Gfx.Image.smooth_scale { get; set; }
69 } 69 }
70 events { 70 events {
71 frame,decode; [[Called when the frame was decoded]] 71 frame,decode; [[Called when the frame was decoded]]
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 291a7ec2fc..d52e27eaca 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -740,13 +740,13 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih)
740{ 740{
741 Eina_Size2D sz; 741 Eina_Size2D sz;
742 742
743 sz = efl_image_load_controller_load_size_get(obj); 743 sz = efl_gfx_image_load_controller_load_size_get(obj);
744 if (iw) *iw = sz.w; 744 if (iw) *iw = sz.w;
745 if (ih) *ih = sz.h; 745 if (ih) *ih = sz.h;
746} 746}
747 747
748EOLIAN static Eina_Size2D 748EOLIAN static Eina_Size2D
749_efl_canvas_video_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 749_efl_canvas_video_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
750{ 750{
751 // FIXME: Shouldn't this be efl_gfx_view_size instead? 751 // FIXME: Shouldn't this be efl_gfx_view_size instead?
752 return EINA_SIZE2D(sd->video.w, sd->video.h); 752 return EINA_SIZE2D(sd->video.w, sd->video.h);
@@ -755,11 +755,11 @@ _efl_canvas_video_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNU
755EAPI void 755EAPI void
756emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth) 756emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
757{ 757{
758 efl_image_smooth_scale_set(obj, smooth); 758 efl_gfx_image_smooth_scale_set(obj, smooth);
759} 759}
760 760
761EOLIAN static void 761EOLIAN static void
762_efl_canvas_video_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool smooth) 762_efl_canvas_video_efl_gfx_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool smooth)
763{ 763{
764 evas_object_image_smooth_scale_set(sd->obj, smooth); 764 evas_object_image_smooth_scale_set(sd->obj, smooth);
765} 765}
@@ -767,11 +767,11 @@ _efl_canvas_video_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vid
767EAPI Eina_Bool 767EAPI Eina_Bool
768emotion_object_smooth_scale_get(const Evas_Object *obj) 768emotion_object_smooth_scale_get(const Evas_Object *obj)
769{ 769{
770 return efl_image_smooth_scale_get(obj); 770 return efl_gfx_image_smooth_scale_get(obj);
771} 771}
772 772
773EOLIAN static Eina_Bool 773EOLIAN static Eina_Bool
774_efl_canvas_video_efl_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 774_efl_canvas_video_efl_gfx_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
775{ 775{
776 return evas_object_image_smooth_scale_get(sd->obj); 776 return evas_object_image_smooth_scale_get(sd->obj);
777} 777}
@@ -779,11 +779,11 @@ _efl_canvas_video_efl_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Canv
779EAPI double 779EAPI double
780emotion_object_ratio_get(const Evas_Object *obj) 780emotion_object_ratio_get(const Evas_Object *obj)
781{ 781{
782 return efl_image_ratio_get(obj); 782 return efl_gfx_image_ratio_get(obj);
783} 783}
784 784
785EOLIAN static double 785EOLIAN static double
786_efl_canvas_video_efl_image_ratio_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 786_efl_canvas_video_efl_gfx_image_ratio_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
787{ 787{
788 if (!sd->engine_instance) return 0.0; 788 if (!sd->engine_instance) return 0.0;
789 return sd->ratio; 789 return sd->ratio;
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index b7e8d586fe..cc4fcf4b60 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -246,10 +246,10 @@ typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source
246/* Opaque types */ 246/* Opaque types */
247typedef Eo Evas_Device; /**< A source device handle - where the event came from */ 247typedef Eo Evas_Device; /**< A source device handle - where the event came from */
248 248
249typedef Efl_Image_Content_Hint Evas_Image_Content_Hint; 249typedef Efl_Gfx_Image_Content_Hint Evas_Image_Content_Hint;
250#define EVAS_IMAGE_CONTENT_HINT_NONE EFL_IMAGE_CONTENT_HINT_NONE 250#define EVAS_IMAGE_CONTENT_HINT_NONE EFL_GFX_IMAGE_CONTENT_HINT_NONE
251#define EVAS_IMAGE_CONTENT_HINT_DYNAMIC EFL_IMAGE_CONTENT_HINT_DYNAMIC 251#define EVAS_IMAGE_CONTENT_HINT_DYNAMIC EFL_GFX_IMAGE_CONTENT_HINT_DYNAMIC
252#define EVAS_IMAGE_CONTENT_HINT_STATIC EFL_IMAGE_CONTENT_HINT_STATIC 252#define EVAS_IMAGE_CONTENT_HINT_STATIC EFL_GFX_IMAGE_CONTENT_HINT_STATIC
253 253
254typedef enum _Evas_Alloc_Error 254typedef enum _Evas_Alloc_Error
255{ 255{
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h
index f8741498bb..5dbbab99df 100644
--- a/src/lib/evas/Evas_Loader.h
+++ b/src/lib/evas/Evas_Loader.h
@@ -134,16 +134,16 @@ typedef Emile_Image_Property Evas_Image_Property;
134 134
135typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func; 135typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
136 136
137typedef Efl_Image_Load_Error Evas_Load_Error; 137typedef Efl_Gfx_Image_Load_Error Evas_Load_Error;
138 138
139#define EVAS_LOAD_ERROR_NONE EFL_IMAGE_LOAD_ERROR_NONE 139#define EVAS_LOAD_ERROR_NONE EFL_GFX_IMAGE_LOAD_ERROR_NONE
140#define EVAS_LOAD_ERROR_GENERIC EFL_IMAGE_LOAD_ERROR_GENERIC 140#define EVAS_LOAD_ERROR_GENERIC EFL_GFX_IMAGE_LOAD_ERROR_GENERIC
141#define EVAS_LOAD_ERROR_DOES_NOT_EXIST EFL_IMAGE_LOAD_ERROR_DOES_NOT_EXIST 141#define EVAS_LOAD_ERROR_DOES_NOT_EXIST EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST
142#define EVAS_LOAD_ERROR_PERMISSION_DENIED EFL_IMAGE_LOAD_ERROR_PERMISSION_DENIED 142#define EVAS_LOAD_ERROR_PERMISSION_DENIED EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED
143#define EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED EFL_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED 143#define EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED
144#define EVAS_LOAD_ERROR_CORRUPT_FILE EFL_IMAGE_LOAD_ERROR_CORRUPT_FILE 144#define EVAS_LOAD_ERROR_CORRUPT_FILE EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE
145#define EVAS_LOAD_ERROR_UNKNOWN_FORMAT EFL_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT 145#define EVAS_LOAD_ERROR_UNKNOWN_FORMAT EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT
146#define EVAS_LOAD_ERROR_CANCELLED EFL_IMAGE_LOAD_ERROR_CANCELLED 146#define EVAS_LOAD_ERROR_CANCELLED EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED
147 147
148typedef Emile_Image_Animated_Loop_Hint Evas_Image_Animated_Loop_Hint; 148typedef Emile_Image_Animated_Loop_Hint Evas_Image_Animated_Loop_Hint;
149 149
@@ -219,7 +219,7 @@ EAPI Eina_Bool evas_module_task_cancelled (void); /**< @since 1.19 */
219 Count = 0; \ 219 Count = 0; \
220 if (evas_module_task_cancelled()) \ 220 if (evas_module_task_cancelled()) \
221 { \ 221 { \
222 *Error = EFL_IMAGE_LOAD_ERROR_CANCELLED; \ 222 *Error = EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED; \
223 goto Error_Handler; \ 223 goto Error_Handler; \
224 } \ 224 } \
225 } \ 225 } \
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index ace86647c7..f2ee207d4b 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -54,17 +54,17 @@ _efl_canvas_image_efl_file_mmap_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA
54 _evas_image_mmap_get(eo_obj, f, key); 54 _evas_image_mmap_get(eo_obj, f, key);
55} 55}
56 56
57Efl_Image_Load_Error 57Efl_Gfx_Image_Load_Error
58_evas_image_load_error_get(const Eo *eo_obj) 58_evas_image_load_error_get(const Eo *eo_obj)
59{ 59{
60 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 60 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
61 Efl_Image_Load_Error r = efl_file_load_error_get(efl_cast(eo_obj, EFL_FILE_MIXIN)); 61 Efl_Gfx_Image_Load_Error r = efl_file_load_error_get(efl_cast(eo_obj, EFL_FILE_MIXIN));
62 62
63 if (r != EFL_IMAGE_LOAD_ERROR_NONE) return r; 63 if (r != EFL_GFX_IMAGE_LOAD_ERROR_NONE) return r;
64 return o->load_error; 64 return o->load_error;
65} 65}
66 66
67EOLIAN static Efl_Image_Load_Error 67EOLIAN static Efl_Gfx_Image_Load_Error
68_efl_canvas_image_efl_file_load_error_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 68_efl_canvas_image_efl_file_load_error_get(const 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);
@@ -111,7 +111,7 @@ _evas_image_load_async_start(Eo *eo_obj)
111} 111}
112 112
113EOLIAN static void 113EOLIAN static void
114_efl_canvas_image_efl_image_load_controller_load_async_start(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 114_efl_canvas_image_efl_gfx_image_load_controller_load_async_start(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
115{ 115{
116 _evas_image_load_async_start(eo_obj); 116 _evas_image_load_async_start(eo_obj);
117} 117}
@@ -127,7 +127,7 @@ _evas_image_load_async_cancel(Eo *eo_obj)
127} 127}
128 128
129EOLIAN static void 129EOLIAN static void
130_efl_canvas_image_efl_image_load_controller_load_async_cancel(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 130_efl_canvas_image_efl_gfx_image_load_controller_load_async_cancel(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
131{ 131{
132 _evas_image_load_async_cancel(eo_obj); 132 _evas_image_load_async_cancel(eo_obj);
133} 133}
@@ -155,7 +155,7 @@ _evas_image_load_dpi_set(Eo *eo_obj, double dpi)
155} 155}
156 156
157EOLIAN static void 157EOLIAN static void
158_efl_canvas_image_efl_image_load_controller_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, double dpi) 158_efl_canvas_image_efl_gfx_image_load_controller_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, double dpi)
159{ 159{
160 _evas_image_load_dpi_set(eo_obj, dpi); 160 _evas_image_load_dpi_set(eo_obj, dpi);
161} 161}
@@ -169,7 +169,7 @@ _evas_image_load_dpi_get(const Eo *eo_obj)
169} 169}
170 170
171EOLIAN static double 171EOLIAN static double
172_efl_canvas_image_efl_image_load_controller_load_dpi_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 172_efl_canvas_image_efl_gfx_image_load_controller_load_dpi_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
173{ 173{
174 return _evas_image_load_dpi_get(eo_obj); 174 return _evas_image_load_dpi_get(eo_obj);
175} 175}
@@ -201,7 +201,7 @@ _evas_image_load_size_set(Eo *eo_obj, int w, int h)
201} 201}
202 202
203EOLIAN static void 203EOLIAN static void
204_efl_canvas_image_efl_image_load_controller_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Size2D sz) 204_efl_canvas_image_efl_gfx_image_load_controller_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Size2D sz)
205{ 205{
206 _evas_image_load_size_set(eo_obj, sz.w, sz.h); 206 _evas_image_load_size_set(eo_obj, sz.w, sz.h);
207} 207}
@@ -216,7 +216,7 @@ _evas_image_load_size_get(const Eo *eo_obj, int *w, int *h)
216} 216}
217 217
218EOLIAN static Eina_Size2D 218EOLIAN static Eina_Size2D
219_efl_canvas_image_efl_image_load_controller_load_size_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 219_efl_canvas_image_efl_gfx_image_load_controller_load_size_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
220{ 220{
221 Eina_Size2D sz; 221 Eina_Size2D sz;
222 _evas_image_load_size_get(eo_obj, &sz.w, &sz.h); 222 _evas_image_load_size_get(eo_obj, &sz.w, &sz.h);
@@ -246,7 +246,7 @@ _evas_image_load_scale_down_set(Eo *eo_obj, int scale_down)
246} 246}
247 247
248EOLIAN static void 248EOLIAN static void
249_efl_canvas_image_efl_image_load_controller_load_scale_down_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int scale_down) 249_efl_canvas_image_efl_gfx_image_load_controller_load_scale_down_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int scale_down)
250{ 250{
251 _evas_image_load_scale_down_set(eo_obj, scale_down); 251 _evas_image_load_scale_down_set(eo_obj, scale_down);
252} 252}
@@ -260,7 +260,7 @@ _evas_image_load_scale_down_get(const Eo *eo_obj)
260} 260}
261 261
262EOLIAN static int 262EOLIAN static int
263_efl_canvas_image_efl_image_load_controller_load_scale_down_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 263_efl_canvas_image_efl_gfx_image_load_controller_load_scale_down_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
264{ 264{
265 return _evas_image_load_scale_down_get(eo_obj); 265 return _evas_image_load_scale_down_get(eo_obj);
266} 266}
@@ -273,7 +273,7 @@ _evas_image_load_head_skip_set(const Eo *eo_obj, Eina_Bool skip)
273} 273}
274 274
275EOLIAN static void 275EOLIAN static void
276_efl_canvas_image_efl_image_load_controller_load_skip_header_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool skip) 276_efl_canvas_image_efl_gfx_image_load_controller_load_skip_header_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool skip)
277{ 277{
278 _evas_image_load_head_skip_set(eo_obj, skip); 278 _evas_image_load_head_skip_set(eo_obj, skip);
279} 279}
@@ -286,7 +286,7 @@ _evas_image_load_head_skip_get(const Eo *eo_obj)
286} 286}
287 287
288EOLIAN static Eina_Bool 288EOLIAN static Eina_Bool
289_efl_canvas_image_efl_image_load_controller_load_skip_header_get(const Eo *eo_obj, void *_pd EINA_UNUSED) 289_efl_canvas_image_efl_gfx_image_load_controller_load_skip_header_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
290{ 290{
291 return _evas_image_load_head_skip_get(eo_obj); 291 return _evas_image_load_head_skip_get(eo_obj);
292} 292}
@@ -320,7 +320,7 @@ _evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h)
320} 320}
321 321
322EOLIAN static void 322EOLIAN static void
323_efl_canvas_image_efl_image_load_controller_load_region_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Rect region) 323_efl_canvas_image_efl_gfx_image_load_controller_load_region_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Rect region)
324{ 324{
325 _evas_image_load_region_set(eo_obj, region.x, region.y, region.w, region.h); 325 _evas_image_load_region_set(eo_obj, region.x, region.y, region.w, region.h);
326} 326}
@@ -337,7 +337,7 @@ _evas_image_load_region_get(const Eo *eo_obj, int *x, int *y, int *w, int *h)
337} 337}
338 338
339EOLIAN static Eina_Rect 339EOLIAN static Eina_Rect
340_efl_canvas_image_efl_image_load_controller_load_region_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 340_efl_canvas_image_efl_gfx_image_load_controller_load_region_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
341{ 341{
342 Eina_Rect r; 342 Eina_Rect r;
343 _evas_image_load_region_get(eo_obj, &r.x, &r.y, &r.w, &r.h); 343 _evas_image_load_region_get(eo_obj, &r.x, &r.y, &r.w, &r.h);
@@ -359,7 +359,7 @@ _evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable)
359} 359}
360 360
361EOLIAN static void 361EOLIAN static void
362_efl_canvas_image_efl_image_load_controller_load_orientation_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Bool enable) 362_efl_canvas_image_efl_gfx_image_load_controller_load_orientation_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Bool enable)
363{ 363{
364 _evas_image_load_orientation_set(eo_obj, enable); 364 _evas_image_load_orientation_set(eo_obj, enable);
365} 365}
@@ -373,7 +373,7 @@ _evas_image_load_orientation_get(const Eo *eo_obj)
373} 373}
374 374
375EOLIAN static Eina_Bool 375EOLIAN static Eina_Bool
376_efl_canvas_image_efl_image_load_controller_load_orientation_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 376_efl_canvas_image_efl_gfx_image_load_controller_load_orientation_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
377{ 377{
378 return _evas_image_load_orientation_get(eo_obj); 378 return _evas_image_load_orientation_get(eo_obj);
379} 379}
@@ -388,7 +388,7 @@ _evas_image_load_region_support_get(const Eo *eo_obj)
388} 388}
389 389
390EOLIAN static Eina_Bool 390EOLIAN static Eina_Bool
391_efl_canvas_image_efl_image_load_controller_load_region_support_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 391_efl_canvas_image_efl_gfx_image_load_controller_load_region_support_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
392{ 392{
393 return _evas_image_load_region_support_get(eo_obj); 393 return _evas_image_load_region_support_get(eo_obj);
394} 394}
@@ -407,7 +407,7 @@ _evas_image_animated_get(const Eo *eo_obj)
407} 407}
408 408
409EOLIAN static Eina_Bool 409EOLIAN static Eina_Bool
410_efl_canvas_image_efl_image_animation_controller_animated_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 410_efl_canvas_image_efl_gfx_image_animation_controller_animated_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
411{ 411{
412 return _evas_image_animated_get(eo_obj); 412 return _evas_image_animated_get(eo_obj);
413} 413}
@@ -427,12 +427,12 @@ _evas_image_animated_frame_count_get(const Eo *eo_obj)
427} 427}
428 428
429EOLIAN static int 429EOLIAN static int
430_efl_canvas_image_efl_image_animation_controller_animated_frame_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 430_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
431{ 431{
432 return _evas_image_animated_frame_count_get(eo_obj); 432 return _evas_image_animated_frame_count_get(eo_obj);
433} 433}
434 434
435Efl_Image_Animation_Controller_Loop_Hint 435Efl_Gfx_Image_Animation_Controller_Loop_Hint
436_evas_image_animated_loop_type_get(const Eo *eo_obj) 436_evas_image_animated_loop_type_get(const Eo *eo_obj)
437{ 437{
438 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 438 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -440,13 +440,13 @@ _evas_image_animated_loop_type_get(const Eo *eo_obj)
440 440
441 if (!ENFN->image_animated_loop_type_get || 441 if (!ENFN->image_animated_loop_type_get ||
442 !evas_object_image_animated_get(eo_obj)) 442 !evas_object_image_animated_get(eo_obj))
443 return EFL_IMAGE_ANIMATION_CONTROLLER_LOOP_HINT_NONE; 443 return EFL_GFX_IMAGE_ANIMATION_CONTROLLER_LOOP_HINT_NONE;
444 444
445 return (Efl_Image_Animation_Controller_Loop_Hint) ENFN->image_animated_loop_type_get(ENC, o->engine_data); 445 return (Efl_Gfx_Image_Animation_Controller_Loop_Hint) ENFN->image_animated_loop_type_get(ENC, o->engine_data);
446} 446}
447 447
448EOLIAN static Efl_Image_Animation_Controller_Loop_Hint 448EOLIAN static Efl_Gfx_Image_Animation_Controller_Loop_Hint
449_efl_canvas_image_efl_image_animation_controller_animated_loop_type_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 449_efl_canvas_image_efl_gfx_image_animation_controller_animated_loop_type_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
450{ 450{
451 return _evas_image_animated_loop_type_get(eo_obj); 451 return _evas_image_animated_loop_type_get(eo_obj);
452} 452}
@@ -465,7 +465,7 @@ _evas_image_animated_loop_count_get(const Eo *eo_obj)
465} 465}
466 466
467EOLIAN static int 467EOLIAN static int
468_efl_canvas_image_efl_image_animation_controller_animated_loop_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 468_efl_canvas_image_efl_gfx_image_animation_controller_animated_loop_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
469{ 469{
470 return _evas_image_animated_loop_count_get(eo_obj); 470 return _evas_image_animated_loop_count_get(eo_obj);
471} 471}
@@ -489,7 +489,7 @@ _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int f
489} 489}
490 490
491EOLIAN static double 491EOLIAN static double
492_efl_canvas_image_efl_image_animation_controller_animated_frame_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int start_frame, int frame_num) 492_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int start_frame, int frame_num)
493{ 493{
494 return _evas_image_animated_frame_duration_get(eo_obj, start_frame, frame_num); 494 return _evas_image_animated_frame_duration_get(eo_obj, start_frame, frame_num);
495} 495}
@@ -531,7 +531,7 @@ _evas_image_animated_frame_set(Eo *eo_obj, int frame_index)
531} 531}
532 532
533EOLIAN static Eina_Bool 533EOLIAN static Eina_Bool
534_efl_canvas_image_efl_image_animation_controller_animated_frame_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int frame_index) 534_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int frame_index)
535{ 535{
536 return _evas_image_animated_frame_set(eo_obj, frame_index); 536 return _evas_image_animated_frame_set(eo_obj, frame_index);
537} 537}
@@ -547,7 +547,7 @@ _evas_image_animated_frame_get(const Eo *eo_obj)
547} 547}
548 548
549EOLIAN static int 549EOLIAN static int
550_efl_canvas_image_efl_image_animation_controller_animated_frame_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 550_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
551{ 551{
552 return _evas_image_animated_frame_get(eo_obj); 552 return _evas_image_animated_frame_get(eo_obj);
553} 553}
@@ -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_file_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) && 787 if ((efl_file_load_error_get(obj) != EFL_GFX_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 b8d3de1261..7edcb0bc13 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -1,5 +1,5 @@
1class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer, 1class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer,
2 Efl.Image_Load_Controller, Efl.Image_Animation_Controller, 2 Efl.Gfx.Image_Load_Controller, Efl.Gfx.Image_Animation_Controller,
3 Efl.File) 3 Efl.File)
4{ 4{
5 [[Low-level Image object. 5 [[Low-level Image object.
@@ -18,20 +18,20 @@ class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer,
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.File.load_error { get; }
21 Efl.Image_Animation_Controller.animated { get; } 21 Efl.Gfx.Image_Animation_Controller.animated { get; }
22 Efl.Image_Animation_Controller.animated_frame { get; set; } 22 Efl.Gfx.Image_Animation_Controller.animated_frame { get; set; }
23 Efl.Image_Animation_Controller.animated_frame_count { get; } 23 Efl.Gfx.Image_Animation_Controller.animated_frame_count { get; }
24 Efl.Image_Animation_Controller.animated_loop_type { get; } 24 Efl.Gfx.Image_Animation_Controller.animated_loop_type { get; }
25 Efl.Image_Animation_Controller.animated_loop_count { get; } 25 Efl.Gfx.Image_Animation_Controller.animated_loop_count { get; }
26 Efl.Image_Animation_Controller.animated_frame_duration { get; } 26 Efl.Gfx.Image_Animation_Controller.animated_frame_duration { get; }
27 Efl.Image_Load_Controller.load_async_start; 27 Efl.Gfx.Image_Load_Controller.load_async_start;
28 Efl.Image_Load_Controller.load_async_cancel; 28 Efl.Gfx.Image_Load_Controller.load_async_cancel;
29 Efl.Image_Load_Controller.load_dpi { get; set; } 29 Efl.Gfx.Image_Load_Controller.load_dpi { get; set; }
30 Efl.Image_Load_Controller.load_size { get; set; } 30 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
31 Efl.Image_Load_Controller.load_orientation { get; set; } 31 Efl.Gfx.Image_Load_Controller.load_orientation { get; set; }
32 Efl.Image_Load_Controller.load_scale_down { get; set; } 32 Efl.Gfx.Image_Load_Controller.load_scale_down { get; set; }
33 Efl.Image_Load_Controller.load_skip_header { get; set; } 33 Efl.Gfx.Image_Load_Controller.load_skip_header { get; set; }
34 Efl.Image_Load_Controller.load_region { get; set; } 34 Efl.Gfx.Image_Load_Controller.load_region { get; set; }
35 Efl.Image_Load_Controller.load_region_support { get; } 35 Efl.Gfx.Image_Load_Controller.load_region_support { get; }
36 } 36 }
37} 37}
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 91e1e86e13..1ccb02965f 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -1,5 +1,5 @@
1abstract Efl.Canvas.Image_Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Internal, 1abstract Efl.Canvas.Image_Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Internal,
2 Efl.Image, Efl.Gfx.Buffer, 2 Efl.Gfx.Image, Efl.Gfx.Buffer,
3 Efl.Gfx.Fill, Efl.Gfx.View, 3 Efl.Gfx.Fill, Efl.Gfx.View,
4 Efl.Orientation, Efl.File) 4 Efl.Orientation, Efl.File)
5{ 5{
@@ -13,14 +13,14 @@ abstract Efl.Canvas.Image_Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Interna
13 Efl.File.save; 13 Efl.File.save;
14 Efl.Orientation.orientation { get; set; } 14 Efl.Orientation.orientation { get; set; }
15 Efl.Orientation.flip { get; set; } 15 Efl.Orientation.flip { get; set; }
16 Efl.Image.smooth_scale { get; set; } 16 Efl.Gfx.Image.smooth_scale { get; set; }
17 Efl.Image.ratio { get; } 17 Efl.Gfx.Image.ratio { get; }
18 Efl.Image.border { get; set; } 18 Efl.Gfx.Image.border { get; set; }
19 Efl.Image.border_scale { get; set; } 19 Efl.Gfx.Image.border_scale { get; set; }
20 Efl.Image.border_center_fill { get; set; } 20 Efl.Gfx.Image.border_center_fill { get; set; }
21 Efl.Image.scale_hint { get; set; } 21 Efl.Gfx.Image.scale_hint { get; set; }
22 Efl.Image.content_hint { get; set; } 22 Efl.Gfx.Image.content_hint { get; set; }
23 Efl.Image.image_size { get; } 23 Efl.Gfx.Image.image_size { get; }
24 Efl.Gfx.Buffer.alpha { get; set; } 24 Efl.Gfx.Buffer.alpha { get; set; }
25 Efl.Gfx.Buffer.buffer_update_add; 25 Efl.Gfx.Buffer.buffer_update_add;
26 Efl.Gfx.Buffer.colorspace { get; } 26 Efl.Gfx.Buffer.colorspace { get; }
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index a9bef9dfd8..b9da12bccb 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -58,17 +58,17 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
58 EVAS_OBJECT_EVENT_DEL, 58 EVAS_OBJECT_EVENT_DEL,
59 EFL_EVENT_HOLD, 59 EFL_EVENT_HOLD,
60 EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, 60 EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
61 EFL_IMAGE_EVENT_PRELOAD, 61 EFL_GFX_IMAGE_EVENT_PRELOAD,
62 EFL_CANVAS_SCENE_EVENT_FOCUS_IN, 62 EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
63 EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, 63 EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
64 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE, 64 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
65 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST, 65 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST,
66 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN, 66 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,
67 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT, 67 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT,
68 EFL_IMAGE_EVENT_UNLOAD, 68 EFL_GFX_IMAGE_EVENT_UNLOAD,
69 EFL_CANVAS_SCENE_EVENT_RENDER_PRE, 69 EFL_CANVAS_SCENE_EVENT_RENDER_PRE,
70 EFL_CANVAS_SCENE_EVENT_RENDER_POST, 70 EFL_CANVAS_SCENE_EVENT_RENDER_POST,
71 EFL_IMAGE_EVENT_RESIZE, 71 EFL_GFX_IMAGE_EVENT_RESIZE,
72 EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED, 72 EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
73 EFL_EVENT_POINTER_AXIS, 73 EFL_EVENT_POINTER_AXIS,
74 EVAS_CANVAS_EVENT_VIEWPORT_RESIZE ); 74 EVAS_CANVAS_EVENT_VIEWPORT_RESIZE );
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index be5b2ad1cb..797a2de5c6 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -118,42 +118,42 @@ EAPI void
118evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b) 118evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
119{ 119{
120 EVAS_IMAGE_API(obj); 120 EVAS_IMAGE_API(obj);
121 efl_image_border_set(obj, l, r, t, b); 121 efl_gfx_image_border_set(obj, l, r, t, b);
122} 122}
123 123
124EAPI void 124EAPI void
125evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b) 125evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b)
126{ 126{
127 EVAS_IMAGE_API(obj); 127 EVAS_IMAGE_API(obj);
128 efl_image_border_get(obj, l, r, t, b); 128 efl_gfx_image_border_get(obj, l, r, t, b);
129} 129}
130 130
131EAPI void 131EAPI void
132evas_object_image_border_scale_set(Evas_Object *obj, double scale) 132evas_object_image_border_scale_set(Evas_Object *obj, double scale)
133{ 133{
134 EVAS_IMAGE_API(obj); 134 EVAS_IMAGE_API(obj);
135 efl_image_border_scale_set(obj, scale); 135 efl_gfx_image_border_scale_set(obj, scale);
136} 136}
137 137
138EAPI double 138EAPI double
139evas_object_image_border_scale_get(const Evas_Object *obj) 139evas_object_image_border_scale_get(const Evas_Object *obj)
140{ 140{
141 EVAS_IMAGE_API(obj, 1.0); 141 EVAS_IMAGE_API(obj, 1.0);
142 return efl_image_border_scale_get(obj); 142 return efl_gfx_image_border_scale_get(obj);
143} 143}
144 144
145EAPI void 145EAPI void
146evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill) 146evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill)
147{ 147{
148 EVAS_IMAGE_API(obj); 148 EVAS_IMAGE_API(obj);
149 efl_image_border_center_fill_set(obj, (Efl_Gfx_Border_Fill_Mode) fill); 149 efl_gfx_image_border_center_fill_set(obj, (Efl_Gfx_Border_Fill_Mode) fill);
150} 150}
151 151
152EAPI Evas_Border_Fill_Mode 152EAPI Evas_Border_Fill_Mode
153evas_object_image_border_center_fill_get(const Evas_Object *obj) 153evas_object_image_border_center_fill_get(const Evas_Object *obj)
154{ 154{
155 EVAS_IMAGE_API(obj, EVAS_BORDER_FILL_DEFAULT); 155 EVAS_IMAGE_API(obj, EVAS_BORDER_FILL_DEFAULT);
156 return (Evas_Border_Fill_Mode) efl_image_border_center_fill_get(obj); 156 return (Evas_Border_Fill_Mode) efl_gfx_image_border_center_fill_get(obj);
157} 157}
158 158
159EAPI void 159EAPI void
@@ -370,14 +370,14 @@ EAPI void
370evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale) 370evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale)
371{ 371{
372 EVAS_IMAGE_API(obj); 372 EVAS_IMAGE_API(obj);
373 efl_image_smooth_scale_set(obj, smooth_scale); 373 efl_gfx_image_smooth_scale_set(obj, smooth_scale);
374} 374}
375 375
376EAPI Eina_Bool 376EAPI Eina_Bool
377evas_object_image_smooth_scale_get(const Evas_Object *obj) 377evas_object_image_smooth_scale_get(const Evas_Object *obj)
378{ 378{
379 EVAS_IMAGE_API(obj, EINA_FALSE); 379 EVAS_IMAGE_API(obj, EINA_FALSE);
380 return efl_image_smooth_scale_get(obj); 380 return efl_gfx_image_smooth_scale_get(obj);
381} 381}
382 382
383EAPI void 383EAPI void
@@ -475,28 +475,28 @@ EAPI void
475evas_object_image_content_hint_set(Evas_Object *obj, Evas_Image_Content_Hint hint) 475evas_object_image_content_hint_set(Evas_Object *obj, Evas_Image_Content_Hint hint)
476{ 476{
477 EVAS_IMAGE_API(obj); 477 EVAS_IMAGE_API(obj);
478 return efl_image_content_hint_set(obj, hint); 478 return efl_gfx_image_content_hint_set(obj, hint);
479} 479}
480 480
481EAPI Evas_Image_Content_Hint 481EAPI Evas_Image_Content_Hint
482evas_object_image_content_hint_get(const Evas_Object *obj) 482evas_object_image_content_hint_get(const Evas_Object *obj)
483{ 483{
484 EVAS_IMAGE_API(obj, EVAS_IMAGE_CONTENT_HINT_NONE); 484 EVAS_IMAGE_API(obj, EVAS_IMAGE_CONTENT_HINT_NONE);
485 return efl_image_content_hint_get(obj); 485 return efl_gfx_image_content_hint_get(obj);
486} 486}
487 487
488EAPI void 488EAPI void
489evas_object_image_scale_hint_set(Evas_Object *obj, Evas_Image_Scale_Hint hint) 489evas_object_image_scale_hint_set(Evas_Object *obj, Evas_Image_Scale_Hint hint)
490{ 490{
491 EVAS_IMAGE_API(obj); 491 EVAS_IMAGE_API(obj);
492 return efl_image_scale_hint_set(obj, (Efl_Image_Scale_Hint) hint); 492 return efl_gfx_image_scale_hint_set(obj, (Efl_Gfx_Image_Scale_Hint) hint);
493} 493}
494 494
495EAPI Evas_Image_Scale_Hint 495EAPI Evas_Image_Scale_Hint
496evas_object_image_scale_hint_get(const Evas_Object *obj) 496evas_object_image_scale_hint_get(const Evas_Object *obj)
497{ 497{
498 EVAS_IMAGE_API(obj, EVAS_IMAGE_SCALE_HINT_NONE); 498 EVAS_IMAGE_API(obj, EVAS_IMAGE_SCALE_HINT_NONE);
499 return (Evas_Image_Scale_Hint) efl_image_scale_hint_get(obj); 499 return (Evas_Image_Scale_Hint) efl_gfx_image_scale_hint_get(obj);
500} 500}
501 501
502EAPI void 502EAPI void
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index a2dff6e94c..91f5948a70 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -111,8 +111,8 @@ struct _Evas_Image_Data
111 int pixels_checked_out; 111 int pixels_checked_out;
112 int load_error; 112 int load_error;
113 113
114 Efl_Image_Scale_Hint scale_hint; 114 Efl_Gfx_Image_Scale_Hint scale_hint;
115 Efl_Image_Content_Hint content_hint; 115 Efl_Gfx_Image_Content_Hint content_hint;
116 Efl_Flip flip_value; 116 Efl_Flip flip_value;
117 Efl_Orient orient_value; 117 Efl_Orient orient_value;
118 118
@@ -163,7 +163,7 @@ Eina_Bool _evas_image_file_set(Eo *eo_obj, const char *file, const char *key);
163void _evas_image_file_get(const Eo *eo_obj, const char **file, const char **key); 163void _evas_image_file_get(const Eo *eo_obj, const char **file, const char **key);
164 164
165/* Efl.Image.Load */ 165/* Efl.Image.Load */
166Efl_Image_Load_Error _evas_image_load_error_get(const Eo *eo_obj); 166Efl_Gfx_Image_Load_Error _evas_image_load_error_get(const Eo *eo_obj);
167void _evas_image_load_post_update(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj); 167void _evas_image_load_post_update(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj);
168void _evas_image_load_async_start(Eo *eo_obj); 168void _evas_image_load_async_start(Eo *eo_obj);
169void _evas_image_load_async_cancel(Eo *eo_obj); 169void _evas_image_load_async_cancel(Eo *eo_obj);
@@ -185,7 +185,7 @@ void _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orie
185/* Efl.Image_Animation_Controller */ 185/* Efl.Image_Animation_Controller */
186Eina_Bool _evas_image_animated_get(const Eo *eo_obj); 186Eina_Bool _evas_image_animated_get(const Eo *eo_obj);
187int _evas_image_animated_frame_count_get(const Eo *eo_obj); 187int _evas_image_animated_frame_count_get(const Eo *eo_obj);
188Efl_Image_Animation_Controller_Loop_Hint _evas_image_animated_loop_type_get(const Eo *eo_obj); 188Efl_Gfx_Image_Animation_Controller_Loop_Hint _evas_image_animated_loop_type_get(const Eo *eo_obj);
189int _evas_image_animated_loop_count_get(const Eo *eo_obj); 189int _evas_image_animated_loop_count_get(const Eo *eo_obj);
190double _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num); 190double _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num);
191Eina_Bool _evas_image_animated_frame_set(Eo *eo_obj, int frame_index); 191Eina_Bool _evas_image_animated_frame_set(Eo *eo_obj, int frame_index);
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index bc9a572c33..e9d5318a44 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -504,7 +504,7 @@ _efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *
504} 504}
505 505
506EOLIAN static void 506EOLIAN static void
507_efl_canvas_image_internal_efl_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b) 507_efl_canvas_image_internal_efl_gfx_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b)
508{ 508{
509 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 509 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
510 510
@@ -531,7 +531,7 @@ _efl_canvas_image_internal_efl_image_border_set(Eo *eo_obj, Evas_Image_Data *o,
531} 531}
532 532
533EOLIAN static void 533EOLIAN static void
534_efl_canvas_image_internal_efl_image_border_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, int *l, int *r, int *t, int *b) 534_efl_canvas_image_internal_efl_gfx_image_border_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, int *l, int *r, int *t, int *b)
535{ 535{
536 if (l) *l = o->cur->border.l; 536 if (l) *l = o->cur->border.l;
537 if (r) *r = o->cur->border.r; 537 if (r) *r = o->cur->border.r;
@@ -540,7 +540,7 @@ _efl_canvas_image_internal_efl_image_border_get(const Eo *eo_obj EINA_UNUSED, Ev
540} 540}
541 541
542EOLIAN static void 542EOLIAN static void
543_efl_canvas_image_internal_efl_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Border_Fill_Mode _fill) 543_efl_canvas_image_internal_efl_gfx_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Border_Fill_Mode _fill)
544{ 544{
545 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 545 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
546 Evas_Border_Fill_Mode fill = (Evas_Border_Fill_Mode)_fill; 546 Evas_Border_Fill_Mode fill = (Evas_Border_Fill_Mode)_fill;
@@ -556,7 +556,7 @@ _efl_canvas_image_internal_efl_image_border_center_fill_set(Eo *eo_obj, Evas_Ima
556} 556}
557 557
558EOLIAN static Efl_Gfx_Border_Fill_Mode 558EOLIAN static Efl_Gfx_Border_Fill_Mode
559_efl_canvas_image_internal_efl_image_border_center_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 559_efl_canvas_image_internal_efl_gfx_image_border_center_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
560{ 560{
561 return (Efl_Gfx_Border_Fill_Mode)o->cur->border.fill; 561 return (Efl_Gfx_Border_Fill_Mode)o->cur->border.fill;
562} 562}
@@ -594,7 +594,7 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_auto_get(const Eo *eo_obj EINA_UNUS
594} 594}
595 595
596EOLIAN static void 596EOLIAN static void
597_efl_canvas_image_internal_efl_image_border_scale_set(Eo *eo_obj, Evas_Image_Data *o, double scale) 597_efl_canvas_image_internal_efl_gfx_image_border_scale_set(Eo *eo_obj, Evas_Image_Data *o, double scale)
598{ 598{
599 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 599 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
600 600
@@ -609,7 +609,7 @@ _efl_canvas_image_internal_efl_image_border_scale_set(Eo *eo_obj, Evas_Image_Dat
609} 609}
610 610
611EOLIAN static double 611EOLIAN static double
612_efl_canvas_image_internal_efl_image_border_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 612_efl_canvas_image_internal_efl_gfx_image_border_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
613{ 613{
614 return o->cur->border.scale; 614 return o->cur->border.scale;
615} 615}
@@ -660,7 +660,7 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_get(const Eo *eo_obj EINA_UNUSED, E
660} 660}
661 661
662EOLIAN static Eina_Size2D 662EOLIAN static Eina_Size2D
663_efl_canvas_image_internal_efl_image_image_size_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 663_efl_canvas_image_internal_efl_gfx_image_image_size_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
664{ 664{
665 return EINA_SIZE2D(o->file_size.w, o->file_size.h); 665 return EINA_SIZE2D(o->file_size.w, o->file_size.h);
666} 666}
@@ -827,7 +827,7 @@ _efl_canvas_image_internal_efl_gfx_buffer_alpha_get(const Eo *eo_obj EINA_UNUSED
827} 827}
828 828
829EOLIAN static void 829EOLIAN static void
830_efl_canvas_image_internal_efl_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool smooth_scale) 830_efl_canvas_image_internal_efl_gfx_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool smooth_scale)
831{ 831{
832 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 832 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
833 833
@@ -844,13 +844,13 @@ _efl_canvas_image_internal_efl_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Dat
844} 844}
845 845
846EOLIAN static Eina_Bool 846EOLIAN static Eina_Bool
847_efl_canvas_image_internal_efl_image_smooth_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 847_efl_canvas_image_internal_efl_gfx_image_smooth_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
848{ 848{
849 return o->cur->smooth_scale; 849 return o->cur->smooth_scale;
850} 850}
851 851
852EOLIAN static double 852EOLIAN static double
853_efl_canvas_image_internal_efl_image_ratio_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 853_efl_canvas_image_internal_efl_gfx_image_ratio_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
854{ 854{
855 if (!o->cur->image.h) return 1.0; 855 if (!o->cur->image.h) return 1.0;
856 return (double)o->cur->image.w / (double)o->cur->image.h; 856 return (double)o->cur->image.w / (double)o->cur->image.h;
@@ -1050,7 +1050,7 @@ _evas_image_native_surface_get(const Evas_Object *eo_obj)
1050} 1050}
1051 1051
1052EOLIAN static void 1052EOLIAN static void
1053_efl_canvas_image_internal_efl_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Image_Scale_Hint hint) 1053_efl_canvas_image_internal_efl_gfx_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Image_Scale_Hint hint)
1054{ 1054{
1055 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1055 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1056 evas_object_async_block(obj); 1056 evas_object_async_block(obj);
@@ -1076,14 +1076,14 @@ _efl_canvas_image_internal_efl_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data
1076 } 1076 }
1077} 1077}
1078 1078
1079EOLIAN static Efl_Image_Scale_Hint 1079EOLIAN static Efl_Gfx_Image_Scale_Hint
1080_efl_canvas_image_internal_efl_image_scale_hint_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 1080_efl_canvas_image_internal_efl_gfx_image_scale_hint_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1081{ 1081{
1082 return o->scale_hint; 1082 return o->scale_hint;
1083} 1083}
1084 1084
1085EOLIAN static void 1085EOLIAN static void
1086_efl_canvas_image_internal_efl_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Image_Content_Hint hint) 1086_efl_canvas_image_internal_efl_gfx_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Image_Content_Hint hint)
1087{ 1087{
1088 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1088 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1089 evas_object_async_block(obj); 1089 evas_object_async_block(obj);
@@ -1109,8 +1109,8 @@ _efl_canvas_image_internal_efl_image_content_hint_set(Eo *eo_obj, Evas_Image_Dat
1109 } 1109 }
1110} 1110}
1111 1111
1112EOLIAN static Efl_Image_Content_Hint 1112EOLIAN static Efl_Gfx_Image_Content_Hint
1113_efl_canvas_image_internal_efl_image_content_hint_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 1113_efl_canvas_image_internal_efl_gfx_image_content_hint_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1114{ 1114{
1115 return o->content_hint; 1115 return o->content_hint;
1116} 1116}
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 8b3a90761e..ae436917cf 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -72,7 +72,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
72 _evas_object_image_preloading_set(eo_obj, 0); 72 _evas_object_image_preloading_set(eo_obj, 0);
73 73
74 event_id = _evas_object_event_new(); 74 event_id = _evas_object_event_new();
75 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, event_id, EFL_IMAGE_EVENT_PRELOAD); 75 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, event_id, EFL_GFX_IMAGE_EVENT_PRELOAD);
76 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 76 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
77} 77}
78 78
@@ -82,7 +82,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
82 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 82 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
83 int event_id = _evas_object_event_new(); 83 int event_id = _evas_object_event_new();
84 84
85 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, event_id, EFL_IMAGE_EVENT_UNLOAD); 85 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, event_id, EFL_GFX_IMAGE_EVENT_UNLOAD);
86 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 86 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
87} 87}
88 88
@@ -92,6 +92,6 @@ evas_object_inform_call_image_resize(Evas_Object *eo_obj)
92 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 92 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
93 int event_id = _evas_object_event_new(); 93 int event_id = _evas_object_event_new();
94 94
95 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, event_id, EFL_IMAGE_EVENT_RESIZE); 95 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, event_id, EFL_GFX_IMAGE_EVENT_RESIZE);
96 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 96 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
97} 97}