From 0f63c4f6c7d813e2718b7e2c7a8d3dd9df2b6614 Mon Sep 17 00:00:00 2001 From: Jiyong Date: Mon, 10 Jun 2024 08:30:19 +0900 Subject: [PATCH] Modify unreachable code - Fix svace issue Change-Id: I6f9a4e8842f0bbd5ad05e8d02344f1beada3edc1 --- gif/mm_util_gif.c | 23 +++++------------------ imgcv/mm_util_imgcv.cpp | 4 ++++ jpeg/mm_util_jpeg.c | 10 ++-------- packaging/libmm-utility.spec | 2 +- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/gif/mm_util_gif.c b/gif/mm_util_gif.c index 4ea00ae..cb06fd7 100644 --- a/gif/mm_util_gif.c +++ b/gif/mm_util_gif.c @@ -93,7 +93,7 @@ static void __gif_free_frame_buffer(GifRowType *frame_buffer, unsigned int size) g_free(frame_buffer); } -static int __gif_generate_frame_buffer(GifFileType *gif_image, GifRowType **screen_buf) +static void __gif_generate_frame_buffer(GifFileType *gif_image, GifRowType **screen_buf) { int idx = 0; size_t row_size = 0; @@ -113,8 +113,6 @@ static int __gif_generate_frame_buffer(GifFileType *gif_image, GifRowType **scre } *screen_buf = _screen_buf; - - return MM_UTIL_ERROR_NONE; } static bool __gif_is_good_frame(GifFileType *gif_image) @@ -186,7 +184,7 @@ static int __gif_get_extension(GifFileType *gif_image) return MM_UTIL_ERROR_NONE; } -static int __gif_convert_to_rgba(void **data, ColorMapObject *color_map, GifRowType *frame_buffer, unsigned int width, unsigned int height) +static void __gif_convert_to_rgba(void **data, ColorMapObject *color_map, GifRowType *frame_buffer, unsigned int width, unsigned int height) { unsigned int i, j; GifRowType gif_row; @@ -208,8 +206,6 @@ static int __gif_convert_to_rgba(void **data, ColorMapObject *color_map, GifRowT *buffer++ = 255; } } - - return MM_UTIL_ERROR_NONE; } static int __read_gif(const char *file_path, void *memory, const size_t src_size, mm_util_image_h *decoded) @@ -233,11 +229,7 @@ static int __read_gif(const char *file_path, void *memory, const size_t src_size mm_util_retvm_if(GifFile->SWidth <= 0 || GifFile->SHeight <= 0, MM_UTIL_ERROR_INVALID_OPERATION, "Gif File wrong decode width & height"); - ret = __gif_generate_frame_buffer(GifFile, &frame_buffer); - if (ret != MM_UTIL_ERROR_NONE) { - mm_util_debug("__gif_generate_frame_buffer failed"); - goto error; - } + __gif_generate_frame_buffer(GifFile, &frame_buffer); /* Scan the content of the GIF file and load the image(s) in: */ do { @@ -265,7 +257,7 @@ static int __read_gif(const char *file_path, void *memory, const size_t src_size ret = __gif_fill_frame_buffer(GifFile, frame_buffer); if (ret != MM_UTIL_ERROR_NONE) { - mm_util_error("__gif_generate_frame_buffer failed"); + mm_util_error("__gif_fill_frame_buffer failed"); goto error; } break; @@ -291,12 +283,7 @@ static int __read_gif(const char *file_path, void *memory, const size_t src_size } /* decompress image with colormap(256) */ - ret = __gif_convert_to_rgba(&image_buffer, ColorMap, frame_buffer, GifFile->SWidth, GifFile->SHeight); - if (ret != MM_UTIL_ERROR_NONE) { - mm_util_error("could not convert gif to rgba"); - ret = MM_UTIL_ERROR_INVALID_OPERATION; - goto error; - } + __gif_convert_to_rgba(&image_buffer, ColorMap, frame_buffer, GifFile->SWidth, GifFile->SHeight); ret = mm_image_create_image(GifFile->SWidth, GifFile->SHeight, MM_UTIL_COLOR_RGBA, image_buffer, GifFile->SWidth * GifFile->SHeight * 4, decoded); g_free(image_buffer); diff --git a/imgcv/mm_util_imgcv.cpp b/imgcv/mm_util_imgcv.cpp index eaf75e5..5bbedcd 100755 --- a/imgcv/mm_util_imgcv.cpp +++ b/imgcv/mm_util_imgcv.cpp @@ -106,6 +106,10 @@ static int __mm_util_imgcv_calculate_hist(mm_util_imgcv_s *handle, unsigned char cv::Mat hist; cv::Mat hsvImg; + mm_util_retvm_if(!rgb_r, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid rgb_r"); + mm_util_retvm_if(!rgb_g, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid rgb_g"); + mm_util_retvm_if(!rgb_b, MM_UTIL_ERROR_INVALID_PARAMETER, "invalid rgb_b"); + mm_util_fenter(); /* convert colorspace to HSV */ diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c index b453d1c..b00f212 100644 --- a/jpeg/mm_util_jpeg.c +++ b/jpeg/mm_util_jpeg.c @@ -212,7 +212,7 @@ static int __jpeg_decode_get_buffer_size(j_decompress_ptr dinfo, unsigned int ro return MM_UTIL_ERROR_NONE; } -static int __jpeg_encode_yuv(j_compress_ptr cinfo, unsigned int width, unsigned int height, mm_image_info_s* decoded) +static void __jpeg_encode_yuv(j_compress_ptr cinfo, unsigned int width, unsigned int height, mm_image_info_s* decoded) { JSAMPROW y[16], cb[16], cr[16]; /* y[2][5] = color sample of row 2 and pixel column 5; (one plane) */ JSAMPARRAY data[3] = { y, cb, cr }; /* t[0][2][5] = color sample 0 of row 2 and column 5 */ @@ -255,8 +255,6 @@ static int __jpeg_encode_yuv(j_compress_ptr cinfo, unsigned int width, unsigned jpeg_write_raw_data(cinfo, data, 16); g_free(large_rect); g_free(small_rect); - - return MM_UTIL_ERROR_NONE; } else { for (j = 0; j < height; j += 16) { for (i = 0; i < 16; i++) { @@ -269,8 +267,6 @@ static int __jpeg_encode_yuv(j_compress_ptr cinfo, unsigned int width, unsigned jpeg_write_raw_data(cinfo, data, 16); } } - - return MM_UTIL_ERROR_NONE; } static int __mm_util_jpeg_encode(mm_util_jpeg_ctrl_format_e control_format, mm_util_image_h decoded, int quality, FILE *fp, void **mem, size_t *csize) @@ -332,9 +328,7 @@ static int __mm_util_jpeg_encode(mm_util_jpeg_ctrl_format_e control_format, mm_u jpeg_start_compress(&cinfo, true); mm_util_debug("jpeg_start_compress"); - ret = __jpeg_encode_yuv(&cinfo, _width, _height, decoded); - if (ret != MM_UTIL_ERROR_NONE) - mm_util_error("__jpeg_encode_yuv failed"); + __jpeg_encode_yuv(&cinfo, _width, _height, decoded); } else if (_decoded->color == MM_UTIL_COLOR_RGB24 || _decoded->color == MM_UTIL_COLOR_GRAYSCALE || _decoded->color == MM_UTIL_COLOR_RGBA || _decoded->color == MM_UTIL_COLOR_BGRA || _decoded->color == MM_UTIL_COLOR_ARGB) { unsigned int row_stride = 0; JSAMPROW row_pointer[1]; diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec index 98f1af8..7958d9d 100644 --- a/packaging/libmm-utility.spec +++ b/packaging/libmm-utility.spec @@ -1,6 +1,6 @@ Name: libmm-utility Summary: Multimedia Framework Utility Library -Version: 0.4.23 +Version: 0.4.24 Release: 0 Group: System/Libraries License: Apache-2.0 -- 2.7.4