include/vcl/outdev.hxx | 2 +- include/vcl/print.hxx | 2 +- vcl/source/gdi/print.cxx | 2 +- vcl/source/outdev/bitmap.cxx | 40 +++++++++++++++++++++++++++++++++++++++- vcl/source/outdev/bitmapex.cxx | 38 -------------------------------------- 5 files changed, 42 insertions(+), 42 deletions(-)
New commits: commit 53accff5c672407295f749fefd49c7e119f05311 Author: Christopher Sherlock <[email protected]> AuthorDate: Sat Nov 1 11:23:13 2025 +1100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Nov 18 01:05:42 2025 +0100 vcl: rename DrawDeviceBitmapEx() to DrawDeviceBitmap() and move to bitmap.cxx Change-Id: I99f6a1782c7b13a37a6d44739936e0fc23edd279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193406 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index d01705d04af9..25fdc2353807 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1383,7 +1383,7 @@ public: protected: - virtual void DrawDeviceBitmapEx( + virtual void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, Bitmap& rBitmap ); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 9b6d4f9ad8ca..81e4f29a3e33 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -169,7 +169,7 @@ protected: bool TransformAndReduceBitmapExToTargetRange( const basegfx::B2DHomMatrix& aFullTransform, basegfx::B2DRange &aVisibleRange, double &fMaximumArea) override; - void DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, + void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, Bitmap& rBitmap ) override; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 76cde0f10143..095518fda0e6 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -189,7 +189,7 @@ bool Printer::TransformAndReduceBitmapExToTargetRange( return true; } -void Printer::DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, +void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, Bitmap& rBmp ) { diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index b434ca2d8d46..52eb6c39b578 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -246,7 +246,45 @@ void OutputDevice::DrawAlphaBitmap( const Point& rDestPt, const Size& rDestSize, if (mbOutputClipped) return; - DrawDeviceBitmapEx(rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, aBmp); + DrawDeviceBitmap(rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, aBmp); +} + +void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, + const Point& rSrcPtPixel, const Size& rSrcSizePixel, + Bitmap& rBitmap ) +{ + assert(!is_double_buffered_window()); + + if (rBitmap.HasAlpha()) + { + DrawDeviceAlphaBitmap(rBitmap, + rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel); + return; + } + + if (rBitmap.IsEmpty()) + return; + + SalTwoRect aPosAry(rSrcPtPixel.X(), rSrcPtPixel.Y(), rSrcSizePixel.Width(), + rSrcSizePixel.Height(), ImplLogicXToDevicePixel(rDestPt.X()), + ImplLogicYToDevicePixel(rDestPt.Y()), + ImplLogicWidthToDevicePixel(rDestSize.Width()), + ImplLogicHeightToDevicePixel(rDestSize.Height())); + + const BmpMirrorFlags nMirrFlags = AdjustTwoRect(aPosAry, rBitmap.GetSizePixel()); + + if (!(aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight)) + return; + + if (nMirrFlags != BmpMirrorFlags::NONE) + rBitmap.Mirror(nMirrFlags); + + const SalBitmap* pSalSrcBmp = rBitmap.ImplGetSalBitmap().get(); + + assert(!rBitmap.HasAlpha() + && "I removed some code here that will need to be restored"); + + mpGraphics->DrawBitmap(aPosAry, *pSalSrcBmp, *this); } Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx index 9fc4e50ed42f..17e34a34541b 100644 --- a/vcl/source/outdev/bitmapex.cxx +++ b/vcl/source/outdev/bitmapex.cxx @@ -31,44 +31,6 @@ #include <drawmode.hxx> #include <salgdi.hxx> -void OutputDevice::DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel, - Bitmap& rBitmap ) -{ - assert(!is_double_buffered_window()); - - if (rBitmap.HasAlpha()) - { - DrawDeviceAlphaBitmap(rBitmap, - rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel); - return; - } - - if (rBitmap.IsEmpty()) - return; - - SalTwoRect aPosAry(rSrcPtPixel.X(), rSrcPtPixel.Y(), rSrcSizePixel.Width(), - rSrcSizePixel.Height(), ImplLogicXToDevicePixel(rDestPt.X()), - ImplLogicYToDevicePixel(rDestPt.Y()), - ImplLogicWidthToDevicePixel(rDestSize.Width()), - ImplLogicHeightToDevicePixel(rDestSize.Height())); - - const BmpMirrorFlags nMirrFlags = AdjustTwoRect(aPosAry, rBitmap.GetSizePixel()); - - if (!(aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight)) - return; - - if (nMirrFlags != BmpMirrorFlags::NONE) - rBitmap.Mirror(nMirrFlags); - - const SalBitmap* pSalSrcBmp = rBitmap.ImplGetSalBitmap().get(); - - assert(!rBitmap.HasAlpha() - && "I removed some code here that will need to be restored"); - - mpGraphics->DrawBitmap(aPosAry, *pSalSrcBmp, *this); -} - bool OutputDevice::DrawTransformBitmapExDirect( const basegfx::B2DHomMatrix& aFullTransform, const Bitmap& rBitmap,
