Rearrange 'ImageInfo' variables

Change-Id: I4cc4521edfcc8cfabd4780bc2d0742dc6994a8b1

diff --git a/magick/mm_util_magick.c b/magick/mm_util_magick.c
index 2faf917..acac0cc 100644 (file)
--- a/magick/mm_util_magick.c
+++ b/magick/mm_util_magick.c
@@ -215,7 +215,7 @@ static Image * __mm_util_resize_image(Image *image, unsigned int width, unsigned
        return _processed_image;
 }
 
-static Image * __mm_util_read_image_from_file(const char *path, ImageInfo **image_info)
+static Image * __mm_util_read_image_from_file(const char *path)
 {
        ImageInfo *_image_info = NULL;
        Image *_image = NULL;
@@ -224,11 +224,11 @@ static Image * __mm_util_read_image_from_file(const char *path, ImageInfo **imag
        mm_util_fenter();
 
        mm_util_retvm_if(!MMUTIL_STRING_VALID(path), NULL, "invalid path");
-       mm_util_retvm_if(image_info == NULL, NULL, "invalid image_info");
 
        GetExceptionInfo(&exception);
 
        _image_info = CloneImageInfo(0);
+       mm_util_retvm_if(!_image_info, NULL, "Error: CloneImageInfo failed.");
        g_strlcpy(_image_info->filename, path, sizeof(_image_info->filename));
 
        AddDefinition(_image_info, "jpeg", "dct-method", "FASTEST", &exception);
@@ -241,12 +241,9 @@ static Image * __mm_util_read_image_from_file(const char *path, ImageInfo **imag
                mm_util_error("Error: Reading Image failed.");
                if (exception.severity != UndefinedException)
                        CatchException(&exception);
-
-               DestroyImageInfo(_image_info);
-       } else {
-               *image_info = _image_info;
        }
 
+       DestroyImageInfo(_image_info);
        DestroyExceptionInfo(&exception);
 
        mm_util_fleave();
@@ -254,31 +251,34 @@ static Image * __mm_util_read_image_from_file(const char *path, ImageInfo **imag
        return _image;
 }
 
-static int __mm_util_write_image_to_file(ImageInfo *image_info, Image *image, const char *out_path)
+static int __mm_util_write_image_to_file(Image *image, const char *out_path)
 {
        int ret = MM_UTIL_ERROR_NONE;
+       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
 
        mm_util_fenter();
 
-       mm_util_retvm_if(image_info == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid image_info");
        mm_util_retvm_if(image == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid image");
        mm_util_retvm_if(!MMUTIL_STRING_VALID(out_path), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid out_path");
 
        GetExceptionInfo(&exception);
 
+       _image_info = CloneImageInfo(0);
+       mm_util_retvm_if(_image_info == NULL, MM_UTIL_ERROR_INVALID_OPERATION, "Error: CloneImageInfo failed.");
+
        SAFE_STRLCPY(image->filename, out_path, sizeof(image->filename));
        image->filename[MaxTextExtent-1] = '\0';
 
-       AddDefinition(image_info, "jpeg", "dct-method", "FASTEST", &exception);
-       AddDefinition(image_info, "jpeg", "optimize-coding", "FALSE", &exception);
+       AddDefinition(_image_info, "jpeg", "dct-method", "FASTEST", &exception);
+       AddDefinition(_image_info, "jpeg", "optimize-coding", "FALSE", &exception);
        //DeleteImageProfile(image, "EXIF");
        DeleteImageProfile(image, "8BIM");
        DeleteImageProfile(image, "ICM");
        DeleteImageProfile(image, "IPTC");
        DeleteImageProfile(image, "XMP");
 
-       if (WriteImage (image_info, image) == MagickFalse) {
+       if (WriteImage (_image_info, image) == MagickFalse) {
                mm_util_error("Error: Writing Image failed.");
                if (exception.severity != UndefinedException)
                        CatchException(&exception);
@@ -286,6 +286,7 @@ static int __mm_util_write_image_to_file(ImageInfo *image_info, Image *image, co
                ret = MM_UTIL_ERROR_INVALID_OPERATION;
        }
 
+       DestroyImageInfo(_image_info);
        DestroyExceptionInfo(&exception);
 
        mm_util_fleave();
@@ -409,7 +410,6 @@ int mm_util_rotate_B_P(mm_util_image_h src_handle, mm_util_magick_rotate_type an
        char *map = NULL;
        Image *_image = NULL;
        Image *_processed_image = NULL;
-       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
 
        mm_util_retvm_if(src_handle == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid handle");
@@ -437,12 +437,11 @@ int mm_util_rotate_B_P(mm_util_image_h src_handle, mm_util_magick_rotate_type an
                goto ERROR;
        }
 
-       _image_info = CloneImageInfo(0);
-       ret = __mm_util_write_image_to_file(_image_info, _processed_image, dst_path);
+       ret = __mm_util_write_image_to_file(_processed_image, dst_path);
 
 ERROR:
 
-       __mm_util_finalize(_image, _processed_image, _image_info, &exception);
+       __mm_util_finalize(_image, _processed_image, NULL, &exception);
 
        MMUTIL_SAFE_FREE(map);
 
@@ -457,7 +456,6 @@ int mm_util_rotate_P_B(const char *src_path, mm_util_magick_rotate_type angle, m
        char *map = NULL;
        Image *_image = NULL;
        Image *_processed_image = NULL;
-       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
        size_t pixels_size = 0;
        void *pixels = 0;
@@ -473,7 +471,7 @@ int mm_util_rotate_P_B(const char *src_path, mm_util_magick_rotate_type angle, m
 
        __mm_util_init(&exception);
 
-       _image = __mm_util_read_image_from_file(src_path, &_image_info);
+       _image = __mm_util_read_image_from_file(src_path);
        if (_image == NULL) {
                mm_util_error("Error: __mm_util_read_image_from_file failed.");
                ret = MM_UTIL_ERROR_INVALID_OPERATION;
@@ -502,7 +500,7 @@ int mm_util_rotate_P_B(const char *src_path, mm_util_magick_rotate_type angle, m
 
 ERROR:
 
-       __mm_util_finalize(_image, _processed_image, _image_info, &exception);
+       __mm_util_finalize(_image, _processed_image, NULL, &exception);
 
        MMUTIL_SAFE_FREE(map);
 
@@ -517,7 +515,6 @@ int mm_util_rotate_P_P(const char *src_path, mm_util_magick_rotate_type angle, c
        int ret = MM_UTIL_ERROR_NONE;
        Image *_image = NULL;
        Image *_processed_image = NULL;
-       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
 
        mm_util_retvm_if(!MMUTIL_STRING_VALID(src_path), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src_path");
@@ -528,7 +525,7 @@ int mm_util_rotate_P_P(const char *src_path, mm_util_magick_rotate_type angle, c
 
        __mm_util_init(&exception);
 
-       _image = __mm_util_read_image_from_file(src_path, &_image_info);
+       _image = __mm_util_read_image_from_file(src_path);
        if (_image == NULL) {
                mm_util_error("Error: __mm_util_read_image_from_file failed.");
                ret = MM_UTIL_ERROR_INVALID_OPERATION;
@@ -542,11 +539,11 @@ int mm_util_rotate_P_P(const char *src_path, mm_util_magick_rotate_type angle, c
                goto ERROR;
        }
 
-       ret = __mm_util_write_image_to_file(_image_info, _processed_image, dst_path);
+       ret = __mm_util_write_image_to_file(_processed_image, dst_path);
 
 ERROR:
 
-       __mm_util_finalize(_image, _processed_image, _image_info, &exception);
+       __mm_util_finalize(_image, _processed_image, NULL, &exception);
 
        mm_util_fleave();
 
@@ -626,7 +623,6 @@ int mm_util_resize_B_P(mm_util_image_h src_handle, unsigned int req_width, unsig
        char *map = NULL;
        Image *_image = NULL;
        Image *_processed_image = NULL;
-       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
 
        mm_util_retvm_if(src_handle == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid handle");
@@ -660,12 +656,11 @@ int mm_util_resize_B_P(mm_util_image_h src_handle, unsigned int req_width, unsig
                goto ERROR;
        }
 
-       _image_info = CloneImageInfo(0);
-       ret = __mm_util_write_image_to_file(_image_info, _processed_image, dst_path);
+       ret = __mm_util_write_image_to_file(_processed_image, dst_path);
 
 ERROR:
 
-       __mm_util_finalize(_image, _processed_image, _image_info, &exception);
+       __mm_util_finalize(_image, _processed_image, NULL, &exception);
 
        MMUTIL_SAFE_FREE(map);
 
@@ -680,7 +675,6 @@ int mm_util_resize_P_B(const char *src_path, unsigned int req_width, unsigned in
        char *map = NULL;
        Image *_image = NULL;
        Image *_processed_image = NULL;
-       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
        size_t pixels_size = 0;
        void *pixels = 0;
@@ -696,7 +690,7 @@ int mm_util_resize_P_B(const char *src_path, unsigned int req_width, unsigned in
 
        __mm_util_init(&exception);
 
-       _image = __mm_util_read_image_from_file(src_path, &_image_info);
+       _image = __mm_util_read_image_from_file(src_path);
        if (_image == NULL) {
                mm_util_error("Error: __mm_util_read_image_from_file failed.");
                ret = MM_UTIL_ERROR_INVALID_OPERATION;
@@ -731,7 +725,7 @@ int mm_util_resize_P_B(const char *src_path, unsigned int req_width, unsigned in
 
 ERROR:
 
-       __mm_util_finalize(_image, _processed_image, _image_info, &exception);
+       __mm_util_finalize(_image, _processed_image, NULL, &exception);
 
        MMUTIL_SAFE_FREE(map);
 
@@ -745,7 +739,6 @@ int mm_util_resize_P_P(const char *src_path, unsigned int req_width, unsigned in
        int ret = MM_UTIL_ERROR_NONE;
        Image *_image = NULL;
        Image *_processed_image = NULL;
-       ImageInfo *_image_info = NULL;
        ExceptionInfo exception;
 
        mm_util_retvm_if(!MMUTIL_STRING_VALID(src_path), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src_path");
@@ -756,7 +749,7 @@ int mm_util_resize_P_P(const char *src_path, unsigned int req_width, unsigned in
 
        __mm_util_init(&exception);
 
-       _image = __mm_util_read_image_from_file(src_path, &_image_info);
+       _image = __mm_util_read_image_from_file(src_path);
        if (_image == NULL) {
                mm_util_error("Error: __mm_util_read_image_from_file failed.");
                ret = MM_UTIL_ERROR_INVALID_OPERATION;
@@ -776,11 +769,11 @@ int mm_util_resize_P_P(const char *src_path, unsigned int req_width, unsigned in
                goto ERROR;
        }
 
-       ret = __mm_util_write_image_to_file(_image_info, _processed_image, dst_path);
+       ret = __mm_util_write_image_to_file(_processed_image, dst_path);
 
 ERROR:
 
-       __mm_util_finalize(_image, _processed_image, _image_info, &exception);
+       __mm_util_finalize(_image, _processed_image, NULL, &exception);
 
        mm_util_fleave();