diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-18 00:08:53 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-18 00:12:13 +1000 |
| commit | 2a67712f5ff97ebf04860a10d50ed94a654e1f5e (patch) | |
| tree | 5233810f30b0aea3387e7fb25b074106a32a0956 /include | |
| parent | f596ee9a79c01ff4a170aa521b349f5ddd234abc (diff) | |
Refactor VCL bitmap code
Turns out that all bitmap code eventually calls on ImplDrawBitmap and
ImplDrawBitmapEx, which is called by a version with the same function
signature but without a type parameter. If you make that sal_uLong
parameter a default parameter, you can remove ImplDrawBitmap/Ex and just
call on that version of DrawBitmap/Ex.
Change-Id: Ifd75561bb824b3941c2cf700984ca80e0b851bd3
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c428c8199b31..c98ff3ad007b 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_VCL_OUTDEV_HXX #define INCLUDED_VCL_OUTDEV_HXX +#define META_BMPSCALEPART_ACTION (118) +#define META_BMPEXSCALEPART_ACTION (121) + #include <tools/gen.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> @@ -774,12 +777,6 @@ public: */ ///@{ SAL_DLLPRIVATE void ImplDrawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ); - SAL_DLLPRIVATE void ImplDrawBitmap ( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const Bitmap& rBitmap, const sal_uLong nAction ); - SAL_DLLPRIVATE void ImplDrawBitmapEx ( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const BitmapEx& rBitmapEx, const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawAlpha ( const Bitmap& rBmp, const AlphaMask& rAlpha, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); @@ -1111,7 +1108,8 @@ public: const Bitmap& rBitmap ); void DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const Bitmap& rBitmap ); + const Bitmap& rBitmap, sal_uLong nAction = META_BMPSCALEPART_ACTION ); + void DrawBitmapEx( const Point& rDestPt, const BitmapEx& rBitmapEx ); @@ -1119,7 +1117,7 @@ public: const BitmapEx& rBitmapEx ); void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const BitmapEx& rBitmapEx ); + const BitmapEx& rBitmapExi, sal_uLong nAction = META_BMPEXSCALEPART_ACTION ); /** Draw BitampEx transformed |