canvas/source/directx/dx_canvashelper_texturefill.cxx | 2 +-
canvas/source/directx/dx_spritecanvashelper.cxx | 2 +-
canvas/source/tools/surfaceproxy.cxx | 13 ++-----------
canvas/source/vcl/canvashelper_texturefill.cxx | 4 ++--
canvas/source/vcl/spritecanvashelper.cxx | 4 ++--
5 files changed, 8 insertions(+), 17 deletions(-)
New commits:
commit f0de4374fffe7fb72ce0e9006af57092834dfe1e
Author: Rohan Kumar <rohankanojia...@gmail.com>
Date: Thu Apr 7 13:45:11 2016 +0530
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 <c...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx
b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index 826bf69..0e9eb4d 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 66ea028..3803671 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 fd5b8e2..e809ec9 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 9064345..462ae47 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 65d1141..775e538 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
