commit 6a55c15fd683b6ccf55ad3cca4131e531554c164
author The Android Automerger <android-build@android.com> Mon May 13 05:55:48 2013 -0700
committer The Android Automerger <android-build@android.com> Mon May 13 05:55:48 2013 -0700
tree 254db2cea5e711079429630c569292e20ccd40d4
parent 6a3cbcafbfceabad2711388f1e417982deaf5fdf
parent 122887fd04723b6cd95c33f20e13749b2625d598

merge in jb-mr2-release history after reset to 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;