diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-10-17 07:01:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-17 07:01:19 +0000 |
| commit | 7a027807a73aaa578d8f7a457438daac73158af0 (patch) | |
| tree | 0b61a222f33d7885a744117a4abaf0042a0763d3 /core/jni | |
| parent | 303e5c410c17b2be84051b3692635e6e24e37530 (diff) | |
| parent | c03443b23de0b474080168d892cd685283c3285b (diff) | |
| download | frameworks_base-7a027807a73aaa578d8f7a457438daac73158af0.zip frameworks_base-7a027807a73aaa578d8f7a457438daac73158af0.tar.gz frameworks_base-7a027807a73aaa578d8f7a457438daac73158af0.tar.bz2 | |
am c03443b2: Fix lens shading map origin calculation.
* commit 'c03443b23de0b474080168d892cd685283c3285b':
Fix lens shading map origin calculation.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_hardware_camera2_DngCreator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index 8b69bbd..4faea18 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -1660,10 +1660,11 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image uint32_t width = static_cast<uint32_t>(entry.data.i32[2]); uint32_t height = static_cast<uint32_t>(entry.data.i32[3]); if (entry2.count > 0 && entry2.count == lsmWidth * lsmHeight * 4) { + // GainMap rectangle is relative to the active area origin. err = builder.addGainMapsForMetadata(lsmWidth, lsmHeight, - ymin, - xmin, + 0, + 0, height, width, opcodeCfaLayout, |