summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2015-06-25 14:09:37 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2015-06-25 14:11:05 +0900
commit9f9b7f0b1c84c648f6e62ff10cc12b6e02e8ebac (patch)
tree98f91e074a8cea97bc50247725b75591de35eacc
parent290b3466d8057b523a22edd69eb5c4fefe69901e (diff)
downloadcamera-9f9b7f0b1c84c648f6e62ff10cc12b6e02e8ebac.tar.gz
camera-9f9b7f0b1c84c648f6e62ff10cc12b6e02e8ebac.tar.bz2
camera-9f9b7f0b1c84c648f6e62ff10cc12b6e02e8ebac.zip
Change-Id: Iedef4e86ca10a9a240deea73b3a4d10cabcbc4bc Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rwxr-xr-xpackaging/capi-media-camera.spec2
-rw-r--r--src/camera.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 75600cb..bb36929 100755
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -3,7 +3,7 @@
Name: capi-media-camera
Summary: A Camera library in Tizen C API
-Version: 0.2.2
+Version: 0.2.3
Release: 0
Group: Multimedia/API
License: Apache-2.0
diff --git a/src/camera.c b/src/camera.c
index fe94384..9de2452 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -194,7 +194,7 @@ int __convert_camera_error_code(const char *func, int code)
}
if (code != MM_ERROR_NONE) {
- LOGE("%s(0x%08x) : core frameworks error code(0x%08x)", errorstr, ret, code);
+ LOGE("[%s] %s(0x%08x) : core frameworks error code(0x%08x)", func ? func : "NULL_FUNC", errorstr, ret, code);
}
return ret;
@@ -1573,7 +1573,10 @@ int camera_set_preview_resolution(camera_h camera, int width, int height)
MMCAM_CAMERA_FPS, &mm_fps,
NULL);
- mm_camcorder_get_fps_list_by_resolution(handle->mm_handle, width, height, &info);
+ ret = mm_camcorder_get_fps_list_by_resolution(handle->mm_handle, width, height, &info);
+ if (ret != MM_ERROR_NONE) {
+ return __convert_camera_error_code(__func__, ret);
+ }
for (i = 0 ; i < info.int_array.count ; i++) {
if (info.int_array.array[i] == mm_fps) {