diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-11-03 14:58:40 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-03 15:02:00 +0100 |
| commit | f7975d2335334899e5d14e35e7640d3afdf220f6 (patch) | |
| tree | 2c97dc4a14afce606d8f68ee28777c917371ab17 /basebmp/inc | |
| parent | 3e8dee1a48bd80c52b5adda6bd9358c2136ea764 (diff) | |
Fix one more subtlety around B2IBox / B2IRange changes.
The Cohen/Sutherland clip flag routine was not aware of B2IBox,
thusly yielding incorrect line clipping for BitmapDevice software
rendering. Cleaned that up, added some more unit tests around the
problem, and removed the now-extraneous maLineClip member from the
bitmap device.
Diffstat (limited to 'basebmp/inc')
| -rw-r--r-- | basebmp/inc/basebmp/bitmapdevice.hxx | 22 | ||||
| -rw-r--r-- | basebmp/inc/basebmp/clippedlinerenderer.hxx | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx index 1e6d73b92923..f97ec4fc8778 100644 --- a/basebmp/inc/basebmp/bitmapdevice.hxx +++ b/basebmp/inc/basebmp/bitmapdevice.hxx @@ -664,8 +664,8 @@ private: /** Factory method to create a BitmapDevice for given scanline format */ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, - bool bTopDown, - sal_Int32 nScanlineFormat ); + bool bTopDown, + sal_Int32 nScanlineFormat ); /** Factory method to create a BitmapDevice for given scanline format with the given palette @@ -675,9 +675,9 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe format. */ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, - bool bTopDown, - sal_Int32 nScanlineFormat, - const PaletteMemorySharedVector& rPalette ); + bool bTopDown, + sal_Int32 nScanlineFormat, + const PaletteMemorySharedVector& rPalette ); /** Factory method to create a BitmapDevice for given scanline format from the given piece of raw memory and palette @@ -686,10 +686,10 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe image of the specified area and format. */ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, - bool bTopDown, - sal_Int32 nScanlineFormat, - const RawMemorySharedArray& rMem, - const PaletteMemorySharedVector& rPalette ); + bool bTopDown, + sal_Int32 nScanlineFormat, + const RawMemorySharedArray& rMem, + const PaletteMemorySharedVector& rPalette ); /** Factory method to retrieve a subsetted BitmapDevice to the same @@ -709,8 +709,8 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSh copied, only the size can be varied. Note that the prototype's bitmap content is <em>not</em> copied, only a palette (if any). */ -BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, - const BitmapDeviceSharedPtr& rProto ); +BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, + const BitmapDeviceSharedPtr& rProto ); } diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx index 2fbf2f7acfe0..9969b968ff8a 100644 --- a/basebmp/inc/basebmp/clippedlinerenderer.hxx +++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx @@ -200,7 +200,7 @@ inline bool prepareClip( sal_Int32 a1, template< class Iterator, class Accessor > void renderClippedLine( basegfx::B2IPoint aPt1, basegfx::B2IPoint aPt2, - const basegfx::B2IBox& rClipRect, + const basegfx::B2IBox& rClipRect, typename Accessor::value_type color, Iterator begin, Accessor acc, |