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

Commit 646cbb57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix null deref & update compress" into udc-dev am: 900174ef 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21477341



Change-Id: I8086adf8fa0ebc64065b0a21f981498b3cf56959
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c07b373e 900174ef

graphics/java/android/graphics/Gainmap.java

+1 −1
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ public final class Gainmap implements Parcelable { 
            throw new RuntimeException("internal error: native gainmap is 0");

        }



        mGainmapContents = gainmapContents;

        mNativePtr = nativeGainmap;

        setGainmapContents(gainmapContents);



        NoImagePreloadHolder.sRegistry.registerNativeAllocation(this, nativeGainmap);

    }

libs/hwui/hwui/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ bool Bitmap::compress(JavaCompressFormat format, int32_t quality, SkWStream* str 
        SkBitmap baseBitmap = getSkBitmap();

        SkBitmap gainmapBitmap = gainmap()->bitmap->getSkBitmap();

        SkJpegEncoder::Options options{.fQuality = quality};

        return SkJpegGainmapEncoder::EncodeJpegR(stream, baseBitmap.pixmap(), options,

        return SkJpegGainmapEncoder::EncodeHDRGM(stream, baseBitmap.pixmap(), options,

                                                 gainmapBitmap.pixmap(), options, gainmap()->info);

    }

#endif

tests/SilkFX/assets/gainmaps/granddam.jpg

0 → 100644
+1.75 MiB
Loading image diff...

tests/SilkFX/assets/gainmaps/lightbulb.jpg

0 → 100644
+2.63 MiB
Loading image diff...

tests/SilkFX/assets/gainmaps/porsche911.jpg

0 → 100644
+2.74 MiB
Loading image diff...