svx/source/svdraw/svdpdf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6478985aa277eba1a32146b9fe9047ba3199fcc5
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jan 11 00:44:54 2025 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jan 13 11:57:09 2025 +0100

    fix import BGRx image from PDF
    
    bug introduced in
        commit 45c753aff6468b9761e68bc0bf48ab161cd0cba6
        Author: Miklos Vajna <vmik...@collabora.co.uk>
        Date:   Fri Sep 28 12:30:01 2018 +0200
        svx: pdfium's FPDFImageObj_GetBitmapBgra() is not needed after all
    
    Although the confusion was understandable, since the previous commit
    which had introduced FPDFImageObj_GetBitmapBgra, which, despite
    its name, actually returned RGB* data
    
    Change-Id: I762f1e963d64b4243e21e26cab31c05f4903af49
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180091
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit d334e7da3013392549694cd7dd3dd326a0387f19)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180163
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index cf2c4ac28f1a..6a00bd286ce1 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -879,7 +879,7 @@ void 
ImpSdrPdfImport::ImportImage(std::unique_ptr<vcl::pdf::PDFiumPageObject> co
             ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N24BitTcBgr, nHeight, 
nStride);
             break;
         case vcl::pdf::PDFBitmapType::BGRx:
-            ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcRgba, nHeight, 
nStride);
+            ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcBgra, nHeight, 
nStride);
             break;
         case vcl::pdf::PDFBitmapType::BGRA:
             ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcBgra, nHeight, 
nStride);

Reply via email to