core.git: vcl/source

[Christopher Sherlock (via logerrit)]

 vcl/source/outdev/bitmap.cxx |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 47a8ba44e619f0c80c0a1611d56f58df5f6575bd
Author:     Christopher Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sat Aug 2 15:38:19 2025 +1000
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 5 15:52:06 2025 +0200

    vcl: rename parameters of lcl_BlendBitmapWithAlpha()
    
    Change-Id: I2daff5bf4ab3c07b8f8b656999ba1afe0f9c6f4e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188798
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 8d849277021e..92b9214e26df 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -450,8 +450,8 @@ BitmapColor lcl_AlphaBlend(int nX, int nY,
 
 Bitmap lcl_BlendBitmapWithAlpha(
             Bitmap&             aBmp,
-            BitmapReadAccess const *   pP,
-            BitmapReadAccess const *   pA,
+            BitmapReadAccess const* pSrcBmp,
+            BitmapReadAccess const* pSrcAlphaBmp,
             const sal_Int32     nDstHeight,
             const sal_Int32     nDstWidth,
             const sal_Int32*    pMapX,
@@ -461,24 +461,25 @@ Bitmap lcl_BlendBitmapWithAlpha(
     Bitmap      res;
 
     {
-        BitmapScopedWriteAccess pB(aBmp);
-        if (pB && pP && pA)
+        BitmapScopedWriteAccess pDstBmp(aBmp);
+        if (pDstBmp && pSrcBmp && pSrcAlphaBmp)
         {
             for( int nY = 0; nY < nDstHeight; nY++ )
             {
                 const tools::Long  nMapY = pMapY[ nY ];
-                Scanline pScanlineB = pB->GetScanline(nY);
+                Scanline pScanlineB = pSrcBmp->GetScanline(nY);
 
                 for( int nX = 0; nX < nDstWidth; nX++ )
                 {
                     const tools::Long nMapX = pMapX[ nX ];
-                    BitmapColor aDstCol = lcl_AlphaBlend(nX, nY, nMapX, nMapY, 
pP, pA, pB.get());
+                    BitmapColor aDstCol = lcl_AlphaBlend(nX, nY, nMapX, nMapY, 
pSrcBmp, pSrcAlphaBmp, pDstBmp.get());
 
-                    pB->SetPixelOnData(pScanlineB, nX, aDstCol);
+                    pDstBmp->SetPixelOnData(pScanlineB, nX, aDstCol);
                 }
             }
         }
-        pB.reset();
+
+        pDstBmp.reset();
         res = aBmp;
     }