diff options
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 8 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 1c2a0525c9f4..46535fc9a409 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -52,7 +52,7 @@ static void initContext() glShadeModel(GL_FLAT); } -static void initTransformation(const ::Size& rSize, bool bMirror) +static void initTransformation(const ::Size& rSize) { // use whole window glViewport( 0,0, @@ -62,9 +62,9 @@ static void initTransformation(const ::Size& rSize, bool bMirror) // model coordinate system is already in device pixel glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glTranslated(-1.0, (bMirror ? -1.0 : 1.0), 0.0); + glTranslated(-1.0, 1.0, 0.0); glScaled( 2.0 / rSize.Width(), - (bMirror ? 2.0 : -2.0) / rSize.Height(), + -2.0 / rSize.Height(), 1.0 ); // clear to black @@ -281,7 +281,7 @@ namespace oglcanvas SystemChildWindow* pChildWindow = mxContext->getChildWindow(); const ::Size& rOutputSize = pChildWindow->GetSizePixel(); - initTransformation(rOutputSize, false); + initTransformation(rOutputSize); // render the actual spritecanvas content mpSpriteCanvas->renderRecordedActions(); diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 0452aca5fcd9..631f0f154458 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -488,9 +488,8 @@ namespace vclcanvas const ::canvas::ParametricPolyPolygon::Values& rValues, const std::vector< ::Color >& rColors, const ::basegfx::B2DHomMatrix& rTextureTransform, - const ::tools::Rectangle& rBounds, - unsigned int nStepCount, - bool bFillNonOverlapping ) + const ::tools::Rectangle& rBounds, + unsigned int nStepCount ) { switch( rValues.meType ) { @@ -510,7 +509,7 @@ namespace vclcanvas rTextureTransform, rBounds, nStepCount, - bFillNonOverlapping, + false/*bFillNonOverlapping*/, rValues, rColors ); break; @@ -585,8 +584,7 @@ namespace vclcanvas rColors, aTotalTransform, aPolygonDeviceRectOrig, - nStepCount, - false ); + nStepCount ); rOutDev.Pop(); if( p2ndOutDev && nTransparency < 253 ) @@ -611,8 +609,7 @@ namespace vclcanvas rColors, aTotalTransform, aPolygonDeviceRectOrig, - nStepCount, - false ); + nStepCount ); rOutDev.Pop(); if( p2ndOutDev && nTransparency < 253 ) |