Bump version to 0.1.33

 - decode/encode jpeg has been improved to reduce Cyclomatic Complexity

Change-Id: I083ed3f76b7c9608c77aa7dd5128d9212695c78d

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 4a876c2585a65b7adb8f42092a04a3ee5e6e1969..c3d77e6baac1fa1de42362474aa1c89787b84c7a 100644 (file)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -36,7 +36,7 @@
 typedef enum {
        MM_UTIL_JPEG_FILE,
        MM_UTIL_JPEG_MEM,
-} mm_util_jpeg_cont_format_e;
+} mm_util_jpeg_ctrl_format_e;
 
 typedef struct my_error_mgr_s {
        struct jpeg_error_mgr pub; /* "public" fields */
@@ -138,7 +138,7 @@ static void __jpeg_convert_rgb_colorspace(mm_util_color_format_e mm_color_format
                *j_color_comp = pixel_depth;
 }
 
-static void __jpeg_encode_open(j_compress_ptr cinfo, mm_util_jpeg_cont_format_e control_format, FILE *fp, void **mem, unsigned long *size)
+static void __jpeg_encode_open(j_compress_ptr cinfo, mm_util_jpeg_ctrl_format_e control_format, FILE *fp, void **mem, unsigned long *size)
 {
        if (control_format == MM_UTIL_JPEG_FILE) {
                jpeg_stdio_dest(cinfo, fp);
@@ -149,7 +149,7 @@ static void __jpeg_encode_open(j_compress_ptr cinfo, mm_util_jpeg_cont_format_e
        }
 }
 
-static void __jpeg_decode_open(j_decompress_ptr dinfo, mm_util_jpeg_cont_format_e control_format, FILE *fp, void *src, unsigned long size)
+static void __jpeg_decode_open(j_decompress_ptr dinfo, mm_util_jpeg_ctrl_format_e control_format, FILE *fp, void *src, unsigned long size)
 {
        /*specify data source (eg, a file) */
        if (control_format == MM_UTIL_JPEG_FILE) {
@@ -194,7 +194,7 @@ static int __jpeg_decode_get_buffer_size(j_decompress_ptr dinfo, unsigned int ro
                *size = dinfo->output_height * dinfo->output_width * 2;
        } else if (color_format == MM_UTIL_COLOR_GRAYSCALE) {
                *size = dinfo->output_height * dinfo->output_width;
-       } else{
+       } else {
                mm_util_error("[%d] We can't decode the IMAGE format", color_format);
                return MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT;
        }
@@ -269,7 +269,7 @@ static int __jpeg_encode_yuv(j_compress_ptr cinfo, unsigned int width, unsigned
        return MM_UTIL_ERROR_NONE;
 }
 
-static int _mm_util_jpeg_encode(mm_util_jpeg_cont_format_e control_format, mm_util_image_h decoded, int quality, FILE *fp, void **mem, size_t *csize)
+static int _mm_util_jpeg_encode(mm_util_jpeg_ctrl_format_e control_format, mm_util_image_h decoded, int quality, FILE *fp, void **mem, size_t *csize)
 {
        int ret = MM_UTIL_ERROR_NONE;
        mm_image_info_s *_decoded = (mm_image_info_s *)decoded;
@@ -366,7 +366,7 @@ static int _mm_util_jpeg_encode(mm_util_jpeg_cont_format_e control_format, mm_ut
        return ret;
 }
 
-static int _mm_util_jpeg_decode(mm_util_jpeg_cont_format_e control_format, FILE *fp, void *src, size_t size, mm_util_color_format_e color_format, mm_util_jpeg_decode_downscale downscale, mm_util_image_h *decoded)
+static int _mm_util_jpeg_decode(mm_util_jpeg_ctrl_format_e control_format, FILE *fp, void *src, size_t size, mm_util_color_format_e color_format, mm_util_jpeg_decode_downscale downscale, mm_util_image_h *decoded)
 {
        int ret = MM_UTIL_ERROR_NONE;
        struct jpeg_decompress_struct dinfo;

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index f189a48f2134c1bfb72ae59f66e501505a0cbf6b..3614673941d9c3cef0598c796f7bd8a013937f5e 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.32
+Version:    0.1.33
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0