ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

vcl: clarify what sort of bitmap we are looking at

Browse Source 
Change-Id: I83ab4cf2cf96fc78a254010d07de59acb0c70f70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188803
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Christopher Sherlock
2025-08-09 18:08:07 +02:00
committed by Noel Grandin
parent a246ee0027
commit bdafaec3a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/source/outdev/bitmap.cxx
+5 -5
View File
@@ -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() );