diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-05-12 19:47:00 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-30 18:29:32 +0200 |
| commit | 8b3d5a79c0f70cb3bdfa4cbe8adf91521a28d89c (patch) | |
| tree | ebee66e7ab07bf0a81583825c69e84855beb882f | |
| parent | 654c1f6ebe4c0c8504e0b9a74ee48f7146cf5a43 (diff) | |
vcl: DrawDeviceBitmap() -> DrawDeviceBitmapEx()
The function actually draws a BitmapEx and not a Bitmap, so it
was named wrongly.
Change-Id: I8eb34b744a4cf48e3a07de731bd70baaa62942ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115474
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/print.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/bitmapex.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 2cd65db1a81e..95df09d055bf 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1373,7 +1373,7 @@ public: protected: - virtual void DrawDeviceBitmap( + virtual void DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, BitmapEx& rBitmapEx ); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 6ffdc077dff6..1ffce121bba1 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -239,7 +239,7 @@ protected: bool TransformAndReduceBitmapExToTargetRange( const basegfx::B2DHomMatrix& aFullTransform, basegfx::B2DRange &aVisibleRange, double &fMaximumArea) override; - void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, + void DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, BitmapEx& rBitmapEx ) override; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 84a2a27a92b2..593744b4e321 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -290,7 +290,7 @@ bool Printer::TransformAndReduceBitmapExToTargetRange( return true; } -void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, +void Printer::DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, BitmapEx& rBmpEx ) { diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx index d0016e81635d..a8afded98b0c 100644 --- a/vcl/source/outdev/bitmapex.cxx +++ b/vcl/source/outdev/bitmapex.cxx @@ -124,7 +124,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, if ( mbOutputClipped ) return; - DrawDeviceBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, aBmpEx ); + DrawDeviceBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, aBmpEx ); } } @@ -146,7 +146,7 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con return BitmapEx(GetBitmap( rSrcPt, rSize )); } -void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, +void OutputDevice::DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, BitmapEx& rBitmapEx ) { |