From 8b9f525c019f48de52bd624d910bfcae150629ab Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 22 Mar 2016 14:45:10 +0900 Subject: [PATCH] Evas.Image: Add ERR in long-deprecated functions - evas_object_image_data_convert() - evas_object_image_pixels_import() --- src/lib/evas/canvas/evas_image_legacy.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index 1850057712..6103cc6df4 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -918,9 +918,17 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace) Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o; + void *engine_data; DATA32 *data; void* result = NULL; + static int warned = 0; + if (!warned) + { + ERR("%s is deprecated and shouldn't be called", __FUNCTION__); + warned = 1; + } + evas_object_async_block(obj); o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS); if ((o->preloading) && (o->engine_data)) @@ -933,12 +941,10 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace) o->pixels->video.update_pixels(o->pixels->video.data, eo_obj, &o->pixels->video); if (o->cur->cspace == to_cspace) return NULL; data = NULL; - o->engine_data = ENFN->image_data_get(ENDT, o->engine_data, 0, &data, &o->load_error, NULL); + engine_data = ENFN->image_data_get(ENDT, o->engine_data, 0, &data, &o->load_error, NULL); result = _evas_image_data_convert_internal(o, data, to_cspace); - if (o->engine_data) - { - o->engine_data = ENFN->image_data_put(ENDT, o->engine_data, data); - } + if (engine_data) + o->engine_data = ENFN->image_data_put(ENDT, engine_data, data); return result; } @@ -988,6 +994,13 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o; + static int warned = 0; + if (!warned) + { + ERR("%s is deprecated and shouldn't be called", __FUNCTION__); + warned = 1; + } + evas_object_async_block(obj); o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS); _evas_image_cleanup(eo_obj, obj, o);