vcl/source/gdi/pdfwriter_impl.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
New commits: commit e2ef2744b1db2f7ef2d1569ca315cd3b019f5985 Author: Patrick Luby <[email protected]> AuthorDate: Sat Feb 8 14:04:04 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Feb 12 09:27:31 2025 +0100 Revert "tdf#164223 invert alpha mask for JPEG images" This reverts commit 455d7b4f113768b4b3be5b8989aa13708130531a. 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/+/181295 Reviewed-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Patrick Luby <[email protected]> Reviewed-by: Michael Weghorn <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Xisco Fauli <[email protected]> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index b343afbcb562..cb914231d049 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -9165,11 +9165,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 ); }
