migration merge<Jiyoun Park>

[framework/uifw/elementary.git] / src / lib / elm_image.h

diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h
index e19cc1c..465c0d3 100644 (file)
--- a/src/lib/elm_image.h
+++ b/src/lib/elm_image.h
@@ -134,11 +134,6 @@ EAPI Eina_Bool        elm_image_smooth_get(const Evas_Object *obj);
  *
  * This is the real size of the image, not the size of the object.
  *
-<<<<<<< HEAD
- * On error, neither w and h will be fileld with 0.
- *
-=======
->>>>>>> remotes/origin/upstream
  * @ingroup Image
  */
 EAPI void             elm_image_object_size_get(const Evas_Object *obj, int *w, int *h);
@@ -153,17 +148,10 @@ EAPI void             elm_image_object_size_get(const Evas_Object *obj, int *w,
  * This function disables scaling of the elm_image widget through the
  * function elm_object_scale_set(). However, this does not affect the widget
  * size/resize in any way. For that effect, take a look at
-<<<<<<< HEAD
- * elm_image_scale_set().
- *
- * @see elm_image_no_scale_get()
- * @see elm_image_scale_set()
-=======
  * elm_image_resizable_set().
  *
  * @see elm_image_no_scale_get()
  * @see elm_image_resizable_set()
->>>>>>> remotes/origin/upstream
  * @see elm_object_scale_set()
  *
  * @ingroup Image
@@ -186,22 +174,6 @@ EAPI Eina_Bool        elm_image_no_scale_get(const Evas_Object *obj);
  * Set if the object is (up/down) resizable.
  *
  * @param obj The image object
-<<<<<<< HEAD
- * @param scale_up A bool to set if the object is resizable up. Default is
- * @c EINA_TRUE.
- * @param scale_down A bool to set if the object is resizable down. Default
- * is @c EINA_TRUE.
- *
- * This function limits the image resize ability. If @p scale_up is set to
- * @c EINA_FALSE, the object can't have its height or width resized to a value
- * higher than the original image size. Same is valid for @p scale_down.
- *
- * @see elm_image_scale_get()
- *
- * @ingroup Image
- */
-EAPI void             elm_image_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
-=======
  * @param size_up A bool to set if the object is resizable up. Default is
  * @c EINA_TRUE.
  * @param size_down A bool to set if the object is resizable down. Default
@@ -216,22 +188,11 @@ EAPI void             elm_image_scale_set(Evas_Object *obj, Eina_Bool scale_up,
  * @ingroup Image
  */
 EAPI void             elm_image_resizable_set(Evas_Object *obj, Eina_Bool size_up, Eina_Bool size_down);
->>>>>>> remotes/origin/upstream
 
 /**
  * Get if the object is (up/down) resizable.
  *
  * @param obj The image object
-<<<<<<< HEAD
- * @param scale_up A bool to set if the object is resizable up
- * @param scale_down A bool to set if the object is resizable down
- *
- * @see elm_image_scale_set()
- *
- * @ingroup Image
- */
-EAPI void             elm_image_scale_get(const Evas_Object *obj, Eina_Bool *scale_up, Eina_Bool *scale_down);
-=======
  * @param size_up A bool to set if the object is resizable up
  * @param size_down A bool to set if the object is resizable down
  *
@@ -240,7 +201,6 @@ EAPI void             elm_image_scale_get(const Evas_Object *obj, Eina_Bool *sca
  * @ingroup Image
  */
 EAPI void             elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down);
->>>>>>> remotes/origin/upstream
 
 /**
  * Set if the image fills the entire object area, when keeping the aspect ratio.
@@ -278,8 +238,6 @@ EAPI void             elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fil
 EAPI Eina_Bool        elm_image_fill_outside_get(const Evas_Object *obj);
 
 /**
-<<<<<<< HEAD
-=======
  * Enable or disable preloading of the image
  *
  * @param obj The image object
@@ -289,7 +247,6 @@ EAPI Eina_Bool        elm_image_fill_outside_get(const Evas_Object *obj);
 EAPI void                  elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled);
 
 /**
->>>>>>> remotes/origin/upstream
  * Set the prescale size for the image
  *
  * @param obj The image object
@@ -368,11 +325,7 @@ EAPI Elm_Image_Orient elm_image_orient_get(const Evas_Object *obj);
 EAPI void             elm_image_editable_set(Evas_Object *obj, Eina_Bool set);
 
 /**
-<<<<<<< HEAD
- * Check if the image 'editable'.
-=======
  * Check if the image is 'editable'.
->>>>>>> remotes/origin/upstream
  *
  * @param obj Image object.
  * @return Editability.
@@ -385,11 +338,7 @@ EAPI void             elm_image_editable_set(Evas_Object *obj, Eina_Bool set);
 EAPI Eina_Bool        elm_image_editable_get(const Evas_Object *obj);
 
 /**
-<<<<<<< HEAD
- * Get the basic Evas_Image object from this object (widget).
-=======
  * Get the inlined image object of the image widget.
->>>>>>> remotes/origin/upstream
  *
  * @param obj The image object to get the inlined image from
  * @return The inlined image object, or NULL if none exists