From: hj kim Date: Thu, 7 Mar 2019 01:27:19 +0000 (+0900) Subject: Unify the type of width and height to 'unsigned int' X-Git-Tag: submit/tizen/20190311.013617~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9374aa5b4f65465be563ae9e90b0134e1b63959;p=platform%2Fcore%2Fmultimedia%2Flibmm-utility.git Unify the type of width and height to 'unsigned int' Change-Id: Ibe88df84d8b38f6d814243291fea9985e90a7b85 --- diff --git a/bmp/mm_util_bmp.c b/bmp/mm_util_bmp.c index a6b84a3..699b493 100755 --- a/bmp/mm_util_bmp.c +++ b/bmp/mm_util_bmp.c @@ -178,7 +178,7 @@ static int _read_bmp(const char *filename, void *memory, size_t src_size, mm_ima if (filename) MMUTIL_SAFE_FREE(data); - mm_util_debug("width (%lu) height (%lu) size (%zu)", decoded->width, decoded->height, decoded->size); + mm_util_debug("width (%u) height (%u) size (%zu)", decoded->width, decoded->height, decoded->size); return res; } diff --git a/common/include/mm_util_type.h b/common/include/mm_util_type.h index e530e2a..e7b0cad 100755 --- a/common/include/mm_util_type.h +++ b/common/include/mm_util_type.h @@ -73,8 +73,8 @@ typedef enum { } mm_util_color_format_e; typedef struct { - unsigned long width; - unsigned long height; + unsigned int width; + unsigned int height; mm_util_color_format_e color; void *data; size_t size; diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c old mode 100644 new mode 100755 index 9139bec..97d23bf --- a/jpeg/mm_util_jpeg.c +++ b/jpeg/mm_util_jpeg.c @@ -473,7 +473,7 @@ int mm_util_jpeg_encode_to_file(mm_image_info_s *decoded, int quality, const cha mm_util_retvm_if(filename == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid filename"); mm_util_retvm_if(decoded == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src"); mm_util_retvm_if(decoded->data == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src data"); - mm_util_retvm_if((decoded->width <= 0) || (decoded->height <= 0), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid width[%lu] height[%lu]", decoded->width, decoded->height); + mm_util_retvm_if((decoded->width <= 0) || (decoded->height <= 0), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid width[%u] height[%u]", decoded->width, decoded->height); mm_util_retvm_if((IS_MM_UTIL_COLOR_FORMAT(decoded->color) == FALSE), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid fmt [%d]", decoded->color); mm_util_retvm_if((!_mm_util_is_supported_color_format(decoded->color)), MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "not supported fmt [%d]", decoded->color); mm_util_retvm_if((quality < 1) || (quality > 100), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid quality [%d]", quality); @@ -541,7 +541,7 @@ int mm_util_encode_to_jpeg_memory(mm_image_info_s *decoded, int quality, void ** mm_util_retvm_if(size == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid size"); mm_util_retvm_if(decoded == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src"); mm_util_retvm_if(decoded->data == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid src data"); - mm_util_retvm_if((decoded->width <= 0) || (decoded->height <= 0), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid width[%lu] height[%lu]", decoded->width, decoded->height); + mm_util_retvm_if((decoded->width <= 0) || (decoded->height <= 0), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid width[%u] height[%u]", decoded->width, decoded->height); mm_util_retvm_if((IS_MM_UTIL_COLOR_FORMAT(decoded->color) == FALSE), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid fmt [%d]", decoded->color); mm_util_retvm_if((!_mm_util_is_supported_color_format(decoded->color)), MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "not supported fmt [%d]", decoded->color); mm_util_retvm_if((quality < 1) || (quality > 100), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid quality [%d]", quality); @@ -608,7 +608,7 @@ int mm_util_decode_from_jpeg_file(const char *filename, mm_util_color_format_e f } else { ret = __mm_image_decode_with_libjpeg(MM_UTIL_JPEG_FILE, fp, NULL, 0, fmt, downscale, decoded); } - mm_util_debug("decoded->data: %p\t width: %lu\t height: %lu\t size: %zu", decoded->data, decoded->width, decoded->height, decoded->size); + mm_util_debug("decoded->data: %p\t width: %u\t height: %u\t size: %zu", decoded->data, decoded->width, decoded->height, decoded->size); mm_util_debug("#End# libjpeg, Success!! ret: %d", ret); mm_util_safe_fclose(fp); @@ -654,7 +654,7 @@ int mm_util_decode_from_jpeg_memory(void *src, const size_t size, mm_util_color_ } else { ret = __mm_image_decode_with_libjpeg(MM_UTIL_JPEG_MEM, NULL, src, size, fmt, downscale, decoded); } - mm_util_debug("decoded->data: %p\t width: %lu\t height: %lu\t size: %zu", decoded->data, decoded->width, decoded->height, decoded->size); + mm_util_debug("decoded->data: %p\t width: %u\t height: %u\t size: %zu", decoded->data, decoded->width, decoded->height, decoded->size); mm_util_debug("#END# libjpeg, Success!! ret: %d", ret); mm_util_fleave(); diff --git a/png/mm_util_png.c b/png/mm_util_png.c index 2b11afc..40ceb52 100755 --- a/png/mm_util_png.c +++ b/png/mm_util_png.c @@ -224,7 +224,7 @@ static int _read_png(FILE *fp, void *memory, const size_t memory_size, mm_image_ decoded->height = (unsigned long)png_prop.height; decoded->size = data_size; - mm_util_debug("width (%lu) height (%lu) size (%zu)", decoded->width, decoded->height, decoded->size); + mm_util_debug("width (%u) height (%u) size (%zu)", decoded->width, decoded->height, decoded->size); return MM_UTIL_ERROR_NONE; }