mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix fdo#51547: revert "Some cppcheck cleaning"

Browse Source 
This reverts commit 2f804c94cd.
This commit is contained in:
Michael Meeks
2012-07-04 16:08:13 +01:00
parent 37f6fc4933
commit b95cfee03c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
canvas/source/vcl/canvashelper.cxx
View File

@@ -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 )

2
canvas/source/vcl/canvashelper_texturefill.cxx
View File

@@ -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(),

14
canvas/source/vcl/impltools.cxx
View File

@@ -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 )
{