summaryrefslogtreecommitdiff
path: root/canvas/source/directx
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/directx')
-rw-r--r--canvas/source/directx/dx_9rm.cxx4
-rw-r--r--canvas/source/directx/dx_canvas.cxx6
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.cxx2
-rw-r--r--canvas/source/directx/dx_devicehelper.cxx2
-rw-r--r--canvas/source/directx/dx_impltools.cxx2
-rw-r--r--canvas/source/directx/dx_spritecanvas.cxx4
-rw-r--r--canvas/source/directx/dx_spritecanvashelper.cxx2
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.cxx6
-rw-r--r--canvas/source/directx/dx_spritehelper.cxx7
-rw-r--r--canvas/source/directx/dx_textlayout.cxx4
-rw-r--r--canvas/source/directx/dx_vcltools.cxx8
11 files changed, 12 insertions, 35 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 42c37ac54004..d18d34ad44c7 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -35,8 +35,6 @@
#include <vcl/syschild.hxx>
#include <vcl/window.hxx>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/elapsedtime.hxx>
@@ -1159,7 +1157,7 @@ namespace dxcanvas
}
default:
- OSL_FAIL("DXRenderModule::pushVertex(): unexpected primitive type");
+ SAL_WARN("canvas.directx", "DXRenderModule::pushVertex(): unexpected primitive type");
break;
}
}
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index 727d9093a181..ebf370e90073 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -19,8 +19,6 @@
#include <ctype.h>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
@@ -82,7 +80,7 @@ namespace dxcanvas
if( maArguments.getLength() == 0 )
return;
- VERBOSE_TRACE( "Canvas::initialize called" );
+ SAL_INFO("canvas.directx", "Canvas::initialize called" );
// At index 1, we expect a HWND handle here, containing a
// pointer to a valid window, on which to output
@@ -143,7 +141,7 @@ namespace dxcanvas
if( maArguments.getLength() == 0 )
return;
- VERBOSE_TRACE( "BitmapCanvas::initialize called" );
+ SAL_INFO("canvas.directx", "BitmapCanvas::initialize called" );
// At index 1, we expect a HWND handle here, containing a
// pointer to a valid window, on which to output
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index 89e1b9ef4ef5..7dbe80a0d99a 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -19,8 +19,6 @@
#include <ctype.h>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index 1894e2da802e..384d635dfb6d 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -21,8 +21,6 @@
#include <ctype.h>
#include <vcl/window.hxx>
#include <vcl/canvastools.hxx>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 499d9211bd0b..98a9e49f01f9 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -21,8 +21,6 @@
#include <ctype.h>
#include <basegfx/numeric/ftools.hxx>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 3ec2214bf786..d6a0e78d655c 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -19,8 +19,6 @@
#include <ctype.h>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/canvastools.hxx>
@@ -68,7 +66,7 @@ namespace dxcanvas
if( maArguments.getLength() == 0 )
return;
- VERBOSE_TRACE( "SpriteCanvas::initialize called" );
+ SAL_INFO("canvas.directx", "SpriteCanvas::initialize called" );
/* aArguments:
0: ptr to creating instance (Window or VirtualDevice)
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index 6a06c6a6b225..e596805b2316 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -18,8 +18,6 @@
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index e9d5bb4546c2..6664f23c6796 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -19,8 +19,6 @@
#include <ctype.h>
#include <vcl/window.hxx>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
@@ -164,13 +162,13 @@ namespace dxcanvas
sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
{
- OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
+ SAL_WARN("canvas.directx", "Not supposed to be called, handled by SpriteCanvas");
return sal_False;
}
sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
{
- OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
+ SAL_WARN("canvas.directx", "Not supposed to be called, handled by SpriteCanvas");
return sal_False;
}
diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
index 6b45d3866cef..67dd44fe0d10 100644
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -18,8 +18,6 @@
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/math.hxx>
@@ -123,9 +121,8 @@ namespace dxcanvas
// background buffer.
// log output pos in device pixel
- VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)",
- rPos.getX(),
- rPos.getY() );
+ SAL_INFO("canva.directx", "SpriteHelper::redraw(): output pos is (" <<
+ rPos.getX() << "," << rPos.getY() << ")" );
const double fAlpha( getAlpha() );
const ::basegfx::B2DVector& rSize( getSizePixel() );
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 016a3309fd60..3ff3e43d6a44 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -19,8 +19,6 @@
#include <ctype.h>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -93,7 +91,7 @@ namespace dxcanvas
if( aAdvancements.getLength() != maText.Length )
{
- OSL_TRACE( "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
+ SAL_WARN("canvas.directx", "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
throw lang::IllegalArgumentException();
}
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 92b1a2d6e553..ace75a27948b 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -18,18 +18,16 @@
*/
-#include <vcl/canvastools.hxx>
+#include <tools/diagnose_ex.h>
+#include <vcl/canvastools.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bmpacc.hxx>
-#include <tools/diagnose_ex.h>
#include "dx_impltools.hxx"
-#include <basegfx/numeric/ftools.hxx>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
+#include <basegfx/numeric/ftools.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/XIntegerBitmap.hpp>
generated by cgit (git 2.34.1) at 2024-07-14 18:41:47 +0000