From bfabdd2404140a68e6ba9de0a1c31263e869308c Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Tue, 19 May 2009 11:54:35 +0000 Subject: [PATCH] Fixed some API errors: - added 'const' to many functions; - changed ethumb_thumb_path_get() so that now it returns the key; SVN revision: 40737 --- legacy/ethumb/src/lib/Ethumb.c | 17 +++++++++-------- legacy/ethumb/src/lib/Ethumb.h | 10 +++++----- legacy/ethumb/src/lib/Ethumb_Plugin.h | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c index cd60ac04e4..2e01d2cdaf 100644 --- a/legacy/ethumb/src/lib/Ethumb.c +++ b/legacy/ethumb/src/lib/Ethumb.c @@ -367,7 +367,7 @@ ethumb_thumb_crop_align_set(Ethumb *e, float x, float y) } EAPI void -ethumb_thumb_crop_align_get(Ethumb *e, float *x, float *y) +ethumb_thumb_crop_align_get(const Ethumb *e, float *x, float *y) { EINA_SAFETY_ON_NULL_RETURN(e); @@ -469,7 +469,7 @@ ethumb_thumb_dir_path_set(Ethumb *e, const char *path) } EAPI const char * -ethumb_thumb_dir_path_get(Ethumb *e) +ethumb_thumb_dir_path_get(const Ethumb *e) { EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); @@ -485,7 +485,7 @@ ethumb_thumb_category_set(Ethumb *e, const char *category) } EAPI const char * -ethumb_thumb_category_get(Ethumb *e) +ethumb_thumb_category_get(const Ethumb *e) { EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); @@ -544,7 +544,7 @@ ethumb_file_set(Ethumb *e, const char *path, const char *key) } EAPI void -ethumb_file_get(Ethumb *e, const char **path, const char **key) +ethumb_file_get(const Ethumb *e, const char **path, const char **key) { EINA_SAFETY_ON_NULL_RETURN(e); @@ -736,14 +736,15 @@ ethumb_thumb_path_set(Ethumb *e, const char *path, const char *key) } } -EAPI const char * -ethumb_thumb_path_get(Ethumb *e) +EAPI void +ethumb_thumb_path_get(Ethumb *e, const char **path, const char **key) { EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); if (!e->thumb_path) _ethumb_file_generate_path(e); - return e->thumb_path; + if (*path) *path = e->thumb_path; + if (*key) *key = e->thumb_key; } void @@ -1033,7 +1034,7 @@ ethumb_exists(Ethumb *e) } Evas * -ethumb_evas_get(Ethumb *e) +ethumb_evas_get(const Ethumb *e) { EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); diff --git a/legacy/ethumb/src/lib/Ethumb.h b/legacy/ethumb/src/lib/Ethumb.h index 05b15c87f5..50da7aab2b 100644 --- a/legacy/ethumb/src/lib/Ethumb.h +++ b/legacy/ethumb/src/lib/Ethumb.h @@ -86,16 +86,16 @@ EAPI void ethumb_thumb_aspect_set(Ethumb *e, Ethumb_Thumb_Aspect a) EINA_ARG_NON EAPI Ethumb_Thumb_Aspect ethumb_thumb_aspect_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; EAPI void ethumb_thumb_crop_align_set(Ethumb *e, float x, float y) EINA_ARG_NONNULL(1); -EAPI void ethumb_thumb_crop_align_get(Ethumb *e, float *x, float *y) EINA_ARG_NONNULL(1); +EAPI void ethumb_thumb_crop_align_get(const Ethumb *e, float *x, float *y) EINA_ARG_NONNULL(1); EAPI int ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group, const char *swallow) EINA_ARG_NONNULL(1); EAPI void ethumb_frame_get(const Ethumb *e, const char **theme_file, const char **group, const char **swallow) EINA_ARG_NONNULL(1); EAPI void ethumb_thumb_dir_path_set(Ethumb *e, const char *path) EINA_ARG_NONNULL(1); -EAPI const char * ethumb_thumb_dir_path_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; +EAPI const char * ethumb_thumb_dir_path_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; EAPI void ethumb_thumb_category_set(Ethumb *e, const char *category) EINA_ARG_NONNULL(1); -EAPI const char * ethumb_thumb_category_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; +EAPI const char * ethumb_thumb_category_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; EAPI void ethumb_video_time_set(Ethumb *e, float time) EINA_ARG_NONNULL(1); EAPI float ethumb_video_time_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; @@ -104,10 +104,10 @@ EAPI void ethumb_document_page_set(Ethumb *e, int page) EINA_ARG_NONNULL(1); EAPI int ethumb_document_page_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; EAPI int ethumb_file_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1, 2); -EAPI void ethumb_file_get(Ethumb *e, const char **path, const char **key) EINA_ARG_NONNULL(1); +EAPI void ethumb_file_get(const Ethumb *e, const char **path, const char **key) EINA_ARG_NONNULL(1); EAPI void ethumb_file_free(Ethumb *e) EINA_ARG_NONNULL(1); EAPI void ethumb_thumb_path_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1); -EAPI const char * ethumb_thumb_path_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; +EAPI void ethumb_thumb_path_get(Ethumb *e, const char **path, const char **key) EINA_ARG_NONNULL(1); EAPI int ethumb_generate(Ethumb *e, ethumb_generate_callback_t finished_cb, void *data) EINA_ARG_NONNULL(1, 2); EAPI int ethumb_exists(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; diff --git a/legacy/ethumb/src/lib/Ethumb_Plugin.h b/legacy/ethumb/src/lib/Ethumb_Plugin.h index e262c78d7f..dff8d3a93a 100644 --- a/legacy/ethumb/src/lib/Ethumb_Plugin.h +++ b/legacy/ethumb/src/lib/Ethumb_Plugin.h @@ -18,6 +18,6 @@ void ethumb_calculate_fill(Ethumb *e, int iw, int ih, int *fx, int *fy, int *fw, int ethumb_plugin_image_resize(Ethumb *e, int w, int h); int ethumb_image_save(Ethumb *e); void ethumb_finished_callback_call(Ethumb *e); -Evas * ethumb_evas_get(Ethumb *e); +Evas * ethumb_evas_get(const Ethumb *e); #endif /* _ETHUMB_PLUGIN_H_ */