Unify image info structures because All of them have same format

Change-Id: I168aac728f87dd922311cffed4e40857c938c3b7

diff --git a/src/image_util_decode.c b/src/image_util_decode.c
index 6eadc188c10707e0bcd2a5f5936659a8728a1bd8..5191427e0efb8e454ee0e2bd34c79ed32203bd21 100755 (executable)
--- a/src/image_util_decode.c
+++ b/src/image_util_decode.c
@@ -268,8 +268,8 @@ static int _image_util_decode_internal(decode_encode_s * _handle)
        switch (_handle->image_type) {
        case IMAGE_UTIL_JPEG:
                {
-                       mm_util_jpeg_yuv_data jpeg_data;
-                       memset(&jpeg_data, 0, sizeof(mm_util_jpeg_yuv_data));
+                       mm_image_info_s jpeg_data;
+                       memset(&jpeg_data, 0, sizeof(mm_image_info_s));
 
                        if (_handle->path)
                                        err = mm_util_decode_from_jpeg_file(_handle->path, TYPECAST_COLOR_BY_TYPE(_handle->colorspace, IMAGE_UTIL_JPEG), _convert_decode_scale_tbl[_handle->down_scale], &jpeg_data);
@@ -288,8 +288,8 @@ static int _image_util_decode_internal(decode_encode_s * _handle)
                break;
        case IMAGE_UTIL_PNG:
                {
-                       mm_util_png_data png_data;
-                       memset(&png_data, 0, sizeof(mm_util_png_data));
+                       mm_image_info_s png_data;
+                       memset(&png_data, 0, sizeof(mm_image_info_s));
 
                        if (_handle->path)
                                err = mm_util_decode_from_png_file(_handle->path, &png_data);
@@ -328,8 +328,8 @@ static int _image_util_decode_internal(decode_encode_s * _handle)
                break;
        case IMAGE_UTIL_BMP:
                {
-                       mm_util_bmp_data bmp_data;
-                       memset(&bmp_data, 0, sizeof(mm_util_bmp_data));
+                       mm_image_info_s bmp_data;
+                       memset(&bmp_data, 0, sizeof(mm_image_info_s));
 
                        if (_handle->path)
                                err = mm_util_decode_from_bmp_file(_handle->path, &bmp_data);

diff --git a/src/image_util_encode.c b/src/image_util_encode.c
index 7733bc0ee9bff0b23e09dd6f22955e746cfd5347..f02aeecb9fe856df39ef4eba40d327aa59cf7916 100755 (executable)
--- a/src/image_util_encode.c
+++ b/src/image_util_encode.c
@@ -62,7 +62,7 @@ static int _image_util_encode_create_jpeg_handle(decode_encode_s * handle)
 {
        image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       mm_util_jpeg_yuv_data *_handle = (mm_util_jpeg_yuv_data *) calloc(1, sizeof(mm_util_jpeg_yuv_data));
+       mm_image_info_s *_handle = (mm_image_info_s *) calloc(1, sizeof(mm_image_info_s));
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        handle->image_h = (mm_util_imgp_h) _handle;
@@ -76,7 +76,7 @@ static int _image_util_encode_create_png_handle(decode_encode_s * handle)
 {
        image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       mm_util_png_data *_handle = (mm_util_png_data *) calloc(1, sizeof(mm_util_png_data));
+       mm_image_info_s *_handle = (mm_image_info_s *) calloc(1, sizeof(mm_image_info_s));
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        handle->image_h = (mm_util_imgp_h) _handle;
@@ -104,7 +104,7 @@ static int _image_util_encode_create_bmp_handle(decode_encode_s * handle)
 {
        image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       mm_util_bmp_data *_handle = (mm_util_bmp_data *) calloc(1, sizeof(mm_util_bmp_data));
+       mm_image_info_s *_handle = (mm_image_info_s *) calloc(1, sizeof(mm_image_info_s));
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        handle->image_h = (mm_util_imgp_h) _handle;
@@ -173,14 +173,14 @@ int image_util_encode_set_resolution(image_util_encode_h handle, unsigned long w
        switch (_handle->image_type) {
        case IMAGE_UTIL_JPEG:
                {
-                       mm_util_jpeg_yuv_data *jpeg_data = (mm_util_jpeg_yuv_data *) _handle->image_h;
+                       mm_image_info_s *jpeg_data = (mm_image_info_s *) _handle->image_h;
                        jpeg_data->width = width;
                        jpeg_data->height = height;
                }
                break;
        case IMAGE_UTIL_PNG:
                {
-                       mm_util_png_data *png_data = (mm_util_png_data *) _handle->image_h;
+                       mm_image_info_s *png_data = (mm_image_info_s *) _handle->image_h;
                        png_data->width = width;
                        png_data->height = height;
                }
@@ -210,7 +210,7 @@ int image_util_encode_set_resolution(image_util_encode_h handle, unsigned long w
                break;
        case IMAGE_UTIL_BMP:
                {
-                       mm_util_bmp_data *bmp_data = (mm_util_bmp_data *) _handle->image_h;
+                       mm_image_info_s *bmp_data = (mm_image_info_s *) _handle->image_h;
                        bmp_data->width = width;
                        bmp_data->height = height;
                }
@@ -378,11 +378,11 @@ static int _image_util_encode_internal(decode_encode_s * _handle)
        switch (_handle->image_type) {
        case IMAGE_UTIL_JPEG:
                {
-                       mm_util_jpeg_yuv_data *jpeg_data = (mm_util_jpeg_yuv_data *) _handle->image_h;
+                       mm_image_info_s *jpeg_data = (mm_image_info_s *) _handle->image_h;
                        size_t size = 0;
 
                        jpeg_data->data = _handle->src_buffer[0];
-                       jpeg_data->format = TYPECAST_COLOR_BY_TYPE(_handle->colorspace, IMAGE_UTIL_JPEG);
+                       jpeg_data->color = TYPECAST_COLOR_BY_TYPE(_handle->colorspace, IMAGE_UTIL_JPEG);
 
                        if (_handle->path)
                                err = mm_util_jpeg_encode_to_file(jpeg_data, _handle->quality, _handle->path);
@@ -395,7 +395,7 @@ static int _image_util_encode_internal(decode_encode_s * _handle)
                break;
        case IMAGE_UTIL_PNG:
                {
-                       mm_util_png_data *png_data = (mm_util_png_data *) _handle->image_h;
+                       mm_image_info_s *png_data = (mm_image_info_s *) _handle->image_h;
                        size_t size = 0;
 
                        png_data->data = _handle->src_buffer[0];
@@ -437,7 +437,7 @@ static int _image_util_encode_internal(decode_encode_s * _handle)
                break;
        case IMAGE_UTIL_BMP:
                {
-                       mm_util_bmp_data *bmp_data = (mm_util_bmp_data *) _handle->image_h;
+                       mm_image_info_s *bmp_data = (mm_image_info_s *) _handle->image_h;
                        size_t size = 0;
 
                        bmp_data->data = _handle->src_buffer[0];