core.git: Branch 'libreoffice-25-2-1' - vcl/source

[Patrick Luby (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a46b9fe3d0117334230630e94cfe4eaad79dd4da
Author:     Patrick Luby <guibomac...@gmail.com>
AuthorDate: Sat Feb 8 14:04:04 2025 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Feb 12 09:27:43 2025 +0100

    Revert "tdf#164223 invert alpha mask for JPEG images"
    
    This reverts commit 4925a905232f1bbfe6034fb3e6d33a61e46d0229.
    
    Reason for revert: the commit causes tdf#165125. Interestingly, tdf#165125 
no longer occurs on this branch after reverting the
    above commit so it appears that after my commit, some other
    commit may have fixed the underlying bug.
    
    Change-Id: Ief33e857b389882f4961a2b1bb8b1945f950e9cd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181298
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 270e9a407921..b86e84c03e79 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9282,11 +9282,7 @@ void PDFWriterImpl::writeJPG( const JPGEmit& rObject )
     {
         BitmapEmit aEmit;
         aEmit.m_nObject = nMaskObject;
-        // tdf#164223 invert alpha mask for JPEG images
-        AlphaMask aAlpha = rObject.m_aAlphaMask;
-        if( aAlpha.hasAlpha() )
-            aAlpha.Invert();
-        aEmit.m_aBitmap = BitmapEx( rObject.m_aAlphaMask.GetBitmap(), aAlpha );
+        aEmit.m_aBitmap = BitmapEx( rObject.m_aAlphaMask.GetBitmap(), 
rObject.m_aAlphaMask );
         writeBitmapObject( aEmit, true );
     }