Code Refactoring - remove unneccessary extern function

Change-Id: Idbffd3ce9337a9b73e4a06b35a736f7b5ef2ab0d
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/png/include/mm_util_png.h b/png/include/mm_util_png.h
index d56d0e05f611ed048e0e007db972b78bcf9be7a2..b028359a2cc8cf3f086617441790d84d198bc600 100755 (executable)
--- a/png/include/mm_util_png.h
+++ b/png/include/mm_util_png.h
@@ -97,18 +97,6 @@ int mm_util_decode_from_png_file(mm_util_png_data * decoded, const char *fpath);
  */
 int mm_util_decode_from_png_memory(mm_util_png_data * decoded, void *memory, unsigned long long src_size);
 
-/**
- * This function initializes the values of mm_util_png.
- * This function should be called before calling the actual decoding.
- *
- * @param data  [in]     pointer of mm_util_png_data.
- * @return               None.
- * @remark
- * @see                  mm_util_png, mm_util_png_data, mm_util_decode_from_png_file, mm_util_decode_from_png_memory
- * @since                R1, 1.0
- */
-void mm_util_init_decode_png(mm_util_png_data * data);
-
 /**
  * This function extracts raw data to png file
  *
@@ -138,18 +126,6 @@ int mm_util_encode_to_png_file(void **data, mm_util_png_data * encoded, const ch
  */
 int mm_util_encode_to_png_memory(void **data, mm_util_png_data * encoded, mm_util_png_compression compression_level);
 
-/**
- * This function initializes the values of mm_util_png.
- * This function should be called before calling the actual encoding.
- *
- * @param data  [in]     pointer of mm_util_png_data.
- * @return               None.
- * @remark
- * @see                  mm_util_png, mm_util_png_data, mm_util_encode_to_png_file, mm_util_encode_to_png_memory
- * @since                R1, 1.0
- */
-void mm_util_init_encode_png(mm_util_png_data * data);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/png/mm_util_png.c b/png/mm_util_png.c
index eb87f041c5c910381e699f9b41f1a173699ab1ed..58599f41033bc76af000b9e8efa3d567c9682bf1 100755 (executable)
--- a/png/mm_util_png.c
+++ b/png/mm_util_png.c
@@ -110,6 +110,12 @@ static void __read_function(png_structp png_ptr, png_bytep data, png_size_t size
        }
 }
 
+void __init_decode_png(mm_util_png *png)
+{
+       mm_util_debug("mm_util_init_decode_png");
+       png->transform = PNG_TRANSFORM_IDENTITY;
+}
+
 static int __read_png(mm_util_png_data *decoded, FILE * fp, void *memory)
 {
        png_structp png_ptr;
@@ -119,6 +125,7 @@ static int __read_png(mm_util_png_data *decoded, FILE * fp, void *memory)
 
        mm_util_debug("__read_png");
        decoded->data = NULL;
+       __init_decode_png(&decoded->png);
 
        png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp) NULL, __user_error_fn, __user_warning_fn);
 
@@ -212,12 +219,6 @@ int mm_util_decode_from_png_memory(mm_util_png_data *decoded, void *memory, unsi
        return ret;
 }
 
-void mm_util_init_decode_png(mm_util_png_data *data)
-{
-       mm_util_debug("mm_util_init_decode_png");
-       data->png.transform = PNG_TRANSFORM_IDENTITY;
-}
-
 static void user_flush_data(png_structp png_ptr G_GNUC_UNUSED)
 {
        /* do nothing */
@@ -235,6 +236,17 @@ static void user_write_data(png_structp png_ptr, png_bytep data, png_uint_32 len
        }
 }
 
+void __init_encode_png(mm_util_png *png)
+{
+       mm_util_debug("mm_util_init_encode_png");
+       png->compression_level = MM_UTIL_COMPRESSION_6;
+       png->filter = PNG_FILTER_NONE;
+       png->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+       png->filter_type = PNG_FILTER_TYPE_BASE;
+       png->interlace_type = PNG_INTERLACE_NONE;
+       png->bit_depth = MM_UTIL_BIT_DEPTH_8;
+}
+
 int write_png(void **data, mm_util_png_data *encoded, FILE *fp, mm_util_png_compression compression_level)
 {
        png_structp png_ptr;
@@ -245,6 +257,8 @@ int write_png(void **data, mm_util_png_data *encoded, FILE *fp, mm_util_png_comp
        mm_util_debug("write_png");
        encoded->data = NULL;
        encoded->size = 0;
+
+       __init_encode_png(&encoded->png);
        encoded->png.compression_level = compression_level;
 
        png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp) NULL, __user_error_fn, __user_warning_fn);
@@ -339,14 +353,3 @@ int mm_util_encode_to_png_memory(void **data, mm_util_png_data *encoded, mm_util
 
        return ret;
 }
-
-void mm_util_init_encode_png(mm_util_png_data *data)
-{
-       mm_util_debug("mm_util_init_encode_png");
-       data->png.compression_level = MM_UTIL_COMPRESSION_6;
-       data->png.filter = PNG_FILTER_NONE;
-       data->png.color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-       data->png.filter_type = PNG_FILTER_TYPE_BASE;
-       data->png.interlace_type = PNG_INTERLACE_NONE;
-       data->png.bit_depth = MM_UTIL_BIT_DEPTH_8;
-}

diff --git a/png/test/mm_util_png_testsuite.c b/png/test/mm_util_png_testsuite.c
index 79dfe5f5a16efbf1394b13a8a36f2f63efe951ad..c279ebd03c8a6b8eb7a14a9497aae5ee95b7b535 100755 (executable)
--- a/png/test/mm_util_png_testsuite.c
+++ b/png/test/mm_util_png_testsuite.c
@@ -137,11 +137,9 @@ int main(int argc, char *argv[])
        }
 
        if (!strcmp("decode", argv[1])) {
-               mm_util_init_decode_png(&decoded_data);
                ret = mm_util_decode_from_png_file(&decoded_data, argv[2]);
        } else if (!strcmp("decode-mem", argv[1])) {
                if (_read_file(argv[2], &src, &src_size)) {
-                       mm_util_init_decode_png(&decoded_data);
                        ret = mm_util_decode_from_png_memory(&decoded_data, &src, src_size);
 
                        free(src);
@@ -170,7 +168,6 @@ int main(int argc, char *argv[])
                                data = calloc(1, decoded_data.size);
                                memcpy(data, decoded_data.data, decoded_data.size);
 
-                               mm_util_init_encode_png(&encoded_data);
                                if (argv[3])
                                        compression = atoi(argv[3]);