Fix build warnings

: -Wenum-conversion
: -Wsizeof-array-div

[Version] 1.2.4
[Issue Type] Clean up

Change-Id: I264818dd78f350f65cef4817be4c3264473a81d4
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 0bbbc56ec63d50a54a01da66af1b259fc85c3cf7..e8b3bd089d78fec3c61964717294bd6399ab88b3 100644 (file)
--- 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 355e46ab840fbbf976beda56f6de5ed46cc596bc..715ac9b0e9208cb142247a2963b8f0e5d80aaeb1 100644 (file)
--- 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 eaa691ba330701633f3509db700be1d2ba2f4cf6..2349a56db2609113deea83c9010d1ab81bb12b61 100644 (file)
--- 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 5c26e1680fa25b1bfbb054289a45153c6bb02660..f791edce65ae8aef866bcde5f460267a25e76eda 100644 (file)
--- 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;