commit 68ced89949fc1cce198f25e09bf9bdb12616a98c
author Ruben Brunk <rubenbrunk@google.com> Wed Nov 12 18:46:45 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 12 18:46:47 2014 +0000
tree 55efb0b345a1bb62816d6cf4214be3d252b013c6
parent 2755644d32fc87dd29612302edc7ebf4cba31ff6
parent 9592b0136aadd8d2dbe140f743f4230b5a6542ae

Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev

core/jni/android_hardware_camera2_DngCreator.cpp

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 @@
             }
 
             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);
         }
     }