[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/inc vcl/unx

[Katarina Behrens]

 vcl/inc/qt5/Qt5Tools.hxx         |    1 +
 vcl/unx/kde5/KDE5SalGraphics.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dbcd55464c80237431a255c95f85f576bd419ad0
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Thu May 3 12:03:12 2018 +0200

    Use QImage format with premultiplied alpha
    
    as that's what cairo (almost) silently expects
    
    Change-Id: If1ad6f28fcc6fb7ddc2ac4fcec0a31bad512cb2a

diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx
index c7b47014beb0..d632a5ed8ce5 100644
--- a/vcl/inc/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/Qt5Tools.hxx
@@ -91,6 +91,7 @@ inline sal_uInt16 getFormatBits(QImage::Format eFormat)
         case QImage::Format_RGB888:
             return 24;
         case Qt5_DefaultFormat32:
+        case QImage::Format_ARGB32_Premultiplied:
             return 32;
         default:
             std::abort();
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 13b791943199..92275052013a 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -180,7 +180,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part,
     //if no image, or resized, make a new image
     if (!m_image || m_image->size() != widgetRect.size())
     {
-        m_image.reset(new QImage( widgetRect.width(), widgetRect.height(), QImage::Format_ARGB32 ) );
+        m_image.reset(new QImage( widgetRect.width(), widgetRect.height(), QImage::Format_ARGB32_Premultiplied ) );
     }
 
     // Default image color - just once