From: Jiyong Min Date: Mon, 17 Jul 2017 01:28:41 +0000 (+0900) Subject: Modify data type for the size of memory(buffer) from 'int' to 'unsigned int' in libmm... X-Git-Tag: submit/tizen/20170719.012528^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f3289296e141706c7b81ac4f1cd890340998b9c;p=platform%2Fcore%2Fapi%2Fimage-util.git Modify data type for the size of memory(buffer) from 'int' to 'unsigned int' in libmm-utility Change-Id: I943c034c88395597c1c5b275253dc0d60453ef9d Signed-off-by: Jiyong Min --- diff --git a/packaging/capi-media-image-util.spec b/packaging/capi-media-image-util.spec index 9ee01c6..602ead1 100755 --- a/packaging/capi-media-image-util.spec +++ b/packaging/capi-media-image-util.spec @@ -1,6 +1,6 @@ Name: capi-media-image-util Summary: A Image Utility library in Tizen Native API -Version: 0.1.18 +Version: 0.1.19 Release: 2 Group: Multimedia/API License: Apache-2.0 diff --git a/src/image_util.c b/src/image_util.c index f9287dc..ee385b9 100755 --- a/src/image_util.c +++ b/src/image_util.c @@ -690,7 +690,7 @@ int image_util_decode_jpeg(const char *path, image_util_colorspace_e colorspace, if (height) *height = decoded.height; if (size) - *size = (unsigned int)decoded.size; + *size = decoded.size; } return _convert_image_util_error_code(__func__, err); } @@ -710,7 +710,7 @@ int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpe mm_util_jpeg_yuv_data decoded; memset(&decoded, 0, sizeof(mm_util_jpeg_yuv_data)); - err = mm_util_decode_from_jpeg_memory(&decoded, (void *)jpeg_buffer, jpeg_size, _convert_encode_colorspace_tbl[colorspace]); + err = mm_util_decode_from_jpeg_memory(&decoded, (void *)jpeg_buffer, (unsigned int)jpeg_size, _convert_encode_colorspace_tbl[colorspace]); if (err == MM_UTIL_ERROR_NONE) { *image_buffer = decoded.data; @@ -719,7 +719,7 @@ int image_util_decode_jpeg_from_memory(const unsigned char *jpeg_buffer, int jpe if (height) *height = decoded.height; if (size) - *size = (unsigned int)decoded.size; + *size = decoded.size; } return _convert_image_util_error_code(__func__, err); @@ -750,7 +750,7 @@ int image_util_decode_jpeg_with_downscale(const char *path, image_util_colorspac if (height) *height = decoded.height; if (size) - *size = (unsigned int)decoded.size; + *size = decoded.size; } return _convert_image_util_error_code(__func__, err); } @@ -771,7 +771,7 @@ int image_util_decode_jpeg_from_memory_with_downscale(const unsigned char *jpeg_ mm_util_jpeg_yuv_data decoded; memset(&decoded, 0, sizeof(mm_util_jpeg_yuv_data)); - err = mm_util_decode_from_jpeg_memory_with_downscale(&decoded, (void *)jpeg_buffer, jpeg_size, _convert_encode_colorspace_tbl[colorspace], _convert_decode_scale_tbl[downscale]); + err = mm_util_decode_from_jpeg_memory_with_downscale(&decoded, (void *)jpeg_buffer, (unsigned int)jpeg_size, _convert_encode_colorspace_tbl[colorspace], _convert_decode_scale_tbl[downscale]); if (err == MM_UTIL_ERROR_NONE) { *image_buffer = decoded.data; @@ -780,7 +780,7 @@ int image_util_decode_jpeg_from_memory_with_downscale(const unsigned char *jpeg_ if (height) *height = decoded.height; if (size) - *size = (unsigned int)decoded.size; + *size = decoded.size; } return _convert_image_util_error_code(__func__, err); @@ -805,7 +805,6 @@ int image_util_encode_jpeg(const unsigned char *buffer, int width, int height, i int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int width, int height, image_util_colorspace_e colorspace, int quality, unsigned char **jpeg_buffer, unsigned int *jpeg_size) { int err = MM_UTIL_ERROR_NONE; - int isize = 0; DEPRECATION_LOGW("image_util_encode_jpeg_to_memory()", "image_util_encode_create()"); @@ -815,10 +814,7 @@ int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int widt image_util_retvm_if((colorspace < 0 || colorspace >= sizeof(_convert_colorspace_tbl) / sizeof(int)), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid colorspace"); image_util_retvm_if((_convert_encode_colorspace_tbl[colorspace] == -1), IMAGE_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "not supported format"); - err = mm_util_jpeg_encode_to_memory((void **)jpeg_buffer, &isize, (void *)image_buffer, width, height, _convert_encode_colorspace_tbl[colorspace], quality); - if (err == MM_UTIL_ERROR_NONE) - *jpeg_size = (unsigned int)isize; - + err = mm_util_jpeg_encode_to_memory((void **)jpeg_buffer, jpeg_size, (void *)image_buffer, width, height, _convert_encode_colorspace_tbl[colorspace], quality); return _convert_image_util_error_code(__func__, err); } @@ -1256,9 +1252,9 @@ static int _image_util_decode_internal(decode_encode_s * _handle) err = mm_util_decode_from_jpeg_file(jpeg_data, _handle->path, _convert_jpeg_colorspace_tbl[_handle->colorspace]); } else { if (_handle->down_scale < sizeof(image_util_scale_e)) - err = mm_util_decode_from_jpeg_memory_with_downscale(jpeg_data, _handle->src_buffer[0], _handle->src_size, _convert_jpeg_colorspace_tbl[_handle->colorspace], _convert_decode_scale_tbl[_handle->down_scale]); + err = mm_util_decode_from_jpeg_memory_with_downscale(jpeg_data, _handle->src_buffer[0], (unsigned int)_handle->src_size, _convert_jpeg_colorspace_tbl[_handle->colorspace], _convert_decode_scale_tbl[_handle->down_scale]); else - err = mm_util_decode_from_jpeg_memory(jpeg_data, _handle->src_buffer[0], _handle->src_size, _convert_jpeg_colorspace_tbl[_handle->colorspace]); + err = mm_util_decode_from_jpeg_memory(jpeg_data, _handle->src_buffer[0], (unsigned int)_handle->src_size, _convert_jpeg_colorspace_tbl[_handle->colorspace]); } if (err == MM_UTIL_ERROR_NONE) { @@ -2024,7 +2020,7 @@ static int _image_util_encode_internal(decode_encode_s * _handle) if (_handle->path) err = mm_util_jpeg_encode_to_file(_handle->path, _handle->src_buffer[0], _handle->width, _handle->height, _convert_jpeg_colorspace_tbl[_handle->colorspace], _handle->quality); else - err = mm_util_jpeg_encode_to_memory(_handle->dst_buffer, (int *)&(_handle->dst_size), _handle->src_buffer[0], _handle->width, _handle->height, _convert_jpeg_colorspace_tbl[_handle->colorspace], _handle->quality); + err = mm_util_jpeg_encode_to_memory(_handle->dst_buffer, (unsigned int *)&(_handle->dst_size), _handle->src_buffer[0], _handle->width, _handle->height, _convert_jpeg_colorspace_tbl[_handle->colorspace], _handle->quality); } break; case IMAGE_UTIL_PNG: