diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-04-07 13:45:11 +0530 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-04-07 12:15:50 +0000 |
| commit | f0de4374fffe7fb72ce0e9006af57092834dfe1e (patch) | |
| tree | 5d4f6186bc5aaf5769556981f3610e214166fb33 /canvas | |
| parent | e214df32fb3637bd7810a299fb8b38810b1a3874 (diff) | |
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I removed the OSL_DEBUG_LEVEL > 1 conditionals with OSL_DEBUG_LEVEL > 0
or SAL_INFO macros
Change-Id: Ia2a483ea0f992bf182a6beed2b4558a4fb7c5680
Reviewed-on: https://gerrit.libreoffice.org/23079
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_canvashelper_texturefill.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/directx/dx_spritecanvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/surfaceproxy.cxx | 13 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 4 |
5 files changed, 8 insertions, 17 deletions
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index 826bf69676e9..0e9eb4d90d9a 100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx @@ -407,7 +407,7 @@ namespace dxcanvas rGraphics->FillPath( pGradientBrush.get(), pFillPath.get() ); } -#if OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 0 Gdiplus::Pen aPen( Gdiplus::Color( 255, 255, 0, 0 ), 0.0001f ); diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index 66ea028286b2..3803671f034b 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -70,7 +70,7 @@ namespace dxcanvas maScrapRect(), mbShowSpriteBounds( false ) { -#if OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 0 // inverse default for verbose debug mode mbShowSpriteBounds = true; #endif diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx index fd5b8e2f833e..e809ec9a7d56 100644 --- a/canvas/source/tools/surfaceproxy.cxx +++ b/canvas/source/tools/surfaceproxy.cxx @@ -114,18 +114,9 @@ namespace canvas const ::basegfx::B2DPolygon& rTriangulatedPolygon( ::basegfx::triangulator::triangulate(rClipPoly)); -#if OSL_DEBUG_LEVEL > 2 // dump polygons - OSL_TRACE( "Original clip polygon: %s\n" - "Triangulated polygon: %s\n", - OUStringToOString( - basegfx::tools::exportToSvgD( rClipPoly, true, true, false ), - RTL_TEXTENCODING_ASCII_US).getStr(), - OUStringToOString( - basegfx::tools::exportToSvgD( - basegfx::B2DPolyPolygon(rTriangulatedPolygon), true, true, false ), - RTL_TEXTENCODING_ASCII_US).getStr() ); -#endif + SAL_INFO("canvas", "Orignal clip polygon: " << basegfx::tools::exportToSvgD( rClipPoly, true, true, false )); + SAL_INFO("canvas", "Triangulated polygon: " << basegfx::tools::exportToSvgD(basegfx::B2DPolyPolygon(rTriangulatedPolygon), true, true, false )); for( const auto& rSurfacePtr : maSurfaceList ) rSurfacePtr->drawWithClip( fAlpha, rPos, rTriangulatedPolygon, rTransform ); diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 90643456a4ca..462ae479fd41 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -437,7 +437,7 @@ namespace vclcanvas (sal_uInt8)(basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha)), (sal_uInt8)(basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha)) )); -#if OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 0 if( i && !(i % 10) ) rOutDev.SetFillColor( COL_RED ); #endif @@ -626,7 +626,7 @@ namespace vclcanvas } } -#if OSL_DEBUG_LEVEL > 3 +#ifdef DEBUG_CANVAS_CANVASHELPER_TEXTUREFILL // extra-verbosity { ::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0); diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 65d1141f7203..775e53872990 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -124,7 +124,7 @@ namespace vclcanvas mbShowSpriteBounds( false ), mbIsUnsafeScrolling( false ) { -#if OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 0 // inverse defaults for verbose debug mode mbShowSpriteBounds = mbShowFrameInfo = true; #endif @@ -290,7 +290,7 @@ namespace vclcanvas renderMemUsage( rOutDev ); } -#if OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 0 static ::canvas::tools::ElapsedTime aElapsedTime; // log time immediately after surface flip |