Remove mm_util_gif_encode_set_resolution(). because resolution can be set without...

Change-Id: Ic882d279d3e8c87410b4f3328b2de929cc434cdd

diff --git a/gif/include/mm_util_gif.h b/gif/include/mm_util_gif.h
index 816033a..e729486 100755 (executable)
--- a/gif/include/mm_util_gif.h
+++ b/gif/include/mm_util_gif.h
@@ -58,7 +58,6 @@ int mm_util_encode_to_gif_memory(mm_image_info_s **images, const unsigned int im
 int mm_util_gif_encode_create(mm_gif_file_h *gif_file_h);
 int mm_util_gif_encode_set_file(mm_gif_file_h gif_file_h, const char *file_name);
 int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, size_t *data_size);
-int mm_util_gif_encode_start(mm_gif_file_h gif_file_h);
 int mm_util_gif_encode_add_image(mm_gif_file_h gif_file_h, mm_image_info_s * gif_image_h);
 int mm_util_gif_encode_save(mm_gif_file_h gif_file_h);
 void mm_util_gif_encode_destroy(mm_gif_file_h gif_file_h);

diff --git a/gif/include/mm_util_gif_private.h b/gif/include/mm_util_gif_private.h
old mode 100644 (file)
new mode 100755 (executable)
index 6e1c93d..9e4700a
--- a/gif/include/mm_util_gif_private.h
+++ b/gif/include/mm_util_gif_private.h
@@ -42,9 +42,6 @@ typedef struct {
        unsigned char *buffer;
        gif_mem_s write_data_ptr;                 /**< Encoded output data attached to callback */
        gboolean is_started;
-
-       GifWord width;
-       GifWord height;
 } gif_file_s;
 
 #ifdef __cplusplus

diff --git a/gif/mm_util_gif.c b/gif/mm_util_gif.c
index 9afd20b..d2c4de1 100755 (executable)
--- a/gif/mm_util_gif.c
+++ b/gif/mm_util_gif.c
@@ -601,24 +601,7 @@ int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, size_t *da
        return MM_UTIL_ERROR_NONE;
 }
 
-int mm_util_gif_encode_set_resolution(mm_gif_file_h gif_file_h, const int width, const int height)
-{
-       gif_file_s *gif_file = (gif_file_s *)gif_file_h;
-
-       mm_util_retvm_if(gif_file == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
-       mm_util_retvm_if(width <= 0, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
-       mm_util_retvm_if(height <= 0, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
-       mm_util_retvm_if(gif_file->is_started, MM_UTIL_ERROR_INVALID_OPERATION, "Encoding has already started");
-
-       mm_util_info("w = %d, h = %d", width, height);
-
-       gif_file->width = width;
-       gif_file->height = height;
-
-       return MM_UTIL_ERROR_NONE;
-}
-
-int mm_util_gif_encode_start(mm_gif_file_h gif_file_h)
+static int _mm_util_gif_encode_start(mm_gif_file_h gif_file_h, unsigned long width, unsigned long height)
 {
        int ret = MM_UTIL_ERROR_NONE;
        gif_file_s *gif_file = (gif_file_s *)gif_file_h;
@@ -643,8 +626,7 @@ int mm_util_gif_encode_start(mm_gif_file_h gif_file_h)
        EGifSetGifVersion(gif_file->GifFile, TRUE);
 
        /* Write screen description */
-       if (EGifPutScreenDesc(gif_file->GifFile, gif_file->width, gif_file->height,
-               8 /* color_res */, 0 /* background_color */, NULL) == GIF_ERROR) {
+       if (EGifPutScreenDesc(gif_file->GifFile, width, height, 8 /* color_res */, 0 /* background_color */, NULL) == GIF_ERROR) {
                mm_util_error("could not put screen description");
                _gif_encode_close_file(gif_file->GifFile);
                return MM_UTIL_ERROR_INVALID_OPERATION;
@@ -668,12 +650,9 @@ int mm_util_gif_encode_add_image(mm_gif_file_h gif_file_h, mm_image_info_s *gif_
        mm_util_retvm_if(gif_image->data == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
        if (gif_file->is_started == FALSE) {
-               ret = mm_util_gif_encode_set_resolution(gif_file_h, gif_image->width, gif_image->height);
-               mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_set_file failed %d", ret);
-
-               mm_util_warn("first added image, mm_util_gif_encode_start is needed");
-               ret = mm_util_gif_encode_start(gif_file_h);
-               mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_start failed");
+               mm_util_warn("first added image, _mm_util_gif_encode_start is needed");
+               ret = _mm_util_gif_encode_start(gif_file_h, gif_image->width, gif_image->height);
+               mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "_mm_util_gif_encode_start failed");
        }
 
        /* Write graphic control block */
@@ -735,12 +714,9 @@ int mm_util_encode_to_gif_file(mm_image_info_s **images, const unsigned int imag
        ret = mm_util_gif_encode_set_file(gif_file_h, path);
        mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_set_file failed %d", ret);
 
-       ret = mm_util_gif_encode_set_resolution(gif_file_h, images[0]->width, images[0]->height);
-       mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_set_file failed %d", ret);
-
        /* this way is for image_util_encode_run(), remove it later */
-       ret = mm_util_gif_encode_start(gif_file_h);
-       mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_start failed");
+       ret = _mm_util_gif_encode_start(gif_file_h, images[0]->width, images[0]->height);
+       mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "_mm_util_gif_encode_start failed");
 
        for (i = 0; i < image_count; i++) {
                ret = mm_util_gif_encode_add_image(gif_file_h, images[i]);
@@ -769,12 +745,9 @@ int mm_util_encode_to_gif_memory(mm_image_info_s **images, const unsigned int im
        ret = mm_util_gif_encode_set_mem(gif_file_h, buffer, size);
        mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_set_mem failed %d", ret);
 
-       ret = mm_util_gif_encode_set_resolution(gif_file_h, images[0]->width, images[0]->height);
-       mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_set_file failed %d", ret);
-
        /* this way is for image_util_encode_run(), remove it later */
-       ret = mm_util_gif_encode_start(gif_file_h);
-       mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_start failed");
+       ret = _mm_util_gif_encode_start(gif_file_h, images[0]->width, images[0]->height);
+       mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "_mm_util_gif_encode_start failed");
 
        for (i = 0; i < image_count; i++) {
                ret = mm_util_gif_encode_add_image(gif_file_h, images[i]);