diff options
| -rw-r--r-- | basebmp/inc/basebmp/bitmapdevice.hxx | 5 | ||||
| -rw-r--r-- | basebmp/inc/basebmp/polypolygonrenderer.hxx | 14 | ||||
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 11 |
3 files changed, 16 insertions, 14 deletions
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx index c11a62e5efda..b902748e7d90 100644 --- a/basebmp/inc/basebmp/bitmapdevice.hxx +++ b/basebmp/inc/basebmp/bitmapdevice.hxx @@ -2,9 +2,9 @@ * * $RCSfile: bitmapdevice.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: thb $ $Date: 2006-07-13 12:03:25 $ + * last change: $Author: thb $ $Date: 2006-07-28 09:47:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -550,7 +550,6 @@ public: protected: BitmapDevice( const basegfx::B2IRange& rBounds, - bool bTopDown, sal_Int32 nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/basebmp/inc/basebmp/polypolygonrenderer.hxx index 2a02c96ceca0..25939d4e207a 100644 --- a/basebmp/inc/basebmp/polypolygonrenderer.hxx +++ b/basebmp/inc/basebmp/polypolygonrenderer.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polypolygonrenderer.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: thb $ $Date: 2006-07-27 11:35:31 $ + * last change: $Author: thb $ $Date: 2006-07-28 09:47:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,9 +58,9 @@ namespace basebmp /// convert double to 32:32 fixed point inline sal_Int64 toFractional( double v ) { return (sal_Int64)(v*SAL_MAX_UINT32 + (v < 0.0 ? -0.5 : 0.5 )); } /// convert 32:32 fixed point to int32 (truncate) - inline sal_Int32 toInteger( sal_Int64 v ) { return v < 0 ? ~((~v) >> 32) : v >> 32; } + inline sal_Int32 toInteger( sal_Int64 v ) { return (sal_Int32)(v < 0 ? ~((~v) >> 32) : v >> 32); } /// convert 32:32 fixed point to int32 (properly rounded) - inline sal_Int32 toRoundedInteger( sal_Int64 v ) { return toInteger(v) + ((v&0x80000000) >> 31); } + inline sal_Int32 toRoundedInteger( sal_Int64 v ) { return toInteger(v) + (sal_Int32)((v&0x80000000) >> 31); } /** internal vertex store - @@ -238,7 +238,7 @@ namespace basebmp // even-odd fill rule detail::VectorOfVertexPtr::iterator currVertex( pAET->begin() ); detail::VectorOfVertexPtr::iterator const lastVertex( pAET->end()-1 ); - sal_uInt32 nVertexCount(0); + sal_uInt32 nCrossedEdges(0); while( currVertex != lastVertex ) { // TODO(P1): might be worth a try to extend the @@ -248,7 +248,7 @@ namespace basebmp detail::Vertex const& rV2( **++currVertex ); // even/odd fillrule - if( !(nVertexCount & 0x01) && + if( !(nCrossedEdges & 0x01) && y >= nClipY1 && rV1.mnX < nClipX2_frac && rV2.mnX > nClipX1_frac ) @@ -278,7 +278,7 @@ namespace basebmp rV1.mnX += rV1.mnXDelta; --rV1.mnYCounter; - ++nVertexCount; + ++nCrossedEdges; } // step vertex also for the last one diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 63d0a41c12e2..e95fc7745991 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapdevice.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: thb $ $Date: 2006-07-27 11:35:31 $ + * last change: $Author: thb $ $Date: 2006-07-28 09:47:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,7 +320,7 @@ namespace dest_accessor_type accessor, const RawMemorySharedArray& rMem, const PaletteMemorySharedVector& rPalette ) : - BitmapDevice( rBounds, bTopDown, nScanlineFormat, + BitmapDevice( rBounds, nScanlineFormat, nScanlineStride, pFirstScanline, rMem, rPalette ), maBegin( begin ), maColorLookup(), @@ -1028,7 +1028,6 @@ struct ImplBitmapDevice BitmapDevice::BitmapDevice( const basegfx::B2IRange& rBounds, - bool bTopDown, sal_Int32 nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, @@ -1241,6 +1240,7 @@ namespace void assertImagePoint( const basegfx::B2IPoint& rPt, const basegfx::B2IRange& rPermittedRange ) { + (void)rPt; (void)rPermittedRange; OSL_ASSERT( rPermittedRange.isInside(rPt) ); } @@ -1252,6 +1252,8 @@ namespace aRange.intersect( rPermittedRange ); OSL_ASSERT( aRange == rRange ); +#else + (void)rRange; (void)rPermittedRange; #endif } @@ -1708,6 +1710,7 @@ BitmapDeviceSharedPtr createRenderer( sal_Int32 nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, + typename FormatTraits::raw_accessor_type const& rRawAccessor, Accessor const& rAccessor, boost::shared_array< sal_uInt8 > pMem, const PaletteMemorySharedVector& pPal ) |