diff options
| author | 2023-02-16 21:53:50 -0500 | |
|---|---|---|
| committer | 2023-02-17 16:15:53 +0000 | |
| commit | 9eb7779ae052d2566268b81e884f243d65ecbb7d (patch) | |
| tree | a3f22f5e68fdae85cb0dfdc362c4063a6a41d1aa /libs | |
| parent | 79d1135cb8913dbbb4e87e2d324394e830fc8165 (diff) | |
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
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/hwui/Bitmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp index cbebae9ed438..ecf6cfc05444 100644 --- a/libs/hwui/hwui/Bitmap.cpp +++ b/libs/hwui/hwui/Bitmap.cpp @@ -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 |