From: hj kim Date: Fri, 10 Jul 2020 04:16:18 +0000 (+0900) Subject: Move structures and typedef to proper file X-Git-Tag: submit/tizen/20200710.064028^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=198ed3caae777d8dc14adbacc88698a361fa12fd;p=platform%2Fcore%2Fapi%2Fimage-util.git Move structures and typedef to proper file Change-Id: I9bd6beafd9ff3c89f86aa353bd20660becf4df5d --- diff --git a/include/image_util_private.h b/include/image_util_private.h index b34c128..dd71fdb 100644 --- a/include/image_util_private.h +++ b/include/image_util_private.h @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include @@ -94,8 +92,6 @@ extern "C" #define NUM_OF_COLORSPACE _get_number_of_colorspace() -typedef gboolean(*ModuleFunc)(void *, int, int, unsigned char *, unsigned char *, unsigned char *); - typedef struct { /* for converting colorspace */ mm_util_color_format_e color; @@ -119,75 +115,6 @@ typedef struct { GAsyncQueue *queue; } transformation_s; -typedef struct { - void *user_data; - image_util_decode_completed_cb image_decode_completed_cb; -} decode_cb_s; - -typedef struct { - void *user_data; - image_util_decode_completed2_cb image_decode_completed_cb; -} decode2_cb_s; - -typedef struct { - void *user_data; - image_util_encode_completed_cb image_encode_completed_cb; -} encode_cb_s; - -typedef struct { - void *user_data; - image_util_encode_to_file_completed_cb image_encode_to_file_cb; -} encode_to_file_cb_s; - -typedef struct { - void *user_data; - image_util_encode_to_buffer_completed_cb image_encode_to_buffer_cb; -} encode_to_buffer_cb_s; - -typedef struct { - mm_image_info_s **sources; - unsigned int source_count; - void *gif_image_h; - size_t gif_encode_size; - unsigned int current_buffer_count; - unsigned int current_resolution_count; - unsigned int current_delay_count; -} gif_encode_s; - -typedef struct { - image_util_type_e image_type; - mm_image_info_s src; - void **dst_buffer; - size_t dst_size; - gchar *path; - int quality; - image_util_png_compression_e compression; - gif_encode_s gif_encode_info; - encode_cb_s *_encode_cb; - - /* for async */ - GThread *thread; - image_util_image_h new_src; - encode_to_file_cb_s *encode_to_file_cb; - encode_to_buffer_cb_s *encode_to_buffer_cb; -} encode_s; - -typedef struct { - image_util_type_e image_type; - void *src_buffer; - size_t src_size; - void **dst_buffer; - char *path; - image_util_colorspace_e colorspace; - image_util_scale_e down_scale; - decode_cb_s *_decode_cb; - - /* for async */ - GThread *thread; - gboolean is_decode2; - decode2_cb_s *decode2_cb; -} decode_s; - #define IMAGE_UTIL_TYPE_CHECK(type) \ image_util_retvm_if((type < IMAGE_UTIL_JPEG || type > IMAGE_UTIL_BMP), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image type [%d]", type) diff --git a/src/image_util.c b/src/image_util.c index 6adc35a..4b92cf8 100644 --- a/src/image_util.c +++ b/src/image_util.c @@ -31,6 +31,8 @@ typedef struct { gboolean is_transform2; } t_data_s; +typedef gboolean(*ModuleFunc)(void *, int, int, unsigned char *, unsigned char *, unsigned char *); + static int __mm_util_transform(transformation_h handle, image_util_image_h origin, image_util_image_h *transform) { int ret = IMAGE_UTIL_ERROR_NONE; diff --git a/src/image_util_decode.c b/src/image_util_decode.c index a48c4bc..760e5d1 100644 --- a/src/image_util_decode.c +++ b/src/image_util_decode.c @@ -26,6 +26,32 @@ #include #include +typedef struct { + void *user_data; + image_util_decode_completed_cb image_decode_completed_cb; +} decode_cb_s; + +typedef struct { + void *user_data; + image_util_decode_completed2_cb image_decode_completed_cb; +} decode2_cb_s; + +typedef struct { + image_util_type_e image_type; + void *src_buffer; + size_t src_size; + void **dst_buffer; + char *path; + image_util_colorspace_e colorspace; + image_util_scale_e down_scale; + decode_cb_s *_decode_cb; + + /* for async */ + GThread *thread; + gboolean is_decode2; + decode2_cb_s *decode2_cb; +} decode_s; + static int _convert_decode_scale_tbl[] = { MM_UTIL_JPEG_DECODE_DOWNSCALE_1_1, MM_UTIL_JPEG_DECODE_DOWNSCALE_1_2, diff --git a/src/image_util_encode.c b/src/image_util_encode.c index 0b904e8..3d5b06e 100644 --- a/src/image_util_encode.c +++ b/src/image_util_encode.c @@ -24,6 +24,49 @@ #include #include +typedef struct { + void *user_data; + image_util_encode_completed_cb image_encode_completed_cb; +} encode_cb_s; + +typedef struct { + void *user_data; + image_util_encode_to_file_completed_cb image_encode_to_file_cb; +} encode_to_file_cb_s; + +typedef struct { + void *user_data; + image_util_encode_to_buffer_completed_cb image_encode_to_buffer_cb; +} encode_to_buffer_cb_s; + +typedef struct { + mm_image_info_s **sources; + unsigned int source_count; + void *gif_image_h; + size_t gif_encode_size; + unsigned int current_buffer_count; + unsigned int current_resolution_count; + unsigned int current_delay_count; +} gif_encode_s; + +typedef struct { + image_util_type_e image_type; + mm_image_info_s src; + void **dst_buffer; + size_t dst_size; + gchar *path; + int quality; + image_util_png_compression_e compression; + gif_encode_s gif_encode_info; + encode_cb_s *_encode_cb; + + /* for async */ + GThread *thread; + image_util_image_h new_src; + encode_to_file_cb_s *encode_to_file_cb; + encode_to_buffer_cb_s *encode_to_buffer_cb; +} encode_s; + static gboolean __is_invalid_image_info(mm_image_info_s image_info) { if (image_info.width == 0 || image_info.height == 0 || image_info.data == NULL)