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

Commit 6dcc675d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DngCreator: Avoid moving absent tag entries"

parents b3244776 a7503b90

core/jni/android_hardware_camera2_DngCreator.cpp

+8 −2
Original line number Diff line number Diff line
@@ -1971,8 +1971,14 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image 
        tagsToMove.add(TAG_DEFAULTSCALE);

        tagsToMove.add(TAG_DEFAULTCROPORIGIN);

        tagsToMove.add(TAG_DEFAULTCROPSIZE);



        if (nullptr != writer->getEntry(TAG_OPCODELIST2, TIFF_IFD_0).get()) {

            tagsToMove.add(TAG_OPCODELIST2);

        }



        if (nullptr != writer->getEntry(TAG_OPCODELIST3, TIFF_IFD_0).get()) {

            tagsToMove.add(TAG_OPCODELIST3);

        }



        if (moveEntries(writer, TIFF_IFD_0, TIFF_IFD_SUB1, tagsToMove) != OK) {

            jniThrowException(env, "java/lang/IllegalStateException", "Failed to move entries");