[Libreoffice-commits] core.git: vcl/source

[Noel Grandin]

 vcl/source/gdi/bitmapex.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b24a90799b16cde737a0f0e2b1d71acd8fd69019
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 12 15:11:26 2018 +0200

    crashtesting: tdf111681-6.pptx
    
    regression from
        commit e5012e53b919ae4921d6d35660bde323a6f28417
        use scanline when reading pixel data
    
    Change-Id: Ic9382426191d5cbbffc6c3fd6f7038ed93715b8e
    Reviewed-on: https://gerrit.libreoffice.org/49598
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 3acb0a36f26a..797319164de4 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1315,7 +1315,7 @@ void BitmapEx::setAlphaFrom( sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo )
             Scanline pScanlineRead = pReadAccess->GetScanline( nY );
             for ( long nX = 0; nX < pReadAccess->Width(); nX++ )
             {
-                const sal_uInt8 cIndex = pReadAccess->GetIndexFromData( pScanlineRead, nX );
+                const sal_uInt8 cIndex = pReadAccess->GetPixelFromData( pScanlineRead, nX ).GetBlueOrIndex();
                 if ( cIndex == cIndexFrom )
                     pWriteAccess->SetPixelOnData( pScanline, nX, BitmapColor(nAlphaTo) );
             }