From: Jiyong Min Date: Wed, 17 Aug 2016 06:40:17 +0000 (+0900) Subject: Add deprecation warning message X-Git-Tag: accepted/tizen/common/20160818.144353~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79e6288199272eebe31d071536eefda5ff248063;p=platform%2Fcore%2Fapi%2Fimage-util.git Add deprecation warning message Change-Id: I2167c5d6cb67fff469254a1bb91ea05c5df80536 Signed-off-by: jiyong min --- diff --git a/include/mobile/image_util.h b/include/mobile/image_util.h index 4d98207..134566a 100644 --- a/include/mobile/image_util.h +++ b/include/mobile/image_util.h @@ -574,7 +574,7 @@ typedef bool(*image_util_supported_jpeg_colorspace_cb)(image_util_colorspace_e c * @see image_util_decode_jpeg() * @see image_util_decode_jpeg_from_memory() */ -int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_colorspace_cb callback, void *user_data); +int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_colorspace_cb callback, void *user_data) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_decode_create() instead. @@ -608,7 +608,7 @@ int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_color * @see image_util_decode_jpeg_from_memory() * @see image_util_foreach_supported_jpeg_colorspace() */ -int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size); +int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_decode_create() instead. @@ -641,7 +641,7 @@ int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, * @see image_util_decode_jpeg() * @see image_util_foreach_supported_jpeg_colorspace() */ -int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpeg_size, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size); +int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpeg_size, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_decode_create() instead. @@ -676,7 +676,7 @@ int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpe * @see image_util_decode_jpeg_from_memory() * @see image_util_foreach_supported_jpeg_colorspace() */ -int image_util_decode_jpeg_with_downscale(const char *path, image_util_colorspace_e colorspace, image_util_scale_e downscale, unsigned char **image_buffer, int *width, int *height, unsigned int *size); +int image_util_decode_jpeg_with_downscale(const char *path, image_util_colorspace_e colorspace, image_util_scale_e downscale, unsigned char **image_buffer, int *width, int *height, unsigned int *size) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_decode_create() instead. @@ -710,7 +710,7 @@ int image_util_decode_jpeg_with_downscale(const char *path, image_util_colorspac * @see image_util_decode_jpeg() * @see image_util_foreach_supported_jpeg_colorspace() */ -int image_util_decode_jpeg_from_memory_with_downscale(const unsigned char *jpeg_buffer, int jpeg_size, image_util_colorspace_e colorspace, image_util_scale_e downscale, unsigned char **image_buffer, int *width, int *height, unsigned int *size); +int image_util_decode_jpeg_from_memory_with_downscale(const unsigned char *jpeg_buffer, int jpeg_size, image_util_colorspace_e colorspace, image_util_scale_e downscale, unsigned char **image_buffer, int *width, int *height, unsigned int *size) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_encode_create() instead. @@ -741,7 +741,7 @@ int image_util_decode_jpeg_from_memory_with_downscale(const unsigned char *jpeg_ * @see image_util_foreach_supported_jpeg_colorspace() * @see image_util_encode_jpeg_to_memory() */ -int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace, int quality, const char *path); +int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace, int quality, const char *path) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_encode_create() instead. @@ -773,7 +773,7 @@ int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, i * @see image_util_foreach_supported_jpeg_colorspace() * @see image_util_encode_jpeg() */ -int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int width, int height, image_util_colorspace_e colorspace, int quality, unsigned char **jpeg_buffer, unsigned int *jpeg_size); +int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int width, int height, image_util_colorspace_e colorspace, int quality, unsigned char **jpeg_buffer, unsigned int *jpeg_size) TIZEN_DEPRECATED_API; /** * @brief Called once for each supported image encode/decode colorspace. diff --git a/include/mobile/image_util_private.h b/include/mobile/image_util_private.h index 62afe0d..ac4ee09 100644 --- a/include/mobile/image_util_private.h +++ b/include/mobile/image_util_private.h @@ -38,27 +38,35 @@ extern "C" #define FONT_COLOR_RED "\033[31m" #define image_util_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_RESET""fmt"", ##arg); \ + LOGD(FONT_COLOR_RESET""fmt""FONT_COLOR_RESET, ##arg); \ } while (0) #define image_util_error(fmt, arg...) do { \ - LOGE(FONT_COLOR_RED""fmt"", ##arg); \ + LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ + } while (0) + +#define image_util_warning(fmt, arg...) do { \ + LOGW(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ } while (0) #define image_util_retm_if(expr, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED""fmt"", ##arg); \ + LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ return; \ } \ } while (0) #define image_util_retvm_if(expr, val, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED""fmt"", ##arg); \ + LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ return (val); \ } \ } while (0) +#define DEPRECATION_LOGW(deprecated, instead) do { \ + image_util_warning("DEPRECATION WARNING: %s is deprecated and will be removed from next release. Use %s instead.", deprecated, instead); \ + } while (0) + #define IMGCV_FUNC_NAME "mm_util_cv_extract_representative_color" #define PATH_MMUTIL_IMGCV_LIB "/usr/lib/libmmutil_imgcv.so" typedef gboolean(*ModuleFunc)(void *, int, int, unsigned char *, unsigned char *, unsigned char *); diff --git a/include/wearable/image_util.h b/include/wearable/image_util.h index 65b79cf..8559cf2 100644 --- a/include/wearable/image_util.h +++ b/include/wearable/image_util.h @@ -574,7 +574,7 @@ typedef bool(*image_util_supported_jpeg_colorspace_cb)(image_util_colorspace_e c * @see image_util_decode_jpeg() * @see image_util_decode_jpeg_from_memory() */ -int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_colorspace_cb callback, void *user_data); +int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_colorspace_cb callback, void *user_data) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_decode_create() instead. @@ -608,7 +608,7 @@ int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_color * @see image_util_decode_jpeg_from_memory() * @see image_util_foreach_supported_jpeg_colorspace() */ -int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size); +int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_decode_create() instead. @@ -641,7 +641,7 @@ int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, * @see image_util_decode_jpeg() * @see image_util_foreach_supported_jpeg_colorspace() */ -int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpeg_size, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size); +int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpeg_size, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_encode_create() instead. @@ -672,7 +672,7 @@ int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpe * @see image_util_foreach_supported_jpeg_colorspace() * @see image_util_encode_jpeg_to_memory() */ -int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace, int quality, const char *path); +int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace, int quality, const char *path) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0. Use image_util_encode_create() instead. @@ -704,7 +704,7 @@ int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, i * @see image_util_foreach_supported_jpeg_colorspace() * @see image_util_encode_jpeg() */ -int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int width, int height, image_util_colorspace_e colorspace, int quality, unsigned char **jpeg_buffer, unsigned int *jpeg_size); +int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int width, int height, image_util_colorspace_e colorspace, int quality, unsigned char **jpeg_buffer, unsigned int *jpeg_size) TIZEN_DEPRECATED_API; /** * @brief Called once for each supported image encode/decode colorspace. diff --git a/include/wearable/image_util_private.h b/include/wearable/image_util_private.h index 62afe0d..ac4ee09 100755 --- a/include/wearable/image_util_private.h +++ b/include/wearable/image_util_private.h @@ -38,27 +38,35 @@ extern "C" #define FONT_COLOR_RED "\033[31m" #define image_util_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_RESET""fmt"", ##arg); \ + LOGD(FONT_COLOR_RESET""fmt""FONT_COLOR_RESET, ##arg); \ } while (0) #define image_util_error(fmt, arg...) do { \ - LOGE(FONT_COLOR_RED""fmt"", ##arg); \ + LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ + } while (0) + +#define image_util_warning(fmt, arg...) do { \ + LOGW(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ } while (0) #define image_util_retm_if(expr, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED""fmt"", ##arg); \ + LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ return; \ } \ } while (0) #define image_util_retvm_if(expr, val, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED""fmt"", ##arg); \ + LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ return (val); \ } \ } while (0) +#define DEPRECATION_LOGW(deprecated, instead) do { \ + image_util_warning("DEPRECATION WARNING: %s is deprecated and will be removed from next release. Use %s instead.", deprecated, instead); \ + } while (0) + #define IMGCV_FUNC_NAME "mm_util_cv_extract_representative_color" #define PATH_MMUTIL_IMGCV_LIB "/usr/lib/libmmutil_imgcv.so" typedef gboolean(*ModuleFunc)(void *, int, int, unsigned char *, unsigned char *, unsigned char *); diff --git a/src/image_util.c b/src/image_util.c index 649df80..cd03b09 100755 --- a/src/image_util.c +++ b/src/image_util.c @@ -254,6 +254,8 @@ int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_color { int i = 0; + DEPRECATION_LOGW("image_util_foreach_supported_jpeg_colorspace()", "image_util_foreach_supported_colorspace()"); + image_util_retvm_if((callback == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "callback is null"); /* RGB has higher precedence than YUV */ @@ -667,6 +669,8 @@ int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, { int err = MM_UTIL_ERROR_NONE; + DEPRECATION_LOGW("image_util_decode_jpeg()", "image_util_decode_create()"); + image_util_retvm_if((path == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "path is null"); image_util_retvm_if((image_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "image_buffer is null"); image_util_retvm_if((size == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "size is null"); @@ -694,6 +698,8 @@ int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpe { int err = MM_UTIL_ERROR_NONE; + DEPRECATION_LOGW("image_util_decode_jpeg_from_memory()", "image_util_decode_create()"); + image_util_retvm_if((jpeg_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "jpeg_buffer is null"); image_util_retvm_if((image_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "image_buffer is null"); image_util_retvm_if((size == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "size is null"); @@ -722,6 +728,8 @@ int image_util_decode_jpeg_with_downscale(const char *path, image_util_colorspac { int err = MM_UTIL_ERROR_NONE; + DEPRECATION_LOGW("image_util_decode_jpeg_with_downscale()", "image_util_decode_create()"); + image_util_retvm_if((path == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "path is null"); image_util_retvm_if((image_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "image_buffer is null"); image_util_retvm_if((size == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "size is null"); @@ -750,6 +758,8 @@ int image_util_decode_jpeg_from_memory_with_downscale(const unsigned char *jpeg_ { int err = MM_UTIL_ERROR_NONE; + DEPRECATION_LOGW("image_util_decode_jpeg_from_memory_with_downscale()", "image_util_decode_create()"); + image_util_retvm_if((jpeg_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "jpeg_buffer is null"); image_util_retvm_if((image_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "image_buffer is null"); image_util_retvm_if((size == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "size is null"); @@ -779,6 +789,8 @@ int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, i { int err = MM_UTIL_ERROR_NONE; + DEPRECATION_LOGW("image_util_encode_jpeg()", "image_util_encode_create()"); + image_util_retvm_if((path == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "path is null"); image_util_retvm_if((buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "buffer is null"); image_util_retvm_if((strlen(path) == 0), IMAGE_UTIL_ERROR_NO_SUCH_FILE, "Invalid path"); @@ -794,6 +806,8 @@ int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int widt int err = MM_UTIL_ERROR_NONE; int isize = 0; + DEPRECATION_LOGW("image_util_encode_jpeg_to_memory()", "image_util_encode_create()"); + image_util_retvm_if((jpeg_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "jpeg_buffer is null"); image_util_retvm_if((image_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "image_buffer is null"); image_util_retvm_if((jpeg_size == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "jpeg_size is null");