diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:35:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:36:04 +0100 |
| commit | fe23abd3812e08015facbbb2eb725dd990d63fa0 (patch) | |
| tree | 05f39d446798ea695bc82df0e94d0bd5175342ba /canvas | |
| parent | 340e70e248824a3a4959fa1dee90c5650f257ae8 (diff) | |
Be explicit when using bool as integral value
Change-Id: I3a6b9df9b1b6c48d5db506942d651f66cefdaa18
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvastools.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/verifyinput.cxx | 20 | ||||
| -rw-r--r-- | canvas/source/vcl/backbuffer.cxx | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 34886b0049aa..8121a0d0267c 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -983,7 +983,7 @@ namespace cairocanvas // to correctly render closed curves, need to output first // point twice (so output one additional point) const sal_uInt32 nExtendedPointCount( nPointCount + - aPolygon.isClosed()*aPolygon.areControlPointsUsed() ); + int(aPolygon.isClosed() && aPolygon.areControlPointsUsed()) ); if( nPointCount > 1) { diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx index a3a73dba820b..36693f3cdcbf 100644 --- a/canvas/source/opengl/ogl_canvastools.cxx +++ b/canvas/source/opengl/ogl_canvastools.cxx @@ -69,7 +69,7 @@ namespace oglcanvas const ::basegfx::B2DPolygon& rPolygon( aPolyPoly.getB2DPolygon(i) ); const sal_uInt32 nPts=rPolygon.count(); - const sal_uInt32 nExtPts=nPts + rPolygon.isClosed(); + const sal_uInt32 nExtPts=nPts + int(rPolygon.isClosed()); for( sal_uInt32 j=0; j<nExtPts; j++ ) { const ::basegfx::B2DPoint& rPt( rPolygon.getB2DPoint( j % nPts ) ); diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index 48fdad5f6456..0c7dbcaf4a86 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -215,12 +215,12 @@ namespace canvas #if OSL_DEBUG_LEVEL > 0 const sal_Int32 nBinaryState( - 100000 * !::rtl::math::isFinite( matrix.m00 ) + - 10000 * !::rtl::math::isFinite( matrix.m01 ) + - 1000 * !::rtl::math::isFinite( matrix.m02 ) + - 100 * !::rtl::math::isFinite( matrix.m10 ) + - 10 * !::rtl::math::isFinite( matrix.m11 ) + - 1 * !::rtl::math::isFinite( matrix.m12 ) ); + 100000 * int(!::rtl::math::isFinite( matrix.m00 )) + + 10000 * int(!::rtl::math::isFinite( matrix.m01 )) + + 1000 * int(!::rtl::math::isFinite( matrix.m02 )) + + 100 * int(!::rtl::math::isFinite( matrix.m10 )) + + 10 * int(!::rtl::math::isFinite( matrix.m11 )) + + 1 * int(!::rtl::math::isFinite( matrix.m12 )) ); if( nBinaryState ) { @@ -252,10 +252,10 @@ namespace canvas #if OSL_DEBUG_LEVEL > 0 const sal_Int32 nBinaryState( - 1000 * !::rtl::math::isFinite( matrix.m00 ) + - 100 * !::rtl::math::isFinite( matrix.m01 ) + - 10 * !::rtl::math::isFinite( matrix.m10 ) + - 1 * !::rtl::math::isFinite( matrix.m11 ) ); + 1000 * int(!::rtl::math::isFinite( matrix.m00 )) + + 100 * int(!::rtl::math::isFinite( matrix.m01 )) + + 10 * int(!::rtl::math::isFinite( matrix.m10 )) + + 1 * int(!::rtl::math::isFinite( matrix.m11 )) ); if( nBinaryState ) { diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx index 2666c614c3f8..73d6320fcba5 100644 --- a/canvas/source/vcl/backbuffer.cxx +++ b/canvas/source/vcl/backbuffer.cxx @@ -26,7 +26,7 @@ namespace vclcanvas BackBuffer::BackBuffer( const OutputDevice& rRefDevice, bool bMonochromeBuffer ) : maVDev( new VirtualDevice( rRefDevice, - bMonochromeBuffer ) ) + sal_uInt16(bMonochromeBuffer) ) ) { if( !bMonochromeBuffer ) { |