From f8473a2d19ba146a8a08ab2d75f0b9a8da73ce39 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 15 May 2017 14:59:45 +0900 Subject: [PATCH] evas: Remove Evas_Image_Orient from EO Ref T5312 --- src/lib/elementary/elm_image_legacy.h | 24 ++++++++++++------------ src/lib/evas/Evas_Legacy.h | 19 +++++++++++++++++++ src/lib/evas/canvas/evas_types.eot | 16 ---------------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h index 961abdbf50..90650d4a74 100644 --- a/src/lib/elementary/elm_image_legacy.h +++ b/src/lib/elementary/elm_image_legacy.h @@ -383,18 +383,18 @@ EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled); */ typedef enum _Elm_Image_Orient_Type { - ELM_IMAGE_ORIENT_NONE = 0 /* Evas.Image_Orient.orient_none */, - ELM_IMAGE_ORIENT_0 = 0 /* Evas.Image_Orient.orient_0 */, - ELM_IMAGE_ROTATE_90 = 1 /* Evas.Image_Orient.orient_90 */, - ELM_IMAGE_ORIENT_90 = 1 /* Evas.Image_Orient.orient_90 */, - ELM_IMAGE_ROTATE_180 = 2 /* Evas.Image_Orient.orient_180 */, - ELM_IMAGE_ORIENT_180 = 2 /* Evas.Image_Orient.orient_180 */, - ELM_IMAGE_ROTATE_270 = 3 /* Evas.Image_Orient.orient_270 */, - ELM_IMAGE_ORIENT_270 = 3 /* Evas.Image_Orient.orient_270 */, - ELM_IMAGE_FLIP_HORIZONTAL = 4 /* Evas.Image_Orient.flip_horizontal */, - ELM_IMAGE_FLIP_VERTICAL = 5 /* Evas.Image_Orient.flip_vertical */, - ELM_IMAGE_FLIP_TRANSPOSE = 6 /* Evas.Image_Orient.flip_transpose */, - ELM_IMAGE_FLIP_TRANSVERSE = 7 /* Evas.Image_Orient.flip_transverse */ + ELM_IMAGE_ORIENT_NONE = 0, /**< no orientation change */ + ELM_IMAGE_ORIENT_0 = 0, /**< no orientation change */ + ELM_IMAGE_ROTATE_90 = 1, /**< rotate 90 degrees clockwise */ + ELM_IMAGE_ORIENT_90 = 1, /**< rotate 90 degrees clockwise */ + ELM_IMAGE_ROTATE_180 = 2, /**< rotate 180 degrees clockwise */ + ELM_IMAGE_ORIENT_180 = 2, /**< rotate 180 degrees clockwise */ + ELM_IMAGE_ROTATE_270 = 3, /**< rotate 90 degrees counter-clockwise (i.e. 270 degrees clockwise) */ + ELM_IMAGE_ORIENT_270 = 3, /**< rotate 90 degrees counter-clockwise (i.e. 270 degrees clockwise) */ + ELM_IMAGE_FLIP_HORIZONTAL = 4, /**< flip image horizontally (along the x = width / 2 line) */ + ELM_IMAGE_FLIP_VERTICAL = 5, /**< flip image vertically (along the y = height / 2 line) */ + ELM_IMAGE_FLIP_TRANSPOSE = 6, /**< flip image along the y = (width - x) line (bottom-left to top-right) */ + ELM_IMAGE_FLIP_TRANSVERSE = 7 /**< flip image along the y = x line (top-left to bottom-right) */ } Elm_Image_Orient; /** diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index c54b14b5ee..d300d6db1c 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -3489,6 +3489,7 @@ EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y); * * @{ */ + /** * Creates a new image object on the given Evas @p e canvas. * @@ -3669,6 +3670,24 @@ EAPI void evas_object_image_native_surface_set(Evas_Obj */ EAPI Evas_Native_Surface *evas_object_image_native_surface_get(const Evas_Object *obj); +/** + * Possible orientation options for evas_object_image_orient_set(). + * + * @since 1.14 + */ +typedef enum +{ + EVAS_IMAGE_ORIENT_NONE = 0, /**< no orientation change */ + EVAS_IMAGE_ORIENT_0 = 0, /**< no orientation change */ + EVAS_IMAGE_ORIENT_90 = 1, /**< rotate 90 degrees clockwise */ + EVAS_IMAGE_ORIENT_180 = 2, /**< rotate 180 degrees clockwise */ + EVAS_IMAGE_ORIENT_270 = 3, /**< rotate 90 degrees counter-clockwise (i.e. 270 degrees clockwise) */ + EVAS_IMAGE_FLIP_HORIZONTAL = 4, /**< flip image horizontally (along the x = width / 2 line) */ + EVAS_IMAGE_FLIP_VERTICAL = 5, /**< flip image vertically (along the y = height / 2 line) */ + EVAS_IMAGE_FLIP_TRANSPOSE = 6, /**< flip image along the y = (width - x) line (bottom-left to top-right) */ + EVAS_IMAGE_FLIP_TRANSVERSE = 7 /**< flip image along the y = x line (top-left to bottom-right) */ +} Evas_Image_Orient; + /** * Preload an image object's image data in the background * diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot index dfcaa01895..1ddf2bade2 100644 --- a/src/lib/evas/canvas/evas_types.eot +++ b/src/lib/evas/canvas/evas_types.eot @@ -23,22 +23,6 @@ enum Evas.Touch_Point_State { cancel [[Touch point is cancelled]] } -enum Evas.Image.Orient -{ - [[Possible orientation options for evas_object_image_orient_set(). - @since 1.14]] - legacy: evas_image; - orient_none = 0, [[no orientation change]] - orient_0 = 0, [[no orientation change]] - orient_90 = 1, [[orient 90 degrees clockwise]] - orient_180 = 2, [[orient 180 degrees clockwise]] - orient_270 = 3, [[rotate 90 degrees counter-clockwise (i.e. 270 degrees clockwise)]] - flip_horizontal = 4, [[flip image horizontally]] - flip_vertical = 5, [[flip image vertically]] - flip_transpose = 6, [[flip image along the y = (width - x) line (bottom-left to top-right)]] - flip_transverse = 7 [[flip image along the y = x line (top-left to bottom-right)]] -} - enum Evas.Border_Fill_Mode { [[How an image's center region (the complement to the border region) should be rendered by Evas]]