Remove TIZEN_FEATURE_COMPATIBILITY code

Change-Id: Id97c75f2dad92d9ce0c21b6fedc6d5e72b371978
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23badbc7838b887f344973266ffb65e69e23123b..242be68e781f5e7d8bf3807e1c8a6aff590e97bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,6 @@ ADD_DEFINITIONS("-DTIZEN_DEBUG")
 IF(FEATURE_ENABLE_HW_ACCELERATION)
 ADD_DEFINITIONS("-DENABLE_HW_ACCELERATION")
 ENDIF(FEATURE_ENABLE_HW_ACCELERATION)
-IF(TIZEN_FEATURE_COMPATIBILITY)
-ADD_DEFINITIONS("-DTIZEN_FEATURE_COMPATIBILITY")
-ENDIF(TIZEN_FEATURE_COMPATIBILITY)
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 

diff --git a/packaging/capi-media-image-util.spec b/packaging/capi-media-image-util.spec
index 174a64ea19bb1f8a1d7ca242e074a8aee316ec18..ca86103e7c1a761654902035c9c8c530c802c317 100644 (file)
--- a/packaging/capi-media-image-util.spec
+++ b/packaging/capi-media-image-util.spec
@@ -73,7 +73,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %else
  -DFEATURE_ENABLE_HW_ACCELERATION:BOOL=OFF \
 %endif
- -DTIZEN_FEATURE_COMPATIBILITY:BOOL=ON
 
 %__make %{?jobs:-j%jobs}
 

diff --git a/src/image_util_decode.c b/src/image_util_decode.c
index faf4bddf50352688ef0306e8f2d3d05fed4f2db3..b591eaeffca11f54cd6e97942c684deec0d54aa8 100644 (file)
--- a/src/image_util_decode.c
+++ b/src/image_util_decode.c
@@ -625,121 +625,3 @@ int image_util_decode_destroy(image_util_decode_h handle)
 
        return IMAGE_UTIL_ERROR_NONE;
 }
