summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorathurh <athurh@gmail.com>2013-03-19 03:23:12 +0100
committerathurh <athurh@gmail.com>2013-03-19 03:23:12 +0100
commit8f1e7b0333d4f7ec1fa946c02b7d07a2a5ac3104 (patch)
tree99362c2d334cd29f3cfe573fb0780913efc82ba3 /camera
parent93861e1fda9de40af036d76b177b08b392e989d5 (diff)
downloaddevice_samsung_galaxys2-common-8f1e7b0333d4f7ec1fa946c02b7d07a2a5ac3104.zip
device_samsung_galaxys2-common-8f1e7b0333d4f7ec1fa946c02b7d07a2a5ac3104.tar.gz
device_samsung_galaxys2-common-8f1e7b0333d4f7ec1fa946c02b7d07a2a5ac3104.tar.bz2
camera: manage picture width and height separately
required for 3264x2448 <-> 3264x1968 Change-Id: I729402e208dccee8cf1d1368c1d2d0dcd1f08a3d
Diffstat (limited to 'camera')
-rw-r--r--camera/exynos_camera.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c
index 893f862..6d9ad9c 100644
--- a/camera/exynos_camera.c
+++ b/camera/exynos_camera.c
@@ -587,13 +587,10 @@ int exynos_camera_params_apply(struct exynos_camera *exynos_camera)
if (picture_size_string != NULL) {
sscanf(picture_size_string, "%dx%d", &picture_width, &picture_height);
- if (picture_width != 0 && picture_height != 0 &&
- picture_width != exynos_camera->picture_width &&
- picture_height != exynos_camera->picture_height) {
+ if (picture_width != 0 && picture_width != exynos_camera->picture_width)
exynos_camera->picture_width = picture_width;
+ if (picture_height != 0 && picture_height != exynos_camera->picture_height)
exynos_camera->picture_height = picture_height;
- }
-
}
picture_format_string = exynos_param_string_get(exynos_camera, "picture-format");