[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/filter/jpeg/JpegWriter.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 61e8387fa8ab55a04b95839c7c385c163d6de1cd
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 4 15:23:59 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Dec 6 13:28:23 2019 +0100

    tdf#128992 Compressing PNG files with alpha channel get a black background
    
    regression from
        commit d4442ac1ac9aae36dbc08fda8154d71ea0f81708
        Date:   Wed May 30 13:02:25 2018 +0200
        drop Graphic::GetBitmap
    
    Change-Id: I937f89255eebc68dffc2987e628a30bc7d2eed7b
    Reviewed-on: https://gerrit.libreoffice.org/84412
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 1187e2b35bb864808d9d158f0b10d83ce75dbaa7)
    Reviewed-on: https://gerrit.libreoffice.org/84428
    (cherry picked from commit 54a4c75bd35ba684927862f4e859623e91ebcfe8)
    Reviewed-on: https://gerrit.libreoffice.org/84542
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 3164918cc90e..7700e3e8dda6 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -197,7 +197,8 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
         mxStatusIndicator->start( OUString(), 100 );
     }
 
-    Bitmap aGraphicBmp( rGraphic.GetBitmapEx().GetBitmap() );
+    Color replaceColor = COL_WHITE;
+    Bitmap aGraphicBmp( rGraphic.GetBitmapEx().GetBitmap(&replaceColor) );
 
     if ( mbGreys )
     {