[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source

[Luboš Luňák (via logerrit)]

 vcl/source/outdev/bitmap.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a582e0651587b9ac518f27ee45a51ffb42e63264
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Jun 24 10:26:38 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jun 26 11:57:34 2020 +0200

    one more BmpConversion::N8BitNoConversion for alpha hack
    
    This was supposed to be included in
    2fcfbd73768b69ba58607a054e7f851be2942992.
    
    Change-Id: I79b6f1c953784d3288d3830dbe232630aac392f2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96987
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit d502408495e5c27f5690b84e809debcc57da03f7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97002
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 401ebd6a77f2..ea29dc438119 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -482,7 +482,7 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con
 
         // ensure 8 bit alpha
         if( aAlphaBitmap.GetBitCount() > 8 )
-            aAlphaBitmap.Convert( BmpConversion::N8BitGreys );
+            aAlphaBitmap.Convert( BmpConversion::N8BitNoConversion );
 
         return BitmapEx(GetBitmap( rSrcPt, rSize ), AlphaMask( aAlphaBitmap ) );
     }