Use size_t for buffer size 77/171677/3
authorhj kim <backto.kim@samsung.com>
Tue, 6 Mar 2018 10:25:36 +0000 (19:25 +0900)
committerhj kim <backto.kim@samsung.com>
Wed, 7 Mar 2018 01:44:56 +0000 (10:44 +0900)
Change-Id: If18ee9a6062bf921add293af162bf796e4454bdc

include/image_util_private.h
src/image_util_decode.c
src/image_util_encode.c

index c465bd7..26f0569 100755 (executable)
@@ -138,10 +138,10 @@ typedef struct {
 typedef struct {
        image_util_type_e image_type;
        void **src_buffer;
-       unsigned long long src_size;
+       size_t src_size;
        void **dst_buffer;
-       unsigned long long dst_size;
-       unsigned long gif_encode_size;
+       size_t dst_size;
+       size_t gif_encode_size;
        char *path;
        void *image_h;
        unsigned long width;
index 2c61ee7..cbb114d 100755 (executable)
@@ -352,7 +352,7 @@ static int _image_util_decode_internal(decode_encode_s * _handle)
                        if (_handle->path)
                                        err = mm_util_decode_from_jpeg_file_with_downscale(_handle->path, TYPECAST_COLOR_BY_TYPE(_handle->colorspace, IMAGE_UTIL_JPEG), _convert_decode_scale_tbl[_handle->down_scale], jpeg_data);
                        else
-                                       err = mm_util_decode_from_jpeg_memory_with_downscale(_handle->src_buffer[0], (size_t)_handle->src_size, TYPECAST_COLOR_BY_TYPE(_handle->colorspace, IMAGE_UTIL_JPEG), _convert_decode_scale_tbl[_handle->down_scale], jpeg_data);
+                                       err = mm_util_decode_from_jpeg_memory_with_downscale(_handle->src_buffer[0], _handle->src_size, TYPECAST_COLOR_BY_TYPE(_handle->colorspace, IMAGE_UTIL_JPEG), _convert_decode_scale_tbl[_handle->down_scale], jpeg_data);
 
                        if (err == MM_UTIL_ERROR_NONE) {
                                *(_handle->dst_buffer) = jpeg_data->data;
index 14b7791..194c728 100755 (executable)
@@ -428,7 +428,7 @@ static int _image_util_encode_internal(decode_encode_s * _handle)
        case IMAGE_UTIL_GIF:
                {
                        mm_gif_file_h gif_data = (mm_gif_file_h)_handle->image_h;
-                       unsigned long encoded_buffer_size = 0;
+                       size_t encoded_buffer_size = 0;
 
                        image_util_debug("[Count] buffer:%d, resolution:%d, delay:%d", _handle->current_buffer_count, _handle->current_resolution_count, _handle->current_delay_count);
                        if ((_handle->current_buffer_count > 1) && ((_handle->current_buffer_count != _handle->current_resolution_count) || (_handle->current_buffer_count != _handle->current_delay_count))) {
@@ -468,7 +468,7 @@ static int _image_util_encode_internal(decode_encode_s * _handle)
                                err = mm_util_encode_bmp_to_memory(bmp_data, _handle->dst_buffer, &size);
 
                        if (err == MM_UTIL_ERROR_NONE)
-                               _handle->dst_size = (unsigned long long)size;
+                               _handle->dst_size = size;
                }
                break;
        default:
@@ -640,7 +640,7 @@ int image_util_encode_jpeg_to_memory(const unsigned char *image_buffer, int widt
        decoded.format = TYPECAST_COLOR_BY_TYPE(colorspace, IMAGE_UTIL_JPEG);
        decoded.data = (void *)image_buffer;
 
-       err = mm_util_jpeg_encode_to_memory(&decoded, quality, (void **)jpeg_buffer, jpeg_size);
+       err = mm_util_jpeg_encode_to_memory(&decoded, quality, (void **)jpeg_buffer, (size_t *)jpeg_size);
        return _image_error_capi(ERR_TYPE_ENCODE, err);
 }