From: hj kim Date: Tue, 16 Jun 2020 08:32:01 +0000 (+0900) Subject: Fix wrong return value for invalid parameters X-Git-Tag: accepted/tizen/unified/20200626.133543~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55ac72a3dd3d2637946fb251eb03dcdf7654b553;p=platform%2Fcore%2Fapi%2Fimage-util.git Fix wrong return value for invalid parameters Change-Id: Ic213b5931a5fe0675eac23be32c2133fcced4ce3 --- diff --git a/src/image_util.c b/src/image_util.c index 47b3af1..5b1c047 100644 --- a/src/image_util.c +++ b/src/image_util.c @@ -332,7 +332,7 @@ int image_util_transform_get_colorspace(transformation_h handle, image_util_colo transformation_s *_handle = (transformation_s *) handle; image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle"); - image_util_retvm_if((colorspace == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "colorspace parameter error"); + image_util_retvm_if(!colorspace, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid colorspace"); image_util_retvm_if((!_handle->set_convert), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set colorspace before"); image_util_debug("Get colorspace_convert_info [%d]", _handle->color); @@ -347,7 +347,8 @@ int image_util_transform_get_resolution(transformation_h handle, unsigned int *w transformation_s *_handle = (transformation_s *) handle; image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle"); - image_util_retvm_if((width == NULL || height == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "width or height parameter error"); + image_util_retvm_if(!width, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid width"); + image_util_retvm_if(!height, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid height"); image_util_retvm_if((!_handle->set_resize), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set resolution before"); image_util_debug("Get resize_info w[%ui] h[%ui]", _handle->width, _handle->height); @@ -363,7 +364,7 @@ int image_util_transform_get_rotation(transformation_h handle, image_util_rotati transformation_s *_handle = (transformation_s *) handle; image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle"); - image_util_retvm_if((rotation == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "rotation parameter error"); + image_util_retvm_if(!rotation, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid rotation"); image_util_retvm_if((!_handle->set_rotate), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set rotation before"); image_util_debug("Get rotate_info [%d]", _handle->rotation); @@ -378,7 +379,10 @@ int image_util_transform_get_crop_area(transformation_h handle, unsigned int *st transformation_s *_handle = (transformation_s *) handle; image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle"); - image_util_retvm_if((start_x == NULL || start_y == NULL || end_x == NULL || end_y == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "crop area parameter error"); + image_util_retvm_if(!start_x, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid start_x"); + image_util_retvm_if(!start_y, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid start_y"); + image_util_retvm_if(!end_x, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid end_x"); + image_util_retvm_if(!end_y, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid end_y"); image_util_retvm_if((!_handle->set_crop), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set crop area before"); *start_x = _handle->x;