diff options
| author | haesu.gwon <haesu.gwon@samsung.com> | 2016-04-01 11:47:03 +0900 |
|---|---|---|
| committer | haesu.gwon <haesu.gwon@samsung.com> | 2016-04-01 11:55:04 +0900 |
| commit | c569b30e129a0b999c87278de99121b9b0169e82 (patch) | |
| tree | 9df201e90a8250030e5a3fdd0b75c8ce9530deea | |
| parent | 169fb64ef5a85726126bbecc26a053494c0e61e1 (diff) | |
| download | camera-c569b30e129a0b999c87278de99121b9b0169e82.tar.gz camera-c569b30e129a0b999c87278de99121b9b0169e82.tar.bz2 camera-c569b30e129a0b999c87278de99121b9b0169e82.zip | |
[Release version 0.2.48] Fix coding rule violationsubmit/tizen/20160412.081107accepted/tizen/wearable/20160413.080607accepted/tizen/tv/20160413.075601accepted/tizen/mobile/20160413.073306accepted/tizen/ivi/20160413.082816accepted/tizen/common/20160413.131029
Change-Id: I35f36121a880d7df04b75687c2913a66c945b384
Signed-off-by: haesu.gwon <haesu.gwon@samsung.com>
| -rw-r--r-- | doc/camera_doc.h | 2 | ||||
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera.c | 11 | ||||
| -rw-r--r-- | test/camera_test.c | 4 |
4 files changed, 8 insertions, 11 deletions
diff --git a/doc/camera_doc.h b/doc/camera_doc.h index 5d2c4a1..1372c49 100644 --- a/doc/camera_doc.h +++ b/doc/camera_doc.h @@ -176,7 +176,7 @@ /** * @ingroup CAPI_MEDIA_CAMERA_MODULE * @defgroup CAPI_MEDIA_CAMERA_ATTRIBUTES_MODULE Attributes - * @brief The @ref CAPI_MEDIA_CAMERA_ATTRIBUTES_MODULE API provides functions to fetch camera attributes. + * @brief The @ref CAPI_MEDIA_CAMERA_ATTRIBUTES_MODULE API provides functions to fetch camera attributes. * * @section CAPI_MEDIA_CAMERA_ATTRIBUTES_MODULE_HEADER Required Header * \#include <camera.h> diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 116074e..5e4b42a 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -3,7 +3,7 @@ Name: capi-media-camera Summary: A Camera API -Version: 0.2.47 +Version: 0.2.48 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index 004027f..55725b8 100644 --- a/src/camera.c +++ b/src/camera.c @@ -69,9 +69,8 @@ static void __global(void *data, struct wl_registry *registry, LOGD("binding tizen surface for wayland"); *tz_surface = wl_registry_bind(registry, name, &tizen_surface_interface, version); - if (*tz_surface == NULL) { + if (*tz_surface == NULL) LOGE("failed to bind"); - } LOGD("done"); } @@ -85,8 +84,7 @@ static void __global_remove(void *data, struct wl_registry *wl_registry, uint32_ return; } -static const struct wl_registry_listener _camera_wl_registry_listener = -{ +static const struct wl_registry_listener _camera_wl_registry_listener = { __global, __global_remove }; @@ -100,13 +98,12 @@ void __parent_id_getter(void *data, struct tizen_resource *tizen_resource, uint3 *((unsigned int *)data) = id; - LOGD("[CLIENT] got parent_id [%u] from server", id); + LOGD("[CLIENT] got parent_id [%u] from server", id); return; } -static const struct tizen_resource_listener _camera_tz_resource_listener = -{ +static const struct tizen_resource_listener _camera_tz_resource_listener = { __parent_id_getter }; diff --git a/test/camera_test.c b/test/camera_test.c index 6ec0003..dbd713d 100644 --- a/test/camera_test.c +++ b/test/camera_test.c @@ -1047,11 +1047,11 @@ static void setting_menu(gchar buf) err = scanf("%d", &idx); bret = camera_attr_set_flash_mode(hcamcorder->camera, idx); break; - case 'S' : // Setting > flash state + case 'S': /* Setting > flash state */ g_print("*flash state\n"); err = camera_get_flash_state(cam_info, (camera_flash_state_e *)&idx); if (CAMERA_ERROR_NONE == err) - g_print("Current flash state = %s\n", idx?"ON":"OFF"); + g_print("Current flash state = %s\n", idx ? "ON" : "OFF"); else g_print("* Error : %d\n", err); break; |