summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-02-27 10:13:30 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-02-27 15:05:35 -0800
commit5420ebaf3298a61f51a93a4ec01e5dda0f96698e (patch)
treec03fe730f36e2ac75eac48258eb7130dcb701a84
parentdc08c574116cd1869c1e03124a5665686bc06f7a (diff)
emile: rename emile_image_register to emile_image_callback_set.
This fix ABI report according to discussion on the mailing list.
-rw-r--r--src/lib/emile/emile_image.c2
-rw-r--r--src/lib/emile/emile_image.h2
-rw-r--r--src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index 4ea9cd224b..b342e3e8be 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -2460,7 +2460,7 @@ emile_image_jpeg_file_open(Eina_File *source,
2460} 2460}
2461 2461
2462EAPI void 2462EAPI void
2463emile_image_register(Emile_Image *image, Emile_Action_Cb callback, Emile_Action action, const void *data) 2463emile_image_callback_set(Emile_Image *image, Emile_Action_Cb callback, Emile_Action action, const void *data)
2464{ 2464{
2465 if (!image) return ; 2465 if (!image) return ;
2466 // We only handle one type of callback for now 2466 // We only handle one type of callback for now
diff --git a/src/lib/emile/emile_image.h b/src/lib/emile/emile_image.h
index 0eef713171..3c1c6f2333 100644
--- a/src/lib/emile/emile_image.h
+++ b/src/lib/emile/emile_image.h
@@ -313,7 +313,7 @@ EAPI Eina_Bool emile_image_data(Emile_Image * image, Emile_Image_Property * prop
313 * @param action The action this callback is triggered on. 313 * @param action The action this callback is triggered on.
314 * @since 1.19 314 * @since 1.19
315 */ 315 */
316EAPI void emile_image_register(Emile_Image *image, Emile_Action_Cb callback, Emile_Action action, const void *data); 316EAPI void emile_image_callback_set(Emile_Image *image, Emile_Action_Cb callback, Emile_Action action, const void *data);
317 317
318/** 318/**
319 * Close an opened image handler. 319 * Close an opened image handler.
diff --git a/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
index 62cba4f1fc..c80416aea0 100644
--- a/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
@@ -103,9 +103,9 @@ evas_image_load_file_data_jpeg(void *loader_data,
103 Emile_Image_Load_Error image_error; 103 Emile_Image_Load_Error image_error;
104 Eina_Bool ret; 104 Eina_Bool ret;
105 105
106 emile_image_register(loader->image, 106 emile_image_callback_set(loader->image,
107 _evas_image_load_jpeg_cancelled, 107 _evas_image_load_jpeg_cancelled,
108 EMILE_ACTION_CANCELLED, NULL); 108 EMILE_ACTION_CANCELLED, NULL);
109 ret = emile_image_data(loader->image, 109 ret = emile_image_data(loader->image,
110 prop, sizeof (*prop), 110 prop, sizeof (*prop),
111 pixels, 111 pixels,