Rename jpeg decoding function

Change-Id: I0cfea3396ce7437e32cd069f751b6da2305965a2

diff --git a/imgcv/test/mm_util_imgcv_testsuite.c b/imgcv/test/mm_util_imgcv_testsuite.c
index fced574..56ac01a 100755 (executable)
--- a/imgcv/test/mm_util_imgcv_testsuite.c
+++ b/imgcv/test/mm_util_imgcv_testsuite.c
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
        mm_util_jpeg_yuv_data decoded;
        memset(&decoded, 0, sizeof(mm_util_jpeg_yuv_data));
 
-       ret = mm_util_decode_from_jpeg_file_with_downscale(argv[1], MM_UTIL_COLOR_RGB24, MM_UTIL_JPEG_DECODE_DOWNSCALE_1_1, &decoded);
+       ret = mm_util_decode_from_jpeg_file(argv[1], MM_UTIL_COLOR_RGB24, MM_UTIL_JPEG_DECODE_DOWNSCALE_1_1, &decoded);
 
        if (!ret) {
                img_buffer = decoded.data;

diff --git a/jpeg/include/mm_util_jpeg.h b/jpeg/include/mm_util_jpeg.h
index c6d8f01..952362c 100755 (executable)
--- a/jpeg/include/mm_util_jpeg.h
+++ b/jpeg/include/mm_util_jpeg.h
@@ -112,7 +112,7 @@ int mm_util_encode_to_jpeg_memory(mm_util_jpeg_yuv_data *decoded, int quality, v
  * @see         mm_util_jpeg_yuv_data, mm_util_color_format_e
  * @since       R1, 1.0
  */
-int mm_util_decode_from_jpeg_file_with_downscale(const char *filename, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded);
+int mm_util_decode_from_jpeg_file(const char *filename, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded);
 
 /**
  * This function extracts yuv data from jpeg buffer with downscale decode option
@@ -127,7 +127,7 @@ int mm_util_decode_from_jpeg_file_with_downscale(const char *filename, mm_util_c
  * @see         mm_util_jpeg_yuv_data, mm_util_color_format_e
  * @since       R1, 1.0
  */
-int mm_util_decode_from_jpeg_memory_with_downscale(void *src, const size_t size, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded);
+int mm_util_decode_from_jpeg_memory(void *src, const size_t size, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded);
 
 
 #ifdef __cplusplus

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 4e565e0..e303737 100755 (executable)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -573,7 +573,7 @@ int mm_util_encode_to_jpeg_memory(mm_util_jpeg_yuv_data *decoded, int quality, v
        return ret;
 }
 
-int mm_util_decode_from_jpeg_file_with_downscale(const char *filename, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded)
+int mm_util_decode_from_jpeg_file(const char *filename, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
@@ -626,7 +626,7 @@ int mm_util_decode_from_jpeg_file_with_downscale(const char *filename, mm_util_c
        return ret;
 }
 
-int mm_util_decode_from_jpeg_memory_with_downscale(void *src, const size_t size, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded)
+int mm_util_decode_from_jpeg_memory(void *src, const size_t size, mm_util_color_format_e fmt, mm_util_jpeg_decode_downscale downscale, mm_util_jpeg_yuv_data *decoded)
 {
        int ret = MM_UTIL_ERROR_NONE;
 

diff --git a/jpeg/test/mm_util_jpeg_testsuite.c b/jpeg/test/mm_util_jpeg_testsuite.c
index 892a6a7..432e1b9 100755 (executable)
--- a/jpeg/test/mm_util_jpeg_testsuite.c
+++ b/jpeg/test/mm_util_jpeg_testsuite.c
@@ -238,7 +238,7 @@ gboolean _test_decode(const jpeg_test_mode_e mode)
 
        /* test decoding jpeg */
        if (mode == TEST_DECODE_FILE) {
-               ret = mm_util_decode_from_jpeg_file_with_downscale(g_path, g_color, g_downscale, &g_decoded_data);
+               ret = mm_util_decode_from_jpeg_file(g_path, g_color, g_downscale, &g_decoded_data);
                if (ret != MM_UTIL_ERROR_NONE) {
                        fprintf(stderr, "\t[JPEG_testsuite] mm_util_decode_from_jpeg_file_with_downscale failed %d\n", ret);
                        return FALSE;
@@ -253,7 +253,7 @@ gboolean _test_decode(const jpeg_test_mode_e mode)
                        return FALSE;
                }
 
-               ret = mm_util_decode_from_jpeg_memory_with_downscale(g_readed_data, g_readed_size, g_color, g_downscale, &g_decoded_data);
+               ret = mm_util_decode_from_jpeg_memory(g_readed_data, g_readed_size, g_color, g_downscale, &g_decoded_data);
                if (ret != MM_UTIL_ERROR_NONE) {
                        fprintf(stderr, "\t[JPEG_testsuite] mm_util_decode_from_jpeg_memory_with_downscale failed %d\n", ret);
                        return FALSE;

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 493e2a4..94550b4 100755 (executable)
--- a/packaging/libmm-utility.spec
+++ b/packaging/libmm-utility.spec
@@ -1,6 +1,6 @@
 Name:       libmm-utility
 Summary:    Multimedia Framework Utility Library
-Version:    0.1.24
+Version:    0.1.25
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0