[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/salbmp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6089e8b178cf836df3f4cdb0be57376d31a0db76
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Jun 27 09:22:18 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 2 12:54:37 2020 +0200

    properly copy pending scale quality in SkiaSalBitmap
    
    EnsureBitmapData() was using Create() to make a copy of the bitmap
    to scale, but the quality was not copied, so it was usually
    at the default (and slowest) high quality.
    
    Change-Id: I7100304a935db420e2d55c2a9450016be1195965
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97277
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 3ff036f0a64972e1905367081f87e919d1650d07)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97293
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 2ea9bf60cd89..22586af61606 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -147,6 +147,7 @@ bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount)
     mSize = src.mSize;
     mPixelsSize = src.mPixelsSize;
     mScanlineSize = src.mScanlineSize;
+    mScaleQuality = src.mScaleQuality;
 #ifdef DBG_UTIL
     mWriteAccessCount = 0;
 #endif
@@ -660,7 +661,7 @@ void SkiaSalBitmap::EnsureBitmapData()
                                                        << "->" << mSize << ":"
                                                        << static_cast<int>(mScaleQuality));
         mPixelsSize = mSize;
-        mScaleQuality = kNone_SkFilterQuality;
+        mScaleQuality = kHigh_SkFilterQuality;
         // Information about the pending scaling has been discarded, so make sure we do not
         // keep around any cached images that would still need scaling.
         ResetCachedDataBySize();