[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/headless

[Caolán McNamara (via logerrit)]

 vcl/headless/svpgdi.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 4e9f2b4fb8776aa438a6a3d3a5f4da961fb55d0b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 19 13:01:33 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Aug 26 00:56:19 2021 +0200

    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 at allotropia.de>
    Tested-by: Jenkins

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)