summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaesu Gwon <haesu.gwon@samsung.com>2016-04-26 11:35:13 +0900
committerHaesu Gwon <haesu.gwon@samsung.com>2016-04-26 11:35:13 +0900
commitcf50dd4046582e84f313ac72ae94d4ac595981b0 (patch)
treeb161a490803a3ff0ddf6d895f8fae5e2f24c5d2e
parentf32b05bd60ea52c47a47ad5c7de695b420a95e0b (diff)
downloadcamera-cf50dd4046582e84f313ac72ae94d4ac595981b0.tar.gz
camera-cf50dd4046582e84f313ac72ae94d4ac595981b0.tar.bz2
camera-cf50dd4046582e84f313ac72ae94d4ac595981b0.zip
Change-Id: Ie6b9412f5c6608805ea0b1ce2e409712c922271b Signed-off-by: Haesu Gwon <haesu.gwon@samsung.com>
-rw-r--r--packaging/capi-media-camera.spec2
-rw-r--r--src/camera.c9
-rw-r--r--src/camera_internal.c2
3 files changed, 6 insertions, 7 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index fca52aa..282afdb 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.51
+Version: 0.2.52
Release: 0
Group: Multimedia/API
License: Apache-2.0
diff --git a/src/camera.c b/src/camera.c
index b70bd41..fbfe46d 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -2711,11 +2711,10 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ
} else
muse_camera_msg_send1(api, sock_fd, cb_info, ret, INT, type);
- if (ret != CAMERA_ERROR_NONE) {
+ if (ret != CAMERA_ERROR_NONE)
LOGE("set display error 0x%x", ret);
- } else if (type == CAMERA_DISPLAY_TYPE_EVAS) {
+ else if (type == CAMERA_DISPLAY_TYPE_EVAS)
SET_PREVIEW_CB_TYPE(cb_info, PREVIEW_CB_TYPE_EVAS);
- }
return ret;
}
@@ -2882,7 +2881,7 @@ int camera_set_display_rotation(camera_h camera, camera_rotation_e rotation)
g_mutex_unlock(&pc->cb_info->evas_mutex);
- if (ret!= MM_ERROR_NONE) {
+ if (ret != MM_ERROR_NONE) {
LOGE("failed to set rotation for evas surface 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
@@ -2966,7 +2965,7 @@ int camera_set_display_flip(camera_h camera, camera_flip_e flip)
g_mutex_unlock(&pc->cb_info->evas_mutex);
- if (ret!= MM_ERROR_NONE) {
+ if (ret != MM_ERROR_NONE) {
LOGE("failed to set flip for evas surface 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
diff --git a/src/camera_internal.c b/src/camera_internal.c
index b783041..ac76cfd 100644
--- a/src/camera_internal.c
+++ b/src/camera_internal.c
@@ -38,4 +38,4 @@ int camera_start_evas_rendering(camera_h camera)
int camera_stop_evas_rendering(camera_h camera, bool keep_screen)
{
return _camera_stop_evas_rendering(camera, keep_screen);
-} \ No newline at end of file
+}