vcl/skia/gdiimpl.cxx | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit acb7f9e072d55c3f91bec247b809b4d367062f60
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Jun 24 10:38:41 2020 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Jun 24 12:40:24 2020 +0200
in Skia raster mode cache even enlarging of images (tdf#134160)
Change-Id: I842b55cd922eb0e411fd7450e84224b41ba82a2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96989
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 47f857235f4f..6dd6a5d35bd7 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1256,16 +1256,23 @@ static sk_sp<SkImage> mergeBitmaps(const SkiaSalBitmap&
bitmap, const SkiaSalBit
{
sk_sp<SkImage> image;
OString key;
+ // Probably not much point in caching of just doing a copy.
if (alphaBitmap == nullptr && targetSize == bitmap.GetSize())
- blockCaching = true; // probably not much point in caching of just
doing a copy
- if (targetSize.Width() > bitmap.GetSize().Width()
- || targetSize.Height() > bitmap.GetSize().Height())
- blockCaching = true; // caching enlarging is probably wasteful and not
worth it
- if (bitmap.GetSize().Width() < 100 && bitmap.GetSize().Height() < 100)
- blockCaching = true; // image too small to be worth caching
+ blockCaching = true;
+ // Caching enlarging is probably wasteful and not worth it.
+ // With Raster it may make a difference though (tdf#134160).
+ if (SkiaHelper::renderMethodToUse() != SkiaHelper::RenderRaster
+ && (targetSize.Width() > bitmap.GetSize().Width()
+ || targetSize.Height() > bitmap.GetSize().Height()))
+ blockCaching = true;
+ // Image too small to be worth caching.
+ if (bitmap.GetSize().Width() < 100 && bitmap.GetSize().Height() < 100
+ && targetSize.Width() < 100 && targetSize.Height() < 100)
+ blockCaching = true;
+ // GPU-accelerated shouldn't need caching of applying alpha.
if (SkiaHelper::renderMethodToUse() != SkiaHelper::RenderRaster
&& targetSize == bitmap.GetSize())
- blockCaching = true; // GPU-accelerated shouldn't need caching of
applying alpha
+ blockCaching = true;
if (!blockCaching)
{
OStringBuffer keyBuf;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
