[ACR-1374] Change typedef of handle

The type of handle is common type. It can be already in use.
So we will change it to 'typedef void *image_util_image_h'.

Change-Id: Ie9b36a1788c2c958a81c07ccbd7b85e6d3c3aad8

diff --git a/include/image_util.h b/include/image_util.h
index cf2a28712c62f1d2c6cd6f727392ba1182a10a04..fb1bfded272c597556fc3bd88ec529d865661492 100755 (executable)
--- a/include/image_util.h
+++ b/include/image_util.h
@@ -382,7 +382,7 @@ int image_util_transform_run(transformation_h handle, media_packet_h src, image_
 * @see image_util_transform_set_rotation()
 * @see image_util_transform_set_crop_area()
 */
-int image_util_transform_run2(transformation_h handle, image_h src, image_h *dst);
+int image_util_transform_run2(transformation_h handle, image_util_image_h src, image_util_image_h *dst);
 
 /**
 * @brief Transforms an image with given transformation handle.
@@ -415,7 +415,7 @@ int image_util_transform_run2(transformation_h handle, image_h src, image_h *dst
 * @see image_util_transform_set_crop_area()
 * @see image_util_transform_completed2_cb()
 */
-int image_util_transform_run2_async(transformation_h handle, image_h src, image_util_transform_completed2_cb callback, void *user_data);
+int image_util_transform_run2_async(transformation_h handle, image_util_image_h src, image_util_transform_completed2_cb callback, void *user_data);
 
 /**
 * @brief Destroys a handle to image util.
@@ -461,7 +461,7 @@ int image_util_transform_destroy(transformation_h handle);
 * @see image_util_get_image()
 * @see image_util_clone_image()
 */
-int image_util_create_image(unsigned int width, unsigned int height, image_util_colorspace_e colorspace, const unsigned char *data, size_t data_size, image_h *image);
+int image_util_create_image(unsigned int width, unsigned int height, image_util_colorspace_e colorspace, const unsigned char *data, size_t data_size, image_util_image_h *image);
 
 /**
 * @brief Clones a image handle.
@@ -482,7 +482,7 @@ int image_util_create_image(unsigned int width, unsigned int height, image_util_
 * @see image_util_destroy_image()
 * @see image_util_get_image()
 */
-int image_util_clone_image(image_h src, image_h *dst);
+int image_util_clone_image(image_util_image_h src, image_util_image_h *dst);
 
 /**
 * @brief Gets the information from the image.
@@ -506,7 +506,7 @@ int image_util_clone_image(image_h src, image_h *dst);
 *
 * @see image_util_create_image()
 */
-int image_util_get_image(image_h image, unsigned int *width, unsigned int *height, image_util_colorspace_e *colorspace, unsigned char **data, size_t *data_size);
+int image_util_get_image(image_util_image_h image, unsigned int *width, unsigned int *height, image_util_colorspace_e *colorspace, unsigned char **data, size_t *data_size);
 
 /**
 * @brief Destroys a image handle.
@@ -524,7 +524,7 @@ int image_util_get_image(image_h image, unsigned int *width, unsigned int *heigh
 *
 * @see image_util_create_image()
 */
-int image_util_destroy_image(image_h image);
+int image_util_destroy_image(image_util_image_h image);
 
 /**
  * @}

diff --git a/include/image_util_type.h b/include/image_util_type.h
index 2b246baef022123aa5345f6eacb68d28b6fc5e36..957500f1e1480c682b2eea033e8005ddc84663d6 100755 (executable)
--- a/include/image_util_type.h
+++ b/include/image_util_type.h
@@ -87,7 +87,7 @@ typedef enum {
 * @brief Image handle.
 * @since_tizen 5.5
 */
-typedef void *image_h;
+typedef void *image_util_image_h;
 
 /**
  * @}
@@ -151,7 +151,7 @@ typedef void(*image_util_transform_completed_cb)(media_packet_h *dst, int error_
 * @see image_util_transform_run2_async()
 * @see image_util_clone_image()
 */
-typedef void(*image_util_transform_completed2_cb)(image_h dst, int error_code, void *user_data);
+typedef void(*image_util_transform_completed2_cb)(image_util_image_h dst, int error_code, void *user_data);
 
 /**
  * @}

diff --git a/src/image_util.c b/src/image_util.c
index 11231c0d45e02a24a1ab90b2cf7ac8b5cbef7567..a0ea209e316222379976c79b63f510be959acdad 100644 (file)
--- a/src/image_util.c
+++ b/src/image_util.c
@@ -31,7 +31,7 @@ typedef struct {
 typedef struct {
        gboolean thread_stop;
        transformation_h transform;
-       image_h src;
+       image_util_image_h src;
        void *completed_cb;
        void *user_data;
        gboolean is_transform2;
@@ -156,12 +156,12 @@ static int __create_media_packet(media_format_h fmt, media_packet_h *new_pkt, vo
        return IMAGE_UTIL_ERROR_NONE;
 }
 
-static int __mm_util_transform(transformation_h handle, image_h origin, image_h *transform)
+static int __mm_util_transform(transformation_h handle, image_util_image_h origin, image_util_image_h *transform)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        transformation_s *_handle = (transformation_s *) handle;
-       image_h _src = origin;
-       image_h _dst = NULL;
+       image_util_image_h _src = origin;
+       image_util_image_h _dst = NULL;
 
        image_util_retvm_if(!handle, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
        image_util_retvm_if(!mm_image_is_valid_image(origin), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid origin");
@@ -201,7 +201,7 @@ static int __mm_util_transform(transformation_h handle, image_h origin, image_h
        return _image_error_capi(ret);
 }
 
-static int __image_util_image_to_packet(image_h image, media_packet_h *packet)
+static int __image_util_image_to_packet(image_util_image_h image, media_packet_h *packet)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        mm_util_color_format_e format = 0;
@@ -266,7 +266,7 @@ gpointer __transform_thread(gpointer data)
        image_util_transform_completed_cb callback = NULL;
        image_util_transform_completed2_cb callback_2 = NULL;
        media_packet_h _transformed_packet = NULL;
-       image_h _transformed_image = NULL;
+       image_util_image_h _transformed_image = NULL;
 
        image_util_fenter();
 
@@ -331,7 +331,7 @@ gpointer __transform_thread(gpointer data)
        return NULL;
 }
 
-static int __image_util_packet_to_image(media_packet_h packet, image_h *image)
+static int __image_util_packet_to_image(media_packet_h packet, image_util_image_h *image)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        media_format_mimetype_e mimetype = 0;
@@ -615,7 +615,7 @@ int image_util_transform_get_crop_area(transformation_h handle, unsigned int *st
        return IMAGE_UTIL_ERROR_NONE;
 }
 
-static int __mm_util_transform_async(transformation_h handle, image_h src, void *callback, void *user_data, gboolean is_transform2)
+static int __mm_util_transform_async(transformation_h handle, image_util_image_h src, void *callback, void *user_data, gboolean is_transform2)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        transformation_s *_handle = (transformation_s *)handle;
@@ -667,7 +667,7 @@ static int __mm_util_transform_async(transformation_h handle, image_h src, void
 int image_util_transform_run(transformation_h handle, media_packet_h src, image_util_transform_completed_cb callback, void *user_data)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
-       image_h _src = NULL;
+       image_util_image_h _src = NULL;
 
        ret = __image_util_packet_to_image(src, &_src);
        image_util_retvm_if(ret != IMAGE_UTIL_ERROR_NONE, ret, "Fail to __image_util_packet_to_image");
@@ -675,7 +675,7 @@ int image_util_transform_run(transformation_h handle, media_packet_h src, image_
        return __mm_util_transform_async(handle, _src, callback, user_data, FALSE);
 }
 
-int image_util_transform_run2(transformation_h handle, image_h src, image_h *dst)
+int image_util_transform_run2(transformation_h handle, image_util_image_h src, image_util_image_h *dst)
 {
        image_util_fenter();
 
@@ -684,7 +684,7 @@ int image_util_transform_run2(transformation_h handle, image_h src, image_h *dst
        return __mm_util_transform(handle, src, dst);
 }
 
-int image_util_transform_run2_async(transformation_h handle, image_h src, image_util_transform_completed2_cb callback, void *user_data)
+int image_util_transform_run2_async(transformation_h handle, image_util_image_h src, image_util_transform_completed2_cb callback, void *user_data)
 {
        return __mm_util_transform_async(handle, src, callback, user_data, TRUE);
 }
@@ -716,7 +716,7 @@ int image_util_transform_destroy(transformation_h handle)
        return IMAGE_UTIL_ERROR_NONE;
 }
 
-int image_util_create_image(unsigned int width, unsigned int height, image_util_colorspace_e colorspace, const unsigned char *data, size_t data_size, image_h *image)
+int image_util_create_image(unsigned int width, unsigned int height, image_util_colorspace_e colorspace, const unsigned char *data, size_t data_size, image_util_image_h *image)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
 
@@ -725,7 +725,7 @@ int image_util_create_image(unsigned int width, unsigned int height, image_util_
        return _image_error_capi(ret);
 }
 
-int image_util_clone_image(image_h src, image_h *dst)
+int image_util_clone_image(image_util_image_h src, image_util_image_h *dst)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
 
@@ -734,7 +734,7 @@ int image_util_clone_image(image_h src, image_h *dst)
        return _image_error_capi(ret);
 }
 
-int image_util_get_image(image_h image, unsigned int *width, unsigned int *height, image_util_colorspace_e *colorspace, unsigned char **data, size_t *data_size)
+int image_util_get_image(image_util_image_h image, unsigned int *width, unsigned int *height, image_util_colorspace_e *colorspace, unsigned char **data, size_t *data_size)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
 
@@ -743,7 +743,7 @@ int image_util_get_image(image_h image, unsigned int *width, unsigned int *heigh
        return _image_error_capi(ret);
 }
 
-int image_util_destroy_image(image_h image)
+int image_util_destroy_image(image_util_image_h image)
 {
        image_util_retvm_if(!image, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image");
 

diff --git a/test/image_util_test.c b/test/image_util_test.c
index 6dbd64ddce3b81803161f2283aef3f4195bb2e4d..a26fc74c935ace79f74402a3df1553e2fd1995b6 100644 (file)
--- a/test/image_util_test.c
+++ b/test/image_util_test.c
@@ -33,7 +33,7 @@
 GMainLoop *g_loop = NULL;
 transformation_h g_handle = NULL;
 static media_packet_h g_src_packet = NULL;
-static image_h g_src_image = NULL;
+static image_util_image_h g_src_image = NULL;
 char *g_path = NULL;
 unsigned int g_width = 0;
 unsigned int g_height = 0;
@@ -193,7 +193,7 @@ static gboolean __write_file(const char *path, void *data, size_t length)
        return TRUE;
 }
 
-static gboolean __save_image(image_h image)
+static gboolean __save_image(image_util_image_h image)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        char out_file[PATH_MAX] = { 0, };
@@ -219,7 +219,7 @@ static gboolean __save_image(image_h image)
        return TRUE;
 }
 
-void test_transform_completed2_cb(image_h image, image_util_error_e error, void *user_data)
+void test_transform_completed2_cb(image_util_image_h image, image_util_error_e error, void *user_data)
 {
        g_printf("completed_cb [%d][%d] \n", error, --g_request_count);
 
@@ -481,7 +481,7 @@ static void _transform(const char *cmd)
        }
 
        if (!strcmp("run2", cmd)) {
-               image_h transformed_image = NULL;
+               image_util_image_h transformed_image = NULL;
 
                ret = image_util_transform_run2(g_handle, g_src_image, &transformed_image);
                if (ret != IMAGE_UTIL_ERROR_NONE) {