From 25c4125f404515ba4b3930f841e3aefe8560d9de Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Fri, 3 Jan 2025 08:42:20 +0900 Subject: [PATCH] Fix build warnings : -Wenum-conversion : -Wsizeof-array-div [Version] 1.2.4 [Issue Type] Clean up Change-Id: I264818dd78f350f65cef4817be4c3264473a81d4 Signed-off-by: Jeongmo Yang --- packaging/capi-media-camera.spec | 2 +- src/camera.c | 18 ++++++------------ src/camera_internal.c | 4 ++-- test/camera_test.c | 2 +- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 0bbbc56..e8b3bd0 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -1,6 +1,6 @@ Name: capi-media-camera Summary: A Camera API -Version: 1.2.3 +Version: 1.2.4 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index 355e46a..715ac9b 100644 --- a/src/camera.c +++ b/src/camera.c @@ -4971,19 +4971,16 @@ int camera_attr_set_geotag(camera_h camera, double latitude, double longitude, d int ret = CAMERA_ERROR_NONE; camera_cli_s *pc = (camera_cli_s *)camera; muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_GEOTAG; - double set_geotag[3] = {latitude, longitude, altitude}; + double set_geotag[] = {latitude, longitude, altitude}; char *msg = NULL; - int length = 0; + int array_length = (G_N_ELEMENTS(set_geotag) * sizeof(set_geotag[0])) / sizeof(int); CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER); CAM_LOG_INFO("Enter"); - length = sizeof(set_geotag) / sizeof(int) + \ - (sizeof(set_geotag) % sizeof(int) ? 1 : 0); - msg = muse_core_msg_new(api, - MUSE_TYPE_ARRAY, "set_geotag", length, (int *)set_geotag, + MUSE_TYPE_ARRAY, "set_geotag", array_length, set_geotag, NULL); _camera_send_message_get_return(pc->cb_info, api, msg, CAMERA_CB_TIMEOUT, &ret); @@ -6341,9 +6338,9 @@ int camera_attr_set_display_roi_area(camera_h camera, int x, int y, int width, i int ret = CAMERA_ERROR_NONE; camera_cli_s *pc = (camera_cli_s *)camera; muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_ROI_AREA; - int set_display_roi_area[4] = {x, y, width, height}; + int set_display_roi_area[] = {x, y, width, height}; char *msg = NULL; - int length = 0; + int array_length = (G_N_ELEMENTS(set_display_roi_area) * sizeof(set_display_roi_area[0])) / sizeof(int); CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER); @@ -6357,11 +6354,8 @@ int camera_attr_set_display_roi_area(camera_h camera, int x, int y, int width, i } } - length = sizeof(set_display_roi_area) / sizeof(int) + \ - (sizeof(set_display_roi_area) % sizeof(int) ? 1 : 0); - msg = muse_core_msg_new(api, - MUSE_TYPE_ARRAY, "set_display_roi_area", length, (int *)set_display_roi_area, + MUSE_TYPE_ARRAY, "set_display_roi_area", array_length, set_display_roi_area, NULL); _camera_send_message_get_return(pc->cb_info, api, msg, CAMERA_CB_TIMEOUT, &ret); diff --git a/src/camera_internal.c b/src/camera_internal.c index eaa691b..2349a56 100644 --- a/src/camera_internal.c +++ b/src/camera_internal.c @@ -86,9 +86,9 @@ void camera_create_preview_frame(void *stream, int num_buffer_fd, /* set frame info */ if (_stream->format == MM_PIXEL_FORMAT_ITLV_JPEG_UYVY) - frame->format = MM_PIXEL_FORMAT_UYVY; + frame->format = (camera_pixel_format_e)MM_PIXEL_FORMAT_UYVY; else - frame->format = _stream->format; + frame->format = (camera_pixel_format_e)_stream->format; frame->width = _stream->width; frame->height = _stream->height; diff --git a/test/camera_test.c b/test/camera_test.c index 5c26e16..f791edc 100644 --- a/test/camera_test.c +++ b/test/camera_test.c @@ -755,7 +755,7 @@ static bool af_mode_foreach_cb(camera_attr_iso_e mode, void *user_data) return true; } -static bool exposure_mode_cb(camera_attr_af_mode_e mode, void *user_data) +static bool exposure_mode_cb(camera_attr_exposure_mode_e mode, void *user_data) { exposure_stack *data = (exposure_stack *)user_data; -- 2.34.1