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

Commit 02f9e235 authored by Jaesung Chung's avatar Jaesung Chung Committed by Android (Google) Code Review
Browse files

Merge "ExifInterface: return only a JPEG-compressed thumbnail of RAW images" into nyc-dev

parents f3323287 742e89f6

media/jni/android_media_ExifInterface.cpp

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ static jobject getRawAttributes(JNIEnv* env, SkStream* stream, bool returnThumbn 


    KeyedVector<String8, String8> map;



    if (image_data.thumbnail.length > 0) {

    if (image_data.thumbnail.length > 0

            && image_data.thumbnail.format == ::piex::Image::kJpegCompressed) {

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

media/jni/android_mtp_MtpDatabase.cpp

+3 −2
Original line number Diff line number Diff line
@@ -932,8 +932,9 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize) 
                    break;

                }



                if (image_data.thumbnail.length == 0) {

                    // No thumbnail.

                if (image_data.thumbnail.length == 0

                        || image_data.thumbnail.format == ::piex::Image::kJpegCompressed) {

                    // No thumbnail or non jpeg thumbnail.

                    break;

                }