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

Commit 9eb7779a authored by John Reck's avatar John Reck
Browse files

Fix null deref & update compress 

Gainmap ctor always sets the native bitmap properly,
avoids potential confusion over mGainmapContents vs.
native bitmap pointer

Also call the fancier newer compress function

Test: SilkFX
Bug: 266628247
Change-Id: I89728a66202b4cdad54e8f163bc04dc419b8187b
parent 79d1135c

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...