commit 42d8b7d7abe4ecab049e020c3836dae97660dd4d
author Yujie Qin <yujieqin@google.com> Mon Feb 29 08:21:50 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 29 08:21:52 2016 +0000
tree 43ab54495fd8a273a1359f8d7212a50f8687b454
parent 18eda4a1caba579962c54c6a8ca8ba08e2430c40
parent 01f6390ff4a8f3186ac7a6fb4c6f1485a5163bcf

Merge "Use new API from PIEX" into nyc-dev

media/jni/android_media_ExifInterface.cpp

diff --git a/media/jni/android_media_ExifInterface.cpp b/media/jni/android_media_ExifInterface.cpp
index a1fcb07..f7481af 100644
--- a/media/jni/android_media_ExifInterface.cpp
+++ b/media/jni/android_media_ExifInterface.cpp
@@ -100,10 +100,10 @@
 
     KeyedVector<String8, String8> map;
 
-    if (image_data.thumbnail_length > 0) {
+    if (image_data.thumbnail.length > 0) {
         map.add(String8("hasThumbnail"), String8("true"));
-        map.add(String8("thumbnailOffset"), String8::format("%d", image_data.thumbnail_offset));
-        map.add(String8("thumbnailLength"), String8::format("%d", image_data.thumbnail_length));
+        map.add(String8("thumbnailOffset"), String8::format("%d", image_data.thumbnail.offset));
+        map.add(String8("thumbnailLength"), String8::format("%d", image_data.thumbnail.length));
     } else {
         map.add(String8("hasThumbnail"), String8("false"));
     }