diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-19 13:01:33 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-26 00:56:19 +0200 |
| commit | 4e9f2b4fb8776aa438a6a3d3a5f4da961fb55d0b (patch) | |
| tree | 8522374b1ac76a7dc8ab925db6418920c59db8c9 | |
| parent | openssl: upgrade to release 1.1.1l (diff) | |
| download | core-4e9f2b4fb8776aa438a6a3d3a5f4da961fb55d0b.tar.gz core-4e9f2b4fb8776aa438a6a3d3a5f4da961fb55d0b.zip | |
tdf#142394 return to using CAIRO_OPERATOR_SOURCE in drawBitmap
since
commit cd09fc9451897e6efedbf9f5e1d5b9bd96e65cb5
Date: Mon Mar 22 19:06:15 2021 +0100
do not enable mbSupportsBitmap32 for headless (tdf#141171)
turned back off the mbSupportsBitmap32 support experiemented with in
commit 86ea64f216819696cd86d1926aff0a138ace2baf
Date: Fri Feb 15 13:14:32 2019 +0100
Support for native 32bit Bitmap in VCL and SVP (cairo) backend
Change-Id: I818c3f11d0334278a65a0e45b61141327669121d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120727
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index c756c79ae60a..35bbcf656605 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -2168,7 +2168,12 @@ void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceB return; } +#if 0 // LO code is not yet bitmap32-ready. + // See matching SvpSalInstance::GetBackendCapabilities copyWithOperator(rTR, source, CAIRO_OPERATOR_OVER); +#else + copyWithOperator(rTR, source, CAIRO_OPERATOR_SOURCE); +#endif } void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const BitmapBuffer* pBuffer, cairo_operator_t eOp) |