commit 6a3cbcafbfceabad2711388f1e417982deaf5fdf
author Igor Murashkin <iam@google.com> Thu May 09 19:01:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 19:01:24 2013 +0000
tree 254db2cea5e711079429630c569292e20ccd40d4
parent 7af1168953fa6aa5337de11fbf78d16fc6768834
parent a40ca07e12bb91f76cc5bb0ff6a723ea7b724eb8

Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev

libcamera2/MetadataConverter.cpp

diff --git a/libcamera2/MetadataConverter.cpp b/libcamera2/MetadataConverter.cpp
index a39be4e..4ae1e73 100644
--- a/libcamera2/MetadataConverter.cpp
+++ b/libcamera2/MetadataConverter.cpp
@@ -172,9 +172,9 @@
 
 
             case ANDROID_SCALER_CROP_REGION:
-                if (NO_ERROR != CheckEntryTypeMismatch(&curr_entry, TYPE_INT32, 3))
+                if (NO_ERROR != CheckEntryTypeMismatch(&curr_entry, TYPE_INT32, 4))
                     break;
-                for (i=0 ; i<curr_entry.count ; i++)
+                for (i=0 ; i<3; i++)
                     dst->ctl.scaler.cropRegion[i] = ALIGN(curr_entry.data.i32[i], 2);
                 break;