core.git: vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/bitmap/BitmapTools.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7f4b3cea87974f39362c9d1456da7e0d26a1f094
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 8 14:50:28 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 8 20:00:35 2025 +0200

    fix alpha conversions in CanvasCairoExtractBitmapData
    
    after
        commit 09298d001e98ed494ecb1df5cb563b081da050e8
        Author: Noel Grandin <noelgran...@gmail.com>
        Date:   Tue Jul 29 19:59:53 2025 +0200
        BitmapEx->Bitmap in bitmapExFromXBitmap
    
    spotted by caolanm
    
    Change-Id: If17340131cc6eed1d4953d362247d8a39c589bf3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189191
    Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 7148cf68f712..50bdcafa58b3 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -1127,7 +1127,7 @@ void CanvasCairoExtractBitmapData( const Bitmap & 
aBitmap, unsigned char*& data,
             {
 #ifdef OSL_BIGENDIAN
                 if( bIsAlpha )
-                    nAlpha = data[ nOff++ ];
+                    nAlpha = pReadScan[3];
                 else
                     nAlpha = data[ nOff++ ] = 255;
 #if ENABLE_WASM_STRIP_PREMULTIPLY
@@ -1142,7 +1142,7 @@ void CanvasCairoExtractBitmapData( const Bitmap & 
aBitmap, unsigned char*& data,
                 pReadScan += 4;
 #else
                 if( bIsAlpha )
-                    nAlpha = data[ nOff + 3 ];
+                    nAlpha = pReadScan[3];
                 else
                     nAlpha = data[ nOff + 3 ] = 255;
 #if ENABLE_WASM_STRIP_PREMULTIPLY
@@ -1169,7 +1169,7 @@ void CanvasCairoExtractBitmapData( const Bitmap & 
aBitmap, unsigned char*& data,
             {
 #ifdef OSL_BIGENDIAN
                 if( bIsAlpha )
-                    nAlpha = data[ nOff ++ ];
+                    nAlpha = pReadScan[3];
                 else
                     nAlpha = data[ nOff ++ ] = 255;
 #if ENABLE_WASM_STRIP_PREMULTIPLY
@@ -1184,7 +1184,7 @@ void CanvasCairoExtractBitmapData( const Bitmap & 
aBitmap, unsigned char*& data,
                 pReadScan++;
 #else
                 if( bIsAlpha )
-                    nAlpha = data[ nOff + 3 ];
+                    nAlpha = pReadScan[3];
                 else
                     nAlpha = data[ nOff + 3 ] = 255;
 #if ENABLE_WASM_STRIP_PREMULTIPLY