vcl/skia/salbmp.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit d697e25846433c3a589228262cf8d0f7b6f5fd7e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jul 4 10:41:14 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 4 12:14:31 2023 +0200
remove skia workaround
No longer necessary since
commit 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Jan 27 10:48:45 2023 +0200
Update skia to m111
Change-Id: Icfef07ed3683e84bdd8b94350f40ea83e95bf324
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153948
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 1ce85dd0e837..97609c11d125 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -888,10 +888,7 @@ const sk_sp<SkImage>&
SkiaSalBitmap::GetAlphaSkImage(DirectImage direct) const
SkiaZone zone;
const bool scaling = imageSize(mImage) != mSize;
SkPixmap pixmap;
- // Note: We cannot do this when 'scaling' because
SkCanvas::drawImageRect()
- // with kAlpha_8_SkColorType as source and destination would act as
SkBlendMode::kSrcOver
- // despite SkBlendMode::kSrc set
(https://bugs.chromium.org/p/skia/issues/detail?id=9692).
- if (mImage->peekPixels(&pixmap) && !scaling)
+ if (mImage->peekPixels(&pixmap))
{
assert(pixmap.colorType() == kN32_SkColorType);
// In non-GPU mode, convert 32bit data to 8bit alpha, this is
faster than
