diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-19 22:25:49 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-19 22:25:49 +1000 |
commit | eef0dd74e3158ae881ef37ddde49b3bb809b5831 (patch) | |
tree | 5a9452f3d870ed44f8731e2713a5048b41f0bc66 | |
parent | 896526dec395e679f4145428328b690b0c81df52 (diff) |
Change ImplDrawAlpha to DrawAlphaBitmap
OutputDevice has a public function ImplDrawAlpha, but that just draws
a bitmap with an alpha layer. It's really a public function, though
not yet used outside of OutputDevice. However, the name should really
be the same as SalGraphic's function which is DrawAlphaBitmap.
Change-Id: If2716c1a1a194079d6514a1d30d8b05f9fda664c
-rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/bitmap.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 7507d08a9b60..480e1a8d705f 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -781,7 +781,7 @@ public: */ ///@{ SAL_DLLPRIVATE void ImplDrawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ); - SAL_DLLPRIVATE void ImplDrawAlpha ( const Bitmap& rBmp, const AlphaMask& rAlpha, + SAL_DLLPRIVATE void DrawAlphaBitmap ( const Bitmap& rBmp, const AlphaMask& rAlpha, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); virtual void ClipToPaintRegion ( Rectangle& rDstRect ); diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 130a2c39cf32..5fb83116d0fc 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -578,7 +578,7 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize aSrcPtPixel.X() = rSrcPtPixel.X() * fScaleX; aSrcPtPixel.Y() = rSrcPtPixel.Y() * fScaleY; } - ImplDrawAlpha(aScaledBitmapEx.GetBitmap(), aScaledBitmapEx.GetAlpha(), rDestPt, rDestSize, aSrcPtPixel, aSrcSizePixel); + DrawAlphaBitmap(aScaledBitmapEx.GetBitmap(), aScaledBitmapEx.GetAlpha(), rDestPt, rDestSize, aSrcPtPixel, aSrcSizePixel); return; } @@ -937,9 +937,9 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con return GetBitmap( rSrcPt, rSize ); } -void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, - const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel ) +void OutputDevice::DrawAlphaBitmap( const Bitmap& rBmp, const AlphaMask& rAlpha, + const Point& rDestPt, const Size& rDestSize, + const Point& rSrcPtPixel, const Size& rSrcSizePixel ) { Point aOutPt( LogicToPixel( rDestPt ) ); Size aOutSz( LogicToPixel( rDestSize ) ); |