diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-05-28 20:50:07 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-05-28 20:50:31 +0200 |
| commit | 2f804c94cdaaa9ac047f229509c774dbea1dbcaa (patch) | |
| tree | 0c23960382fc47f0e6c45eaa77040189d7ada54d /canvas | |
| parent | dcd94d97b37d3bc46e135340006d2eefb616381b (diff) | |
Some cppcheck cleaning
Change-Id: Id5be3a25fc66d2f7fcec8325491a23d6908021fc
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/impltools.cxx | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 9ae3c8b547d1..83f3ccf72b32 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -483,7 +483,6 @@ namespace vclcanvas tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev ); const int nTransparency( setupOutDevState( viewState, renderState, FILL_COLOR ) ); - const int nTransPercent( (nTransparency * 100 + 128) / 255 ); // normal rounding, no truncation here ::basegfx::B2DPolyPolygon aB2DPolyPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon)); aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL does not fill @@ -497,7 +496,8 @@ namespace vclcanvas } else { - mpOutDev->getOutDev().DrawTransparent( aPolyPoly, (sal_uInt16)nTransPercent ); + const sal_uInt16 nTransPercent( (nTransparency * 100 + 128) / 255 ); // normal rounding, no truncation here + mpOutDev->getOutDev().DrawTransparent( aPolyPoly, nTransPercent ); } if( mp2ndOutDev ) diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 1021d33de702..df293a5919c7 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -683,7 +683,6 @@ namespace vclcanvas { tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev ); - const int nTransparency( setupOutDevState( viewState, renderState, IGNORE_COLOR ) ); PolyPolygon aPolyPoly( tools::mapPolyPolygon( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon), viewState, renderState ) ); @@ -711,6 +710,7 @@ namespace vclcanvas } else { + const int nTransparency( setupOutDevState( viewState, renderState, IGNORE_COLOR ) ); std::vector< ::Color > aColors(rValues.maColors.getLength()); std::transform(&rValues.maColors[0], &rValues.maColors[0]+rValues.maColors.getLength(), diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 0484d1ed1e49..09e20b45a299 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -245,13 +245,6 @@ namespace vclcanvas aSrcRect, rTransform ); - const bool bModulateColors( eModulationMode == MODULATE_WITH_DEVICECOLOR && - rDeviceColor.getLength() > 2 ); - const double nRedModulation( bModulateColors ? rDeviceColor[0] : 1.0 ); - const double nGreenModulation( bModulateColors ? rDeviceColor[1] : 1.0 ); - const double nBlueModulation( bModulateColors ? rDeviceColor[2] : 1.0 ); - const double nAlphaModulation( bModulateColors && rDeviceColor.getLength() > 3 ? - rDeviceColor[3] : 1.0 ); Bitmap aSrcBitmap( rBitmap.GetBitmap() ); Bitmap aSrcAlpha; @@ -336,6 +329,13 @@ namespace vclcanvas ::basegfx::B2DHomMatrix aTransform( aLocalTransform ); aTransform.invert(); + const bool bModulateColors( eModulationMode == MODULATE_WITH_DEVICECOLOR && + rDeviceColor.getLength() > 2 ); + const double nRedModulation( bModulateColors ? rDeviceColor[0] : 1.0 ); + const double nGreenModulation( bModulateColors ? rDeviceColor[1] : 1.0 ); + const double nBlueModulation( bModulateColors ? rDeviceColor[2] : 1.0 ); + const double nAlphaModulation( bModulateColors && rDeviceColor.getLength() > 3 ? + rDeviceColor[3] : 1.0 ); // for the time being, always read as ARGB for( int y=0; y<aDestBmpSize.Height(); ++y ) { |