aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-02 20:46:11 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-15 11:11:59 +0900
commitb458341a13b93b2f963745fae34b3ce14668f99d (patch)
treed10822600532ce5ea115b7a7e38e112bf196c87d /src/lib/emotion
parentEfl.Image: Fix documentation for ratio + implement in evas image (diff)
downloadefl-b458341a13b93b2f963745fae34b3ce14668f99d.tar.gz
Efl.Gfx.Buffer: Add interface skeletton
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/emotion_object.eo4
-rw-r--r--src/lib/emotion/emotion_smart.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index 3486c5cef3..39ee910564 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,4 +1,4 @@
-class Emotion.Object (Evas.Object_Smart, Efl.File, Efl.Player, Efl.Image) {
+class Emotion.Object (Evas.Object_Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image_Load) {
eo_prefix: emotion_obj;
methods {
@property option {
@@ -74,7 +74,7 @@ class Emotion.Object (Evas.Object_Smart, Efl.File, Efl.Player, Efl.Image) {
Efl.Player.audio_mute.get;
Efl.Player.length.get;
Efl.Player.seekable.get;
- Efl.Image.load_size.get;
+ Efl.Image_Load.load_size.get;
Efl.Image.ratio.get;
Efl.Image.smooth_scale.set;
Efl.Image.smooth_scale.get;
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index d0b0f327f8..804b865307 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -748,7 +748,7 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih)
}
EOLIAN static void
-_emotion_object_efl_image_load_size_get(Eo *obj EINA_UNUSED, Emotion_Object_Data *sd, int *iw, int *ih)
+_emotion_object_efl_image_load_load_size_get(Eo *obj EINA_UNUSED, Emotion_Object_Data *sd, int *iw, int *ih)
{
if (iw) *iw = sd->video.w;
if (ih) *ih = sd->video.h;