Move function to define

Change-Id: I47b4b3bea73bfe64de3ce0a76ccc2daeac4c2ac8
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/common/include/mm_util_private.h b/common/include/mm_util_private.h
index ba845e9..c2038e7 100644 (file)
--- a/common/include/mm_util_private.h
+++ b/common/include/mm_util_private.h
@@ -43,7 +43,7 @@ extern "C" {
                x = NULL; \
        } while(0)
 #define MMUTIL_SAFE_STRCPY(dst, src, n)  g_strlcpy(dst, src, n)
-#define MMUTIL_STRING_VALID(str)         (str != NULL && strlen(str) > 0)
+#define MMUTIL_STRING_VALID(str)       (str != NULL && strlen(str) > 0)
 
 /* for alignment */
 #define MM_UTIL_ROUND_UP_2(num) (((num)+1)&~1)
@@ -53,7 +53,7 @@ extern "C" {
 #define MM_UTIL_ROUND_DOWN_4(num) ((num)&(~3))
 #define MM_UTIL_ROUND_DOWN_16(num) ((num)&(~15))
 
-#define IS_VALID_COLOR(color)  mm_util_is_valid_color_format(color)
+#define IS_VALID_COLOR(color)  ((color >= MM_UTIL_COLOR_YUV420) && (color < MM_UTIL_COLOR_NUM))
 #define IS_VALID_IMAGE(image)  mm_image_is_valid_image(image)
 
 typedef int (*ANIM_ENC_CREATE)(void *);
@@ -82,8 +82,6 @@ typedef struct {
        bool lossless;
 } mm_util_enc_opt_t;
 
-bool mm_util_is_valid_color_format(mm_util_color_format_e color);
-
 // for using fp like jpeg
 int mm_util_safe_fopen(const char *path, const char *mode, FILE **fp);
 void mm_util_safe_fclose(FILE *fp);

diff --git a/common/mm_util_private.c b/common/mm_util_private.c
index 450e4af..cbe5551 100644 (file)
--- a/common/mm_util_private.c
+++ b/common/mm_util_private.c
@@ -26,14 +26,6 @@
 
 #define IMAGE_UTIL_INI_PATH SYSCONFDIR"/multimedia/mmfw_image_util.ini"
 
-bool mm_util_is_valid_color_format(mm_util_color_format_e color)
-{
-       if ((color < MM_UTIL_COLOR_YUV420) || (color >= MM_UTIL_COLOR_NUM)) {
-               return false;
-       }
-       return true;
-}
-
 int mm_util_safe_fopen(const char *path, const char *mode, FILE **fp)
 {
        char *_realpath = NULL;

diff --git a/imgp/mm_util_imgp.c b/imgp/mm_util_imgp.c
index 62ba1fc..e8876b5 100644 (file)
--- a/imgp/mm_util_imgp.c
+++ b/imgp/mm_util_imgp.c
@@ -100,7 +100,7 @@ static int __mm_util_get_image_size(mm_util_color_format_e format, unsigned int
        mm_util_fenter();
 
        mm_util_retvm_if(imgsize == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid imgsize");
-       mm_util_retvm_if(IS_VALID_COLOR(format) == false, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid format(%u)", format);
+       mm_util_retvm_if(!IS_VALID_COLOR(format), MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid format(%u)", format);
        mm_util_retvm_if(__check_valid_picture_size(width, height) != MM_UTIL_ERROR_NONE, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid width(%u) or height(%u)", width, height);
 
        switch (format) {

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 04e72f6..70087a4 100644 (file)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -578,7 +578,7 @@ int mm_util_decode_from_jpeg_file(const char *file_path, mm_util_color_format_e
        mm_util_fenter();
 
        mm_util_retvm_if(!MMUTIL_STRING_VALID(file_path), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid file_path");
-       mm_util_retvm_if((IS_VALID_COLOR(fmt) == false), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid fmt [%d]", fmt);
+       mm_util_retvm_if(!IS_VALID_COLOR(fmt), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid fmt [%d]", fmt);
        mm_util_retvm_if((!__mm_util_is_supported_color_format(fmt)), MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "not supported fmt [%d]", fmt);
        mm_util_retvm_if(!decoded, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid image handle");
 
@@ -616,7 +616,7 @@ int mm_util_decode_from_jpeg_memory(void *memory, const size_t src_size, mm_util
 
        mm_util_retvm_if(!memory, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid jpeg image");
        mm_util_retvm_if(!src_size, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src_size");
-       mm_util_retvm_if((IS_VALID_COLOR(fmt) == false), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid fmt [%d]", fmt);
+       mm_util_retvm_if(!IS_VALID_COLOR(fmt), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid fmt [%d]", fmt);
        mm_util_retvm_if((!__mm_util_is_supported_color_format(fmt)), MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "not supported fmt [%d]", fmt);
        mm_util_retvm_if(!decoded, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid image handle");