From 94e7c88fceeb94739e3d4e4d674ef90e08ac5b79 Mon Sep 17 00:00:00 2001 From: hj kim Date: Mon, 15 Oct 2018 14:19:14 +0900 Subject: [PATCH] Removed useless image_util_error_type_e Change-Id: I34f9ed08da7a8d567add8a68527799b0a6daefcb --- include/image_util_private.h | 9 +-------- src/image_util.c | 12 ++++++------ src/image_util_decode.c | 2 +- src/image_util_encode.c | 16 ++++++++-------- src/image_util_internal.c | 14 +++++++------- src/image_util_private.c | 4 ++-- 6 files changed, 25 insertions(+), 32 deletions(-) mode change 100644 => 100755 src/image_util.c mode change 100644 => 100755 src/image_util_encode.c mode change 100644 => 100755 src/image_util_internal.c diff --git a/include/image_util_private.h b/include/image_util_private.h index 2c8b7f6..8f6beb4 100755 --- a/include/image_util_private.h +++ b/include/image_util_private.h @@ -170,13 +170,6 @@ typedef struct { GThread *thread; } decode_s; -typedef enum { - ERR_TYPE_COMMON, - ERR_TYPE_TRANSFORM, - ERR_TYPE_DECODE, - ERR_TYPE_ENCODE, -} image_util_error_type_e; - #define IMAGE_UTIL_TYPE_CHECK(type) \ image_util_retvm_if((type < IMAGE_UTIL_JPEG || type > IMAGE_UTIL_BMP), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter") @@ -189,7 +182,7 @@ gboolean is_supported_colorspace(image_util_colorspace_e colorspace, image_util_ unsigned int get_number_of_colorspace(void); int convert_type_of_colorspace(const image_util_colorspace_e colorspace); int convert_type_of_colorspace_with_image_type(const image_util_colorspace_e colorspace, const image_util_type_e type); -int _image_error_capi(image_util_error_type_e error_type, int error_code); +int _image_error_capi(int error_code); bool _image_util_check_resolution(int width, int height); /** diff --git a/src/image_util.c b/src/image_util.c old mode 100644 new mode 100755 index f2df142..109e2eb --- a/src/image_util.c +++ b/src/image_util.c @@ -201,7 +201,7 @@ static int __mm_util_transform(transformation_s *handle) if (ret != MM_UTIL_ERROR_NONE) { __mm_destroy_temp_buffer(dst_buf); image_util_error("mm_util_crop_image failed"); - return _image_error_capi(ERR_TYPE_TRANSFORM, ret); + return _image_error_capi(ret); } dst_buf[dst_index] = res_buffer; @@ -215,7 +215,7 @@ static int __mm_util_transform(transformation_s *handle) if (ret != MM_UTIL_ERROR_NONE) { __mm_destroy_temp_buffer(dst_buf); image_util_error("mm_util_resize_image failed"); - return _image_error_capi(ERR_TYPE_TRANSFORM, ret); + return _image_error_capi(ret); } dst_buf[dst_index] = res_buffer; @@ -231,7 +231,7 @@ static int __mm_util_transform(transformation_s *handle) if (ret != MM_UTIL_ERROR_NONE) { __mm_destroy_temp_buffer(dst_buf); image_util_error("mm_util_convert_colorspace failed"); - return _image_error_capi(ERR_TYPE_TRANSFORM, ret); + return _image_error_capi(ret); } dst_buf[dst_index] = res_buffer_conv; @@ -248,7 +248,7 @@ static int __mm_util_transform(transformation_s *handle) if (ret != MM_UTIL_ERROR_NONE) { __mm_destroy_temp_buffer(dst_buf); image_util_error("mm_util_rotate_image failed"); - return _image_error_capi(ERR_TYPE_TRANSFORM, ret); + return _image_error_capi(ret); } dst_buf[dst_index] = res_buffer_rotate; @@ -719,7 +719,7 @@ int image_util_calculate_buffer_size(int width, int height, image_util_colorspac *size = (unsigned int)size_ptr; - return _image_error_capi(ERR_TYPE_COMMON, err); + return _image_error_capi(err); } int image_util_extract_color_from_memory(const unsigned char *image_buffer, int width, int height, unsigned char *rgb_r, unsigned char *rgb_g, unsigned char *rgb_b) @@ -757,7 +757,7 @@ int image_util_extract_color_from_memory(const unsigned char *image_buffer, int module = NULL; } - return _image_error_capi(ERR_TYPE_COMMON, ret); + return _image_error_capi(ret); } int image_util_foreach_supported_colorspace(image_util_type_e image_type, image_util_supported_colorspace_cb callback, void *user_data) diff --git a/src/image_util_decode.c b/src/image_util_decode.c index 2551971..5eac0e3 100755 --- a/src/image_util_decode.c +++ b/src/image_util_decode.c @@ -316,7 +316,7 @@ static int _image_util_decode_internal(decode_s * _handle, unsigned long *res_wi image_util_debug("dst_buffer(%p) width (%lu) height (%lu) dst_size (%zu)", *(_handle->dst_buffer), *res_width, *res_height, *res_size); - return _image_error_capi(ERR_TYPE_DECODE, err); + return _image_error_capi(err); } int image_util_decode_run(image_util_decode_h handle, unsigned long *width, unsigned long *height, unsigned long long *size) diff --git a/src/image_util_encode.c b/src/image_util_encode.c old mode 100644 new mode 100755 index 04875fd..48ce66f --- a/src/image_util_encode.c +++ b/src/image_util_encode.c @@ -30,20 +30,20 @@ static int _image_util_encode_get_gif_frame(mm_gif_file_h gif_data, unsigned int image_util_retvm_if((frame == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle"); err = mm_util_gif_enocde_get_image_handle(gif_data, (int)index, frame); - image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(ERR_TYPE_ENCODE, err), "mm_util_gif_enocde_get_image_handle failed %d", err); + image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(err), "mm_util_gif_enocde_get_image_handle failed %d", err); if (*frame == NULL) { err = mm_util_gif_image_create(gif_data, frame); - image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(ERR_TYPE_ENCODE, err), "mm_util_gif_image_create failed %d", err); + image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(err), "mm_util_gif_image_create failed %d", err); err = mm_util_gif_enocde_set_image_handle(gif_data, *frame); if (err != MM_UTIL_ERROR_NONE) { image_util_error("mm_util_gif_enocde_set_image_handle is failed %d", err); mm_util_gif_image_destory(*frame); - return _image_error_capi(ERR_TYPE_ENCODE, err); + return _image_error_capi(err); } } - return _image_error_capi(ERR_TYPE_ENCODE, err); + return _image_error_capi(err); } static void _image_util_encode_destroy_image_handle(encode_s * handle) @@ -83,7 +83,7 @@ static int __image_util_create_img_handle(image_util_type_e image_type, encode_s IMAGE_UTIL_SAFE_FREE(_image_handle); err = mm_util_gif_encode_create(&_gif_handle); - image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(ERR_TYPE_ENCODE, err), "Error - mm_util_gif_encode_create is failed (%d)", err); + image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(err), "Error - mm_util_gif_encode_create is failed (%d)", err); handle->image_h = (void *) _gif_handle; break; @@ -239,7 +239,7 @@ int image_util_encode_set_gif_frame_delay_time(image_util_encode_h handle, unsig image_util_retvm_if((err != IMAGE_UTIL_ERROR_NONE), err, "_image_util_encode_get_gif_frame failed %d", err); err = mm_util_gif_image_set_delay_time(frame, (int)delay_time); - image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(ERR_TYPE_ENCODE, err), "mm_util_gif_image_set_delay_time failed %d", err); + image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(err), "mm_util_gif_image_set_delay_time failed %d", err); _handle->current_delay_count++; @@ -263,7 +263,7 @@ int image_util_encode_set_input_buffer(image_util_encode_h handle, const unsigne image_util_retvm_if((err != IMAGE_UTIL_ERROR_NONE), err, "_image_util_encode_get_gif_frame failed %d", err); err = mm_util_gif_image_set_image(frame, src_buffer); - image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(ERR_TYPE_ENCODE, err), "mm_util_gif_image_set_image failed %d", err); + image_util_retvm_if((err != MM_UTIL_ERROR_NONE), _image_error_capi(err), "mm_util_gif_image_set_image failed %d", err); _handle->current_buffer_count++; } else { @@ -393,7 +393,7 @@ static int _image_util_encode_internal(encode_s * _handle) break; } - return _image_error_capi(ERR_TYPE_ENCODE, err); + return _image_error_capi(err); } int image_util_encode_run(image_util_encode_h handle, unsigned long long *size) diff --git a/src/image_util_internal.c b/src/image_util_internal.c old mode 100644 new mode 100755 index fc4be80..a3c4f44 --- a/src/image_util_internal.c +++ b/src/image_util_internal.c @@ -40,7 +40,7 @@ int image_util_convert_colorspace(unsigned char *dest, image_util_colorspace_e d IMAGE_UTIL_SAFE_FREE(res_buffer); - return _image_error_capi(ERR_TYPE_TRANSFORM, err); + return _image_error_capi(err); } int image_util_resize(unsigned char *dest, int *dest_width, int *dest_height, const unsigned char *src, int src_width, int src_height, image_util_colorspace_e colorspace) @@ -64,7 +64,7 @@ int image_util_resize(unsigned char *dest, int *dest_width, int *dest_height, co *dest_height = (int)res_h; } - return _image_error_capi(ERR_TYPE_TRANSFORM, err); + return _image_error_capi(err); } int image_util_rotate(unsigned char *dest, int *dest_width, int *dest_height, image_util_rotation_e dest_rotation, const unsigned char *src, int src_width, int src_height, image_util_colorspace_e colorspace) @@ -87,7 +87,7 @@ int image_util_rotate(unsigned char *dest, int *dest_width, int *dest_height, im *dest_width = (int)res_w; *dest_height = (int)res_h; } - return _image_error_capi(ERR_TYPE_TRANSFORM, err); + return _image_error_capi(err); } int image_util_crop(unsigned char *dest, int x, int y, int *width, int *height, const unsigned char *src, int src_width, int src_height, image_util_colorspace_e colorspace) @@ -113,7 +113,7 @@ int image_util_crop(unsigned char *dest, int x, int y, int *width, int *height, IMAGE_UTIL_SAFE_FREE(res_buffer); - return _image_error_capi(ERR_TYPE_TRANSFORM, err); + return _image_error_capi(err); } int image_util_frame_create(image_util_frame_h *frame_h) @@ -210,13 +210,13 @@ int image_util_encode_add_frame(image_util_encode_h encode_h, image_util_frame_h } if (ret != MM_UTIL_ERROR_NONE) { image_util_error("mm_util_gif_encode_add_image is failed(%d).", ret); - return _image_error_capi(ERR_TYPE_ENCODE, ret); + return _image_error_capi(ret); } ret = mm_util_gif_encode_add_image(gif_data, (mm_image_info_s *)frame); if (ret != MM_UTIL_ERROR_NONE) { image_util_error("mm_util_gif_encode_add_image is failed(%d).", ret); - return _image_error_capi(ERR_TYPE_ENCODE, ret); + return _image_error_capi(ret); } encode->current_buffer_count++; @@ -239,7 +239,7 @@ int image_util_encode_save(image_util_encode_h encode_h, unsigned long long *siz if (ret != MM_UTIL_ERROR_NONE) { image_util_error("mm_util_gif_encode_save is failed(%d).", ret); mm_util_gif_encode_destroy(gif_data); - return _image_error_capi(ERR_TYPE_ENCODE, ret); + return _image_error_capi(ret); } *size = (unsigned long long)encode->gif_encode_size; diff --git a/src/image_util_private.c b/src/image_util_private.c index c929c1c..dba91d4 100755 --- a/src/image_util_private.c +++ b/src/image_util_private.c @@ -184,10 +184,10 @@ int convert_type_of_colorspace_with_image_type(const image_util_colorspace_e col return new_colorspace; } -int _image_error_capi(image_util_error_type_e error_type, int error_code) +int _image_error_capi(int error_code) { if (error_code != MM_UTIL_ERROR_NONE) - image_util_error("[type : %d] error : %d ", error_type, error_code); + image_util_error("error : [%d] ", error_code); /*Error None*/ if (error_code == MM_UTIL_ERROR_NONE) -- 2.34.1