diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-07-26 23:42:25 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-07-26 23:56:14 +0200 |
commit | e563f1401a58c0d119a43e0678e1e894a9ba13eb (patch) | |
tree | 5aec1c554f4e40ea66ea8dc9123f8adcc28caf1c /canvas/source | |
parent | de103dcd002087d433f166b592b4ff22ebb743cc (diff) |
Removed weird VERBOSE overload in canvas
Now doing extra logging / graphical debug cues via OSL_DEBUG_LEVEL
of 3. Also saves some lines in makefiles.
Diffstat (limited to 'canvas/source')
-rw-r--r-- | canvas/source/directx/dx_5rm.cxx | 4 | ||||
-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 | 2 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 5 | ||||
-rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 7 |
7 files changed, 12 insertions, 14 deletions
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx index 25ac0bd828b9..7766951ef536 100644 --- a/canvas/source/directx/dx_5rm.cxx +++ b/canvas/source/directx/dx_5rm.cxx @@ -1735,7 +1735,7 @@ namespace dxcanvas // ignore area and offset for page flipping device if( mbPageFlipping ) { -#if defined(VERBOSE) && defined(DBG_UTIL) +#if OSL_DEBUG_LEVEL > 2 renderFPSCounter(); renderMemAvailable(); #endif @@ -1816,7 +1816,7 @@ namespace dxcanvas *mpBackBufferSurface, pBltFX,false ) ) { -#if defined(VERBOSE) && defined(DBG_UTIL) +#if OSL_DEBUG_LEVEL > 2 renderFPSCounter(); renderMemAvailable(); #endif diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index bd269a6aab66..e18a6d3ee593 100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx @@ -422,7 +422,7 @@ namespace dxcanvas rGraphics->FillPath( pGradientBrush.get(), pFillPath.get() ); } -#if defined(VERBOSE) && defined(DBG_UTIL) +#if OSL_DEBUG_LEVEL > 2 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 30bf9040634c..f2a28aab84ed 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -113,7 +113,7 @@ namespace dxcanvas maScrapRect(), mbShowSpriteBounds( false ) { -#if defined(VERBOSE) && defined(DBG_UTIL) +#if OSL_DEBUG_LEVEL > 2 // inverse default for verbose debug mode mbShowSpriteBounds = true; #endif diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx index 3c9479cd5ece..1da566f5baa3 100644 --- a/canvas/source/tools/surfaceproxy.cxx +++ b/canvas/source/tools/surfaceproxy.cxx @@ -156,7 +156,7 @@ namespace canvas const ::basegfx::B2DPolygon& rTriangulatedPolygon( ::basegfx::triangulator::triangulate(rClipPoly)); -#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 2 // dump polygons OSL_TRACE( "Original clip polygon: %s\n" "Triangulated polygon: %s\n", diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index e7ffe0e41356..638b4fc00aa2 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -454,7 +454,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 defined(VERBOSE) && OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 2 if( i && !(i % 10) ) rOutDev.SetFillColor( COL_RED ); #endif @@ -705,7 +705,8 @@ namespace vclcanvas } #endif // complex-clipping vs. XOR-trick -#if 0 //defined(VERBOSE) && OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 3 + // extra-verbosity { ::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0); ::basegfx::B2DRectangle aTextureDeviceRect; diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index ac75508809fe..4b21c012b04e 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -194,7 +194,7 @@ namespace vclcanvas mbShowSpriteBounds( false ), mbIsUnsafeScrolling( false ) { -#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 2 // inverse defaults for verbose debug mode mbShowSpriteBounds = mbShowFrameInfo = true; #endif @@ -353,7 +353,7 @@ namespace vclcanvas renderMemUsage( rOutDev ); } -#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 2 static ::canvas::tools::ElapsedTime aElapsedTime; // log time immediately after surface flip diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index e4226fac1f16..cf34ce975ce4 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -412,11 +412,8 @@ namespace vclcanvas 2,'.',NULL,' ') ); rTargetSurface.DrawText( aOutPos+Point(2,2), text ); - -#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0 - OSL_TRACE( "SpriteHelper::redraw(): sprite %X has prio %f\n", - this, getPriority() ); -#endif + VERBOSE_TRACE( "SpriteHelper::redraw(): sprite %X has prio %f\n", + this, getPriority() ); } } } |