diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-04 16:08:13 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-04 16:23:32 +0100 |
| commit | 97ae222bd71716e9b9d4329aa646eddeec9a1c66 (patch) | |
| tree | 85ec1d31c3337e123ecef7e93d238bd01ebb7ca2 /canvas | |
| parent | 43fd9bbafcf4348f2b8083baf551f38b8572519c (diff) | |
fix fdo#51547: revert "Some cppcheck cleaning"
This reverts commit 2f804c94cdaaa9ac047f229509c774dbea1dbcaa.
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 7dc47519682c..fde6ebe2d271 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -483,6 +483,7 @@ 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 @@ -496,8 +497,7 @@ namespace vclcanvas } else { - const sal_uInt16 nTransPercent( (nTransparency * 100 + 128) / 255 ); // normal rounding, no truncation here - mpOutDev->getOutDev().DrawTransparent( aPolyPoly, nTransPercent ); + mpOutDev->getOutDev().DrawTransparent( aPolyPoly, (sal_uInt16)nTransPercent ); } if( mp2ndOutDev ) diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index df293a5919c7..1021d33de702 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -683,6 +683,7 @@ namespace vclcanvas { tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev ); + const int nTransparency( setupOutDevState( viewState, renderState, IGNORE_COLOR ) ); PolyPolygon aPolyPoly( tools::mapPolyPolygon( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon), viewState, renderState ) ); @@ -710,7 +711,6 @@ 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 09e20b45a299..0484d1ed1e49 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -245,6 +245,13 @@ 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; @@ -329,13 +336,6 @@ 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 ) { |