From: hj kim Date: Thu, 11 Oct 2018 09:05:24 +0000 (+0900) Subject: Remove useless code of checking decode mode X-Git-Tag: submit/tizen/20181106.000712^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bed992a810d7626e287642aa92f17c3294d231ae;p=platform%2Fcore%2Fapi%2Fimage-util.git Remove useless code of checking decode mode Change-Id: I0d8e80cf7622aa63cd1baec4c08c5f1ca3e49997 --- diff --git a/include/image_util_private.h b/include/image_util_private.h index 6f179fe..8f6eeb8 100755 --- a/include/image_util_private.h +++ b/include/image_util_private.h @@ -198,11 +198,6 @@ typedef enum { #define IMAGE_UTIL_SUPPORT_TYPE_CHECK(value, support) \ image_util_retvm_if((value != support), IMAGE_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "Not supported format") -#define IMAGE_UTIL_DECODE_HANDLE_CHECK(obj) do { \ - image_util_retvm_if(obj == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid decode handle"); \ - image_util_retvm_if(!IS_DECODE_MODE(DECODE_ENCODE_CAST(obj)->mode), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid decode handle"); \ - } while(0) - #define IMAGE_UTIL_ENCODE_HANDLE_CHECK(obj) do { \ image_util_retvm_if(obj == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid encode handle"); \ image_util_retvm_if(!IS_ENCODE_MODE(DECODE_ENCODE_CAST(obj)->mode), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid encode handle"); \ diff --git a/src/image_util_decode.c b/src/image_util_decode.c index 9eef1f8..fac8679 100755 --- a/src/image_util_decode.c +++ b/src/image_util_decode.c @@ -130,8 +130,6 @@ static int _image_util_decode_create_image_handle(image_util_decode_h handle) int err = IMAGE_UTIL_ERROR_NONE; decode_s *_handle = (decode_s *) handle; - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); - switch (_handle->image_type) { case IMAGE_UTIL_JPEG: _handle->down_scale = IMAGE_UTIL_DOWNSCALE_1_1; @@ -158,7 +156,6 @@ int image_util_decode_set_input_path(image_util_decode_h handle, const char *pat decode_s *_handle = (decode_s *) handle; unsigned char *image_header = NULL; - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); image_util_retvm_if(!IMAGE_UTIL_STRING_VALID(path), IMAGE_UTIL_ERROR_NO_SUCH_FILE, "Invalid path"); if (_handle->src_buffer) @@ -190,7 +187,6 @@ int image_util_decode_set_input_buffer(image_util_decode_h handle, const unsigne int err = IMAGE_UTIL_ERROR_NONE; decode_s *_handle = (decode_s *) handle; - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); image_util_retvm_if((src_buffer == NULL || src_size == 0), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input buffer"); IMAGE_UTIL_SAFE_FREE(_handle->path); @@ -218,7 +214,6 @@ int image_util_decode_set_output_buffer(image_util_decode_h handle, unsigned cha image_util_fenter(); - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); image_util_retvm_if(dst_buffer == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter"); _handle->dst_buffer = (void **)dst_buffer; @@ -230,7 +225,6 @@ int image_util_decode_set_colorspace(image_util_encode_h handle, image_util_colo { decode_s *_handle = (decode_s *) handle; - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); IMAGE_UTIL_TYPE_CHECK(_handle->image_type); image_util_retvm_if((is_valid_colorspace(colorspace) == FALSE), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid colorspace"); @@ -245,7 +239,6 @@ int image_util_decode_set_jpeg_downscale(image_util_encode_h handle, image_util_ { decode_s *_handle = (decode_s *) handle; - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); IMAGE_UTIL_SUPPORT_TYPE_CHECK(_handle->image_type, IMAGE_UTIL_JPEG); image_util_retvm_if((down_scale < 0 || down_scale >= _NUM_OF_SCALE), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "downscale is invalid"); @@ -374,7 +367,6 @@ int image_util_decode_run(image_util_decode_h handle, unsigned long *width, unsi unsigned long _height = 0; size_t _size = 0; - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); image_util_retvm_if((_handle->path == NULL && _handle->src_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input"); image_util_retvm_if(_handle->dst_buffer == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid output"); @@ -441,7 +433,6 @@ int image_util_decode_run_async(image_util_decode_h handle, image_util_decode_co image_util_fenter(); - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); image_util_retvm_if((_handle->path == NULL && _handle->src_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input"); image_util_retvm_if(_handle->dst_buffer == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid output"); image_util_retvm_if((completed_cb == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid callback"); @@ -475,8 +466,6 @@ int image_util_decode_destroy(image_util_decode_h handle) image_util_fenter(); - IMAGE_UTIL_DECODE_HANDLE_CHECK(handle); - /* g_thread_exit(handle->thread); */ if (_handle->thread) { g_thread_join(_handle->thread);