Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0914864 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Check that the exif bits are actually there"

parents 39e79006 0937eed3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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);
        }
    }