diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-12 03:44:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 03:44:14 +0000 |
| commit | 5dcc254210d451447508d6730aed2f0eb3b02655 (patch) | |
| tree | 71ed684495945a2da2561abf3c535ce8bcf4ae6f | |
| parent | 38aa961b2734cf1ea7bc5e8979aa7a3a6a2aa4a2 (diff) | |
| parent | 6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86 (diff) | |
| download | frameworks_base-5dcc254210d451447508d6730aed2f0eb3b02655.zip frameworks_base-5dcc254210d451447508d6730aed2f0eb3b02655.tar.gz frameworks_base-5dcc254210d451447508d6730aed2f0eb3b02655.tar.bz2 | |
am 6f4c0f8e: am bc0b57f3: Merge "Frameworks/base: Right transform in DngCreator"
* commit '6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86':
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); } } |