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

New commits:
commit 36b4609461d9daa7cfd9b00689f64d31717e5044
Author:     Patrick Luby <guibomac...@gmail.com>
AuthorDate: Sat Feb 8 14:04:04 2025 +0100
Commit:     Patrick Luby <guibomac...@gmail.com>
CommitDate: Sat Feb 8 18:05:58 2025 +0100

    Revert "tdf#164223 invert alpha mask for JPEG images"
    
    This reverts commit 5e03f4d40c14cc79b1f3f790955196a31eec5d3c.
    
    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/+/181291
    Tested-by: Jenkins
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index eb7dcfdebceb..b5b30bb72b45 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9185,11 +9185,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 );
         writeBitmapMaskObject( aEmit );
     }
 

Reply via email to