Revert "Add deprecation warning message"

This reverts commit baa4fbe5c539a2dbf1674de15d69125a0cb56cce.

Change-Id: I3536e3812ae1c8bccb7cd2a77f85591f44019b2e

diff --git a/doc/image_util_doc.h b/doc/image_util_doc.h
index 0ff5ac6..a98b3aa 100755 (executable)
--- a/doc/image_util_doc.h
+++ b/doc/image_util_doc.h
@@ -86,6 +86,7 @@
  *        <th><b>DESCRIPTION</b></th>
  *     </tr>
  *     <tr>
+ *        <td>image_util_foreach_supported_colorspace()</td>
  *        <td>image_util_supported_colorspace_cb()</td>
  *        <td> Supported JPEG/PNG/GIF/BMP encoding/decoding colorspace</td>
  *     </tr>

diff --git a/include/mobile/image_util.h b/include/mobile/image_util.h
index c56ef0c..4d98207 100644 (file)
--- 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) DEPRECATED_API;
+int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_colorspace_cb callback, void *user_data);
 
 /**
 * @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) DEPRECATED_API;
+int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size);
 
 /**
 * @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) DEPRECATED_API;
+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);
 
 /**
 * @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) DEPRECATED_API;
+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);
 
 /**
 * @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) DEPRECATED_API;
+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);
 
 /**
 * @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) DEPRECATED_API;
+int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace,  int quality, const char *path);
 
 /**
 * @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) DEPRECATED_API;
+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);
 
 /**
 * @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 44b7962..62afe0d 100644 (file)
--- a/include/mobile/image_util_private.h
+++ b/include/mobile/image_util_private.h
@@ -59,10 +59,6 @@ extern "C"
                } \
        } while (0)
 
-#define DEPRECATION_LOGW(deprecated, instead) do { \
-               LOGW("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/mobile/image_util_type.h b/include/mobile/image_util_type.h
index 7b3b255..acdbe9a 100644 (file)
--- a/include/mobile/image_util_type.h
+++ b/include/mobile/image_util_type.h
@@ -26,9 +26,6 @@ extern "C"
 #endif
 
 #define IMAGE_UTIL_ERROR_CLASS           TIZEN_ERROR_IMAGE_UTIL
-#ifndef DEPRECATED_API
-#define DEPRECATED_API __attribute__((__visibility__("default"), deprecated))
-#endif
 
 /**
  * @file image_util_type.h

diff --git a/include/wearable/image_util.h b/include/wearable/image_util.h
index 095cf12..65b79cf 100644 (file)
--- 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) DEPRECATED_API;
+int image_util_foreach_supported_jpeg_colorspace(image_util_supported_jpeg_colorspace_cb callback, void *user_data);
 
 /**
 * @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) DEPRECATED_API;
+int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, unsigned char **image_buffer, int *width, int *height, unsigned int *size);
 
 /**
 * @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) DEPRECATED_API;
+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);
 
 /**
 * @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) DEPRECATED_API;
+int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace,  int quality, const char *path);
 
 /**
 * @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) DEPRECATED_API;
+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);
 
 /**
 * @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 44b7962..62afe0d 100755 (executable)
--- a/include/wearable/image_util_private.h
+++ b/include/wearable/image_util_private.h
@@ -59,10 +59,6 @@ extern "C"
                } \
        } while (0)
 
-#define DEPRECATION_LOGW(deprecated, instead) do { \
-               LOGW("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_type.h b/include/wearable/image_util_type.h
index 9002a9d..b05f647 100755 (executable)
--- a/include/wearable/image_util_type.h
+++ b/include/wearable/image_util_type.h
@@ -26,9 +26,6 @@ extern "C"
 #endif
 
 #define IMAGE_UTIL_ERROR_CLASS           TIZEN_ERROR_IMAGE_UTIL
-#ifndef DEPRECATED_API
-#define DEPRECATED_API __attribute__((__visibility__("default"), deprecated))
-#endif
 
 /**
  * @file image_util_type.h

diff --git a/src/image_util.c b/src/image_util.c
index cd03b09..649df80 100755 (executable)
--- a/src/image_util.c
+++ b/src/image_util.c
@@ -254,8 +254,6 @@ 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 */
@@ -669,8 +667,6 @@ 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");
@@ -698,8 +694,6 @@ 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");
@@ -728,8 +722,6 @@ 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");
@@ -758,8 +750,6 @@ 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");
@@ -789,8 +779,6 @@ 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");
@@ -806,8 +794,6 @@ 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");