-
-/* LCOV_EXCL_START */
-#ifdef TIZEN_FEATURE_COMPATIBILITY
-static int __image_util_get_image(mm_util_image_h image, int *width, int *height, unsigned char **buffer, unsigned int *size)
-{
-       int err = MM_UTIL_ERROR_NONE;
-       unsigned int image_width = 0;
-       unsigned int image_height = 0;
-       size_t image_size = 0;
-
-       err = mm_image_get_image(image, &image_width, &image_height, NULL, buffer, &image_size);
-       if (width)
-               *width = image_width;
-       if (height)
-               *height = image_height;
-       if (size)
-               *size = image_size;
-
-       return err;
-}
-
-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 err = MM_UTIL_ERROR_NONE;
-       mm_util_image_h image = NULL;
-
-       image_util_warning("DEPRECATION WARNING: image_util_decode_jpeg() is removed from 5.0. Use image_util_decode_create() instead.");
-
-       image_util_retvm_if(!IMAGE_UTIL_STRING_VALID(path), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid path");
-       image_util_retvm_if(!image_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_buffer");
-       image_util_retvm_if(!size, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "!invalid size");
-
-       err = _check_colorspace(IMAGE_UTIL_JPEG, colorspace);
-       image_util_retvm_if(err != IMAGE_UTIL_ERROR_NONE, err, "Invalid colorspace");
-
-       err = mm_util_decode_from_jpeg_file(path, TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG), MM_UTIL_JPEG_DECODE_DOWNSCALE_1_1, &image);
-       image_util_retvm_if(err != MM_UTIL_ERROR_NONE, _image_error_capi(err), "mm_util_decode_from_jpeg_file failed. (%d)", err);
-
-       err = __image_util_get_image(image, width, height, image_buffer, size);
-       mm_image_destroy_image(image);
-
-       return _image_error_capi(err);
-}
-
-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 err = MM_UTIL_ERROR_NONE;
-       mm_util_image_h image = NULL;
-
-       image_util_warning("DEPRECATION WARNING: image_util_decode_jpeg_from_memory() is removed from 5.0. Use image_util_decode_create() instead.");
-
-       image_util_retvm_if(!jpeg_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid jpeg_buffer");
-       image_util_retvm_if(jpeg_size <= 0, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid jpeg_size");
-       image_util_retvm_if(!image_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_buffer");
-       image_util_retvm_if(!size, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "!invalid size");
-
-       err = _check_colorspace(IMAGE_UTIL_JPEG, colorspace);
-       image_util_retvm_if(err != IMAGE_UTIL_ERROR_NONE, err, "Invalid colorspace");
-
-       err = mm_util_decode_from_jpeg_memory((void  *)jpeg_buffer, (size_t)jpeg_size,
-                                       TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG), MM_UTIL_JPEG_DECODE_DOWNSCALE_1_1, &image);
-       image_util_retvm_if(err != MM_UTIL_ERROR_NONE, _image_error_capi(err), "image_util_decode_jpeg_from_memory failed. (%d)", err);
-
-       err = __image_util_get_image(image, width, height, image_buffer, size);
-       mm_image_destroy_image(image);
-
-       return _image_error_capi(err);
-}
-
-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 err = MM_UTIL_ERROR_NONE;
-       mm_util_image_h image = NULL;
-
-       image_util_warning("DEPRECATION WARNING: image_util_decode_jpeg_with_downscale() is removed from 5.0. Use image_util_decode_create() instead.");
-
-       image_util_retvm_if(!IMAGE_UTIL_STRING_VALID(path), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid path");
-       image_util_retvm_if(!image_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_buffer");
-       image_util_retvm_if(!size, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "!invalid size");
-
-       err = _check_colorspace(IMAGE_UTIL_JPEG, colorspace);
-       image_util_retvm_if(err != IMAGE_UTIL_ERROR_NONE, err, "Invalid colorspace");
-
-       err = mm_util_decode_from_jpeg_file(path, TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG), _convert_decode_scale_tbl[downscale], &image);
-       image_util_retvm_if(err != MM_UTIL_ERROR_NONE, _image_error_capi(err), "image_util_decode_jpeg_with_downscale failed. (%d)", err);
-
-       err = __image_util_get_image(image, width, height, image_buffer, size);
-       mm_image_destroy_image(image);
-
-       return _image_error_capi(err);
-}
-
-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 err = MM_UTIL_ERROR_NONE;
-       mm_util_image_h image = NULL;
-
-       image_util_warning("DEPRECATION WARNING: image_util_decode_jpeg_from_memory_with_downscale() is removed from 5.0. Use image_util_decode_create() instead.");
-
-       image_util_retvm_if(!jpeg_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid jpeg_buffer");
-       image_util_retvm_if(jpeg_size <= 0, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid jpeg_size");
-       image_util_retvm_if(!image_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_buffer");
-       image_util_retvm_if(!size, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "!invalid size");
-
-       err = _check_colorspace(IMAGE_UTIL_JPEG, colorspace);
-       image_util_retvm_if(err != IMAGE_UTIL_ERROR_NONE, err, "Invalid colorspace");
-
-       err = mm_util_decode_from_jpeg_memory((void  *)jpeg_buffer, (size_t)jpeg_size,
-                                       TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG), _convert_decode_scale_tbl[downscale], &image);
-       image_util_retvm_if(err != MM_UTIL_ERROR_NONE, _image_error_capi(err), "image_util_decode_jpeg_from_memory_with_downscale failed. (%d)", err);
-
-       err = __image_util_get_image(image, width, height, image_buffer, size);
-       mm_image_destroy_image(image);
-
-       return _image_error_capi(err);
-}
-#endif
-/* LCOV_EXCL_STOP */

diff --git a/src/image_util_encode.c b/src/image_util_encode.c
index 2d9edd9a44800c71be25d386721fc8cf3306914d..c443187cf5c9dc8065c9135703ace18cf8023adb 100644 (file)
--- a/src/image_util_encode.c
+++ b/src/image_util_encode.c
@@ -846,57 +846,3 @@ int image_util_anim_encode_destroy(image_util_anim_encode_h handle)
 
        return IMAGE_UTIL_ERROR_NONE;
 }
-
-/* LCOV_EXCL_START */
-#ifdef TIZEN_FEATURE_COMPATIBILITY
-int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, image_util_colorspace_e colorspace, int quality, const char *path)
-{
-       int err = MM_UTIL_ERROR_NONE;
-       mm_util_image_h image = NULL;
-
-       image_util_warning("DEPRECATION WARNING: image_util_encode_jpeg() is removed from 5.0. Use image_util_encode_create() instead.");
-
-       image_util_retvm_if(!path, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid path");
-       image_util_retvm_if(!buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid buffer");
-       image_util_retvm_if((strlen(path) == 0), IMAGE_UTIL_ERROR_NO_SUCH_FILE, "Invalid path");
-
-       err = _check_colorspace(IMAGE_UTIL_JPEG, colorspace);
-       image_util_retvm_if(err != IMAGE_UTIL_ERROR_NONE, err, "Invalid colorspace");
-
-       err = mm_image_create_image((unsigned int)width, (unsigned int)height, TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG), buffer, TEMP_DATA_SIZE, &image);
-       image_util_retvm_if(err != MM_UTIL_ERROR_NONE, _image_error_capi(err), "mm_image_create_image is failed (%d)", err);
-
-       err = mm_util_jpeg_encode_to_file(image, quality, path);
-
-       mm_image_destroy_image(image);
-
-       return _image_error_capi(err);
-}
-
-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 err = MM_UTIL_ERROR_NONE;
-       mm_util_image_h image = NULL;
-       size_t size = 0;
-
-       image_util_warning("DEPRECATION WARNING: image_util_encode_jpeg_to_memory() is removed from 5.0. Use image_util_encode_create() instead.");
-
-       image_util_retvm_if(!image_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_buffer");
-       image_util_retvm_if(!jpeg_buffer, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid jpeg_buffer");
-       image_util_retvm_if(!jpeg_size, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid jpeg_size");
-
-       err = _check_colorspace(IMAGE_UTIL_JPEG, colorspace);
-       image_util_retvm_if(err != IMAGE_UTIL_ERROR_NONE, err, "Invalid colorspace");
-
-       err = mm_image_create_image((unsigned int)width, (unsigned int)height, TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG), image_buffer, TEMP_DATA_SIZE, &image);
-       image_util_retvm_if(err != MM_UTIL_ERROR_NONE, _image_error_capi(err), "mm_image_create_image is failed (%d)", err);
-
-       err = mm_util_encode_to_jpeg_memory(image, quality, (void **)jpeg_buffer, &size);
-       *jpeg_size = (unsigned int)size;
-
-       mm_image_destroy_image(image);
-
-       return _image_error_capi(err);
-}
-#endif
-/* LCOV_EXCL_STOP */