[EGIT] [core/efl] master 08/15: efl: Use Eina.Size2D for image size

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=89a7d9ea8ed64248397df1ec2b85c63a835a0a22

commit 89a7d9ea8ed64248397df1ec2b85c63a835a0a22
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Mon Sep 18 20:49:56 2017 +0900

    efl: Use Eina.Size2D for image size
---
 src/lib/efl/interfaces/efl_image.eo        |  3 +--
 src/lib/elementary/efl_ui_image.c          | 12 ++++--------
 src/lib/elementary/efl_ui_image_zoomable.c |  7 +++----
 src/lib/evas/canvas/evas_object_image.c    |  5 ++---
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_image.eo 
b/src/lib/efl/interfaces/efl_image.eo
index 0af01164ec..9cf3391e4d 100644
--- a/src/lib/efl/interfaces/efl_image.eo
+++ b/src/lib/efl/interfaces/efl_image.eo
@@ -125,8 +125,7 @@ interface Efl.Image ()
          ]]
          get {}
          values {
-            w: int; [[The image width.]]
-            h: int; [[The image height.]]
+            size: Eina.Size2D; [[The size in pixels.]]
          }
       }
 
diff --git a/src/lib/elementary/efl_ui_image.c 
b/src/lib/elementary/efl_ui_image.c
index 75facb4bee..319ef147ab 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1258,17 +1258,13 @@ _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj 
EINA_UNUSED, Efl_Ui_Image_Data
    return EINA_SIZE2D(tw, th);
 }
 
-EOLIAN static void
-_efl_ui_image_efl_image_image_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data 
*sd, int *w, int *h)
+EOLIAN static Eina_Size2D
+_efl_ui_image_efl_image_image_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data 
*sd)
 {
    if (sd->edje)
-     {
-        if (w) *w = 0;
-        if (h) *h = 0;
-        return;
-     }
+     return EINA_SIZE2D(0, 0);
 
-   efl_image_size_get(sd->img, w, h);
+   return efl_image_size_get(sd->img);
 }
 
 EAPI void
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c 
b/src/lib/elementary/efl_ui_image_zoomable.c
index 9940534074..23ddf5997b 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1545,11 +1545,10 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, 
Efl_Ui_Image_Zoomable_Dat
    return obj;
 }
 
-EOLIAN static void
-_efl_ui_image_zoomable_efl_image_image_size_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Image_Zoomable_Data *pd, int *w, int *h)
+EOLIAN static Eina_Size2D
+_efl_ui_image_zoomable_efl_image_image_size_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Image_Zoomable_Data *pd)
 {
-   if (w) *w = pd->size.imw;
-   if (h) *h = pd->size.imh;
+   return EINA_SIZE2D(pd->size.imw, pd->size.imh);
 }
 
 EOLIAN static Eina_Size2D
diff --git a/src/lib/evas/canvas/evas_object_image.c 
b/src/lib/evas/canvas/evas_object_image.c
index ee41ea4e4e..c99e860b7d 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -683,10 +683,9 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_get(Eo 
*eo_obj EINA_UNUSED, Evas_Im
 }
 
 EOLIAN static void
-_efl_canvas_image_internal_efl_image_image_size_get(Eo *eo_obj EINA_UNUSED, 
Evas_Image_Data *o, int *w, int *h)
+_efl_canvas_image_internal_efl_image_image_size_get(Eo *eo_obj EINA_UNUSED, 
Evas_Image_Data *o)
 {
-   if (w) *w = o->file_size.w;
-   if (h) *h = o->file_size.h;
+   return EINA_SIZE2D(o->file_size.w, o->file_size.h);
 }
 
 EOLIAN static Eina_Size2D

--