summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-11 13:56:14 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-15 11:11:59 +0900
commit35f8d81d97cd6a9becf844ab2c2abc7da9d3b80d (patch)
tree7597d4f8b815bd982bd75541e5c8607de5507fdd /src
parentb7e0eec08927de641c177f01ef09a83af55bee4b (diff)
Evas image: Deprecate evas_object_image_alpha_mask_set
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/Evas_Legacy.h21
-rw-r--r--src/lib/evas/canvas/evas_object_image.c21
2 files changed, 13 insertions, 29 deletions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 65f7a0a44e..e53f0549c9 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
2666EAPI Eina_Bool evas_object_image_source_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); 2666EAPI Eina_Bool evas_object_image_source_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
2667 2667
2668/** 2668/**
2669 * Enable an image to be used as an alpha mask.
2670 *
2671 * This will set any flags, and discard any excess image data not used as an
2672 * alpha mask.
2673 *
2674 * Note there is little point in using a image as alpha mask unless it has an
2675 * alpha channel.
2676 *
2677 * @param obj Object to use as an alpha mask.
2678 * @param ismask Use image as alphamask, must be true.
2679 */
2680EAPI void evas_object_image_alpha_mask_set(Evas_Object *obj, Eina_Bool ismask) EINA_ARG_NONNULL(1);
2681
2682/**
2683 * 2669 *
2684 * Set the source file from where an image object must fetch the real 2670 * Set the source file from where an image object must fetch the real
2685 * image data (it may be an Eet file, besides pure image ones). 2671 * 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
3782/** @deprecated evas_object_image_reload */ 3768/** @deprecated evas_object_image_reload */
3783EAPI void evas_object_image_reload(Evas_Object *obj) EINA_DEPRECATED; 3769EAPI void evas_object_image_reload(Evas_Object *obj) EINA_DEPRECATED;
3784 3770
3771/**
3772 * @deprecated This function has never been implemented. Please use
3773 * evas_object_clip_set() with an alpha or RGBA image instead
3774 * of setting this flag.
3775 */
3776EAPI void evas_object_image_alpha_mask_set(Evas_Object *obj, Eina_Bool ismask) EINA_ARG_NONNULL(1) EINA_DEPRECATED;
3777
3785#include "canvas/evas_image.eo.legacy.h" 3778#include "canvas/evas_image.eo.legacy.h"
3786 3779
3787/** 3780/**
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 33f375c0be..ddd71ae0e5 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_
1716 } 1716 }
1717} 1717}
1718 1718
1719EAPI void
1720evas_object_image_alpha_mask_set(Evas_Object *eo_obj, Eina_Bool ismask)
1721{
1722 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1723 return;
1724 MAGIC_CHECK_END();
1725 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1726 evas_object_async_block(obj);
1727 if (!ismask) return;
1728 /* Convert to A8 if not already */
1729
1730 /* done */
1731
1732}
1733
1734#define FRAME_MAX 1024 1719#define FRAME_MAX 1024
1735EOLIAN static Evas_Image_Content_Hint 1720EOLIAN static Evas_Image_Content_Hint
1736_evas_image_content_hint_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 1721_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)
4769 return visible; 4754 return visible;
4770} 4755}
4771 4756
4757EAPI void
4758evas_object_image_alpha_mask_set(Evas_Object *eo_obj EINA_UNUSED, Eina_Bool ismask EINA_UNUSED)
4759{
4760 DBG("This function is not implemented, has never been and never will be.");
4761}
4762
4772#include "canvas/evas_image.eo.c" 4763#include "canvas/evas_image.eo.c"
4773 4764
4774/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ 4765/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/