commit 7fe6ac0de4b36f89a7f20dafb693e814344f9b4d
author Igor Murashkin <iam@google.com> Thu May 09 19:01:18 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 19:01:19 2013 +0000
tree 0e7cb7acf03cfb1e39a55aae9197689d61bf8fc5
parent 19cb41fbee0218c51345844a59437ee8c087c970
parent 05bbae99e0fc30ffdef8a3c5037fb3db7c55211b

Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 3503869..910aa19 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1844,13 +1844,14 @@
             CropRegion::OUTPUT_PREVIEW     |
             CropRegion::OUTPUT_VIDEO       |
             CropRegion::OUTPUT_PICTURE    ));
-    int32_t reqCropRegion[3] = {
+    int32_t reqCropRegion[4] = {
         static_cast<int32_t>(crop.left),
         static_cast<int32_t>(crop.top),
-        static_cast<int32_t>(crop.width)
+        static_cast<int32_t>(crop.width),
+        static_cast<int32_t>(crop.height)
     };
     res = request->update(ANDROID_SCALER_CROP_REGION,
-            reqCropRegion, 3);
+            reqCropRegion, 4);
     if (res != OK) return res;
 
     uint8_t reqVstabMode = videoStabilization ?