diff options
| author | Marco Nelissen <marcone@google.com> | 2014-01-22 15:10:57 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-01-22 15:10:57 -0800 |
| commit | 0937eed32fbe780182cb0349ac29680add7e492c (patch) | |
| tree | a3292a196254a5062f96535bb5d2468c4955a083 | |
| parent | a6a7f2ffc4da6722a785ec5024fb99d67dfcedb9 (diff) | |
| download | frameworks_base-0937eed32fbe780182cb0349ac29680add7e492c.zip frameworks_base-0937eed32fbe780182cb0349ac29680add7e492c.tar.gz frameworks_base-0937eed32fbe780182cb0349ac29680add7e492c.tar.bz2 | |
Check that the exif bits are actually there
b/12663599
Change-Id: If2af0ab20f29ab3264a8c6c8c4abf0ebeff6616c
| -rw-r--r-- | media/jni/android_mtp_MtpDatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 4fbc55a..6b0bd0d 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -823,8 +823,8 @@ MtpResponseCode MyMtpDatabase::getObjectInfo(MtpObjectHandle handle, exifdata->ifd[EXIF_IFD_EXIF], EXIF_TAG_PIXEL_Y_DIMENSION); info.mThumbCompressedSize = exifdata->data ? exifdata->size : 0; info.mThumbFormat = MTP_FORMAT_EXIF_JPEG; - info.mImagePixWidth = getLongFromExifEntry(w); - info.mImagePixHeight = getLongFromExifEntry(h); + info.mImagePixWidth = w ? getLongFromExifEntry(w) : 0; + info.mImagePixHeight = h ? getLongFromExifEntry(h) : 0; exif_data_unref(exifdata); } } |