include/vcl/outdev.hxx | 4 ++-- vcl/source/outdev/bitmap.cxx | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 1fd581290cea2edf4c31f0f860e2b178e91c8101 Author: Christopher Sherlock <chris.sherloc...@gmail.com> AuthorDate: Sat Aug 2 17:33:51 2025 +1000 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Mon Sep 1 15:06:53 2025 +0200 vcl: rename parameters in OutputDevice::DrawDeviceAlphaBitmapSlowPath() Whilst we are about it, make rBmpRect a const reference. Change-Id: If95d31c1d0b7204f6c7681c613429f1d317ec7a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188810 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 4ccca7cda929..4e8db79f6e2b 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1472,8 +1472,8 @@ private: SAL_DLLPRIVATE void DrawDeviceAlphaBitmapSlowPath( const Bitmap& rBitmap, const AlphaMask& rAlpha, - const tools::Rectangle& rDstRect, tools::Rectangle aBmpRect, - Size const & aOutSz, Point const & aOutPt); + const tools::Rectangle& rDstRect, const tools::Rectangle& rBmpRect, + Size const& rOutSz, Point const& rOutPt); ///@} diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index a4c68121837c..7697cd8a0419 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -479,7 +479,7 @@ Bitmap lcl_BlendBitmapWithAlpha( } // end anonymous namespace void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const Bitmap& rBitmap, - const AlphaMask& rAlpha, const tools::Rectangle& rDstRect, tools::Rectangle aBmpRect, Size const & aOutSize, Point const & aOutPoint) + const AlphaMask& rAlpha, const tools::Rectangle& rDstRect, const tools::Rectangle& rBmpRect, Size const& rOutSize, Point const& rOutPoint) { assert(!is_double_buffered_window()); @@ -511,12 +511,12 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const Bitmap& rBitmap, // are in mirrored coordinates, so the intersection of (aOutPt,aOutSz) with these // is content wise somewhere else and needs to take mirroring into account const tools::Long nOffX = IsRTLEnabled() - ? aOutSize.Width() - aDstRect.GetWidth() - (aDstRect.Left() - aOutPoint.X()) - : aDstRect.Left() - aOutPoint.X(); + ? rOutSize.Width() - aDstRect.GetWidth() - (aDstRect.Left() - rOutPoint.X()) + : aDstRect.Left() - rOutPoint.X(); - const tools::Long nOffY = aDstRect.Top() - aOutPoint.Y(); + const tools::Long nOffY = aDstRect.Top() - rOutPoint.Y(); - const TradScaleContext aTradContext(aDstRect, aBmpRect, aOutSize, nOffX, nOffY); + const TradScaleContext aTradContext(aDstRect, rBmpRect, rOutSize, nOffX, nOffY); BitmapScopedReadAccess pCheckAlphaReadAccess(rAlpha);