diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-12 01:44:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-12 01:44:30 +0000 |
| commit | bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf (patch) | |
| tree | 5ac98c60b320e772affd96a181b912d45dc60f69 | |
| parent | 7c4ef052d521d5ccf8acfb03c9332b59ea737cea (diff) | |
| parent | 2377cd319f8a77f147f3d70a7ddc75fa9e9fe87c (diff) | |
| download | frameworks_base-bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf.zip frameworks_base-bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf.tar.gz frameworks_base-bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf.tar.bz2 | |
Merge "Frameworks/base: Right transform in DngCreator"
| -rw-r--r-- | core/jni/android_hardware_camera2_DngCreator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index 31c7b9f..533313a 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -1278,7 +1278,7 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt } BAIL_IF_INVALID(writer->addEntry(TAG_CAMERACALIBRATION2, entry2.count, - calibrationTransform1, TIFF_IFD_0), env, TAG_CAMERACALIBRATION2, writer); + calibrationTransform2, TIFF_IFD_0), env, TAG_CAMERACALIBRATION2, writer); } } |