jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=35f8d81d97cd6a9becf844ab2c2abc7da9d3b80d
commit 35f8d81d97cd6a9becf844ab2c2abc7da9d3b80d
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Mar 11 13:56:14 2016 +0900
Evas image: Deprecate evas_object_image_alpha_mask_set
---
src/lib/evas/Evas_Legacy.h | 21 +++++++--------------
src/lib/evas/canvas/evas_object_image.c | 21 ++++++---------------
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 65f7a0a..e53f054 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2666,20 +2666,6 @@ EAPI void
evas_object_image_preload(Evas_Object *obj, E
EAPI Eina_Bool evas_object_image_source_unset(Evas_Object
*obj) EINA_ARG_NONNULL(1);
/**
- * Enable an image to be used as an alpha mask.
- *
- * This will set any flags, and discard any excess image data not used as an
- * alpha mask.
- *
- * Note there is little point in using a image as alpha mask unless it has an
- * alpha channel.
- *
- * @param obj Object to use as an alpha mask.
- * @param ismask Use image as alphamask, must be true.
- */
-EAPI void
evas_object_image_alpha_mask_set(Evas_Object *obj, Eina_Bool ismask)
EINA_ARG_NONNULL(1);
-
-/**
*
* Set the source file from where an image object must fetch the real
* image data (it may be an Eet file, besides pure image ones).
@@ -3782,6 +3768,13 @@ EAPI Eina_Bool
evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Impo
/** @deprecated evas_object_image_reload */
EAPI void evas_object_image_reload(Evas_Object *obj) EINA_DEPRECATED;
+/**
+ * @deprecated This function has never been implemented. Please use
+ * evas_object_clip_set() with an alpha or RGBA image instead
+ * of setting this flag.
+ */
+EAPI void evas_object_image_alpha_mask_set(Evas_Object *obj, Eina_Bool ismask)
EINA_ARG_NONNULL(1) EINA_DEPRECATED;
+
#include "canvas/evas_image.eo.legacy.h"
/**
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index 33f375c..ddd71ae 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1716,21 +1716,6 @@ _evas_image_content_hint_set(Eo *eo_obj, Evas_Image_Data
*o, Evas_Image_Content_
}
}
-EAPI void
-evas_object_image_alpha_mask_set(Evas_Object *eo_obj, Eina_Bool ismask)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
- evas_object_async_block(obj);
- if (!ismask) return;
- /* Convert to A8 if not already */
-
- /* done */
-
-}
-
#define FRAME_MAX 1024
EOLIAN static Evas_Image_Content_Hint
_evas_image_content_hint_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
@@ -4769,6 +4754,12 @@ evas_object_image_source_visible_get(const Evas_Object
*eo)
return visible;
}
+EAPI void
+evas_object_image_alpha_mask_set(Evas_Object *eo_obj EINA_UNUSED, Eina_Bool
ismask EINA_UNUSED)
+{
+ DBG("This function is not implemented, has never been and never will be.");
+}
+
#include "canvas/evas_image.eo.c"
/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
--
