diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-23 20:12:17 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-24 03:22:07 +1000 |
| commit | 3dbed9ac7a5200b5c7fbaba2114c3ee1e14af8da (patch) | |
| tree | 7b4cf674519e5fa4ae45e791cb80677b8758c902 /include/vcl | |
| parent | d0ad5518013c4e5f263fe9f9ce67057122e8b2b1 (diff) | |
Rearrange VCL OutputDevice bitmap functions
Change-Id: I9bb6a5d123c35d3de2d2fa7b8a427c92f599afd7
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8808d13445c6..71f8022175c4 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -745,11 +745,11 @@ protected: virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags); -public: /** @name Bitmap functions */ ///@{ +public: /** @overload void DrawBitmap( const Point& rDestPt, @@ -846,19 +846,6 @@ public: */ BitmapEx GetBitmapEx( const Point& rSrcPt, const Size& rSize ) const; - /** Retrieve downsampled and cropped bitmap - - @attention This method ignores negative rDstSz values, thus - mirroring must happen outside this method (e.g. in DrawBitmap) - */ - Bitmap GetDownsampledBitmap( - const Size& rDstSz, - const Point& rSrcPt, - const Size& rSrcSz, - const Bitmap& rBmp, - long nMaxBmpDPIX, - long nMaxBmpDPIY ); - /** Draw BitmapEx transformed @@ -877,6 +864,13 @@ public: protected: + virtual void DrawDeviceBitmap( + const Point& rDestPt, const Size& rDestSize, + const Point& rSrcPtPixel, const Size& rSrcSizePixel, + BitmapEx& rBitmapEx ); + + virtual void ScaleBitmap ( Bitmap &rBmp, SalTwoRect &rPosAry ); + /** Transform and draw a bitmap directly @param aFullTransform The B2DHomMatrix used for the transformation @@ -904,12 +898,6 @@ protected: basegfx::B2DRange &aVisibleRange, double &fMaximumArea); - virtual void ScaleBitmap ( Bitmap &rBmp, SalTwoRect &rPosAry ); - - virtual void DrawDeviceBitmap( - const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel, - BitmapEx& rBitmapEx ); private: SAL_DLLPRIVATE void DrawAlphaBitmap( @@ -946,12 +934,27 @@ private: const sal_Int32 nDstWidth, const long* pMapX, const long* pMapY ); + + /** Retrieve downsampled and cropped bitmap + + @attention This method ignores negative rDstSz values, thus + mirroring must happen outside this method (e.g. in DrawBitmap) + */ + Bitmap GetDownsampledBitmap( + const Size& rDstSz, + const Point& rSrcPt, + const Size& rSrcSz, + const Bitmap& rBmp, + long nMaxBmpDPIX, + long nMaxBmpDPIY ); + ///@} -public: /** @name Curved shape functions */ ///@{ +public: + void DrawEllipse( const Rectangle& rRect ); void DrawArc( const Rectangle& rRect, |