core.git: vcl/source

[Christopher Sherlock (via logerrit)]

 vcl/source/outdev/bitmap.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bdafaec3a654cf96f2a6b9d8b53ff4fb39945ce2
Author:     Christopher Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sat Aug 2 16:39:12 2025 +1000
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Aug 9 18:08:07 2025 +0200

    vcl: clarify what sort of bitmap we are looking at
    
    Change-Id: I83ab4cf2cf96fc78a254010d07de59acb0c70f70
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188803
    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 03518cf4b666..653f9dddf124 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -495,7 +495,7 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const 
Bitmap& rBitmap,
     mpMetaFile = nullptr; // fdo#55044 reset before GetBitmap!
     mbMap = false;
 
-    Bitmap aBmp(GetBitmap(aDstRect.TopLeft(), aDstRect.GetSize()));
+    Bitmap aDeviceBmp(GetBitmap(aDstRect.TopLeft(), aDstRect.GetSize()));
 
     // #109044# The generated bitmap need not necessarily be
     // of aDstRect dimensions, it's internally clipped to
@@ -503,9 +503,9 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const 
Bitmap& rBitmap,
     // since we later use it (in nDstWidth/Height) for pixel
     // access)
     // #i38887# reading from screen may sometimes fail
-    if (aBmp.ImplGetSalBitmap())
+    if (aDeviceBmp.ImplGetSalBitmap())
     {
-        aDstRect.SetSize(aBmp.GetSizePixel());
+        aDstRect.SetSize(aDeviceBmp.GetSizePixel());
     }
 
     const tools::Long nDstWidth = aDstRect.GetWidth();
@@ -531,12 +531,12 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const 
Bitmap& rBitmap,
     assert(pAlphaReadAccess->GetScanlineFormat() == ScanlineFormat::N8BitPal);
 
     // #i38887# reading from screen may sometimes fail
-    if (aBmp.ImplGetSalBitmap())
+    if (aDeviceBmp.ImplGetSalBitmap())
     {
         Bitmap aNewBitmap;
 
         aNewBitmap = lcl_BlendBitmapWithAlpha(
-                        aBmp, pBitmapReadAccess.get(), pAlphaReadAccess.get(),
+                        aDeviceBmp, pBitmapReadAccess.get(), 
pAlphaReadAccess.get(),
                         nDstHeight,
                         nDstWidth,
                         aTradContext.mpMapX.get(), aTradContext.mpMapY.get() );