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.cxx12
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.cxx2
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.hxx2
-rw-r--r--canvas/source/directx/dx_canvashelper.cxx4
-rw-r--r--canvas/source/directx/dx_canvashelper_texturefill.cxx4
-rw-r--r--canvas/source/directx/dx_impltools.cxx10
-rw-r--r--canvas/source/directx/dx_spritecanvashelper.cxx8
-rw-r--r--canvas/source/directx/dx_spritecanvashelper.hxx8
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.cxx8
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.hxx4
-rw-r--r--canvas/source/directx/dx_textlayout_drawhelper.cxx2
-rw-r--r--canvas/source/directx/dx_winstuff.hxx2
12 files changed, 33 insertions, 33 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 4b41d302b54b..db4f151123dd 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -183,7 +183,7 @@ namespace dxcanvas
virtual void resize( const ::basegfx::B2IRange& rect ) override;
virtual ::basegfx::B2IVector getPageSize() override;
- virtual ::std::shared_ptr<canvas::ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) override;
+ virtual std::shared_ptr<canvas::ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) override;
virtual void beginPrimitive( PrimitiveType eType ) override;
virtual void endPrimitive() override;
virtual void pushVertex( const ::canvas::Vertex& vertex ) override;
@@ -212,7 +212,7 @@ namespace dxcanvas
COMReference<IDirect3D9> mpDirect3D9;
COMReference<IDirect3DSwapChain9> mpSwapChain;
COMReference<IDirect3DVertexBuffer9> mpVertexBuffer;
- ::std::shared_ptr<canvas::ISurface> mpTexture;
+ std::shared_ptr<canvas::ISurface> mpTexture;
VclPtr<SystemChildWindow> mpWindow;
::basegfx::B2IVector maSize;
typedef std::vector<canvas::Vertex> vertexCache_t;
@@ -514,7 +514,7 @@ namespace dxcanvas
::basegfx::B2IVector aPageSize(maPageSize);
while(true)
{
- mpTexture = ::std::shared_ptr<canvas::ISurface>(
+ mpTexture = std::shared_ptr<canvas::ISurface>(
new DXSurface(*this,aPageSize));
if(mpTexture->isValid())
break;
@@ -980,13 +980,13 @@ namespace dxcanvas
// DXRenderModule::createSurface
- ::std::shared_ptr<canvas::ISurface> DXRenderModule::createSurface( const ::basegfx::B2IVector& surfaceSize )
+ std::shared_ptr<canvas::ISurface> DXRenderModule::createSurface( const ::basegfx::B2IVector& surfaceSize )
{
// TODO(P2): get rid of those fine-grained locking
::osl::MutexGuard aGuard( maMutex );
if(isDisposed())
- return ::std::shared_ptr<canvas::ISurface>();
+ return std::shared_ptr<canvas::ISurface>();
const ::basegfx::B2IVector& rPageSize( getPageSize() );
::basegfx::B2ISize aSize(surfaceSize);
@@ -998,7 +998,7 @@ namespace dxcanvas
if(mpTexture.use_count() == 1)
return mpTexture;
- return ::std::shared_ptr<canvas::ISurface>( new DXSurface(*this,aSize) );
+ return std::shared_ptr<canvas::ISurface>( new DXSurface(*this,aSize) );
}
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index b0e4b740ef67..4a87a66b04a8 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -40,7 +40,7 @@ namespace dxcanvas
CanvasCustomSprite::CanvasCustomSprite( const css::geometry::RealSize2D& rSpriteSize,
const SpriteCanvasRef& rRefDevice,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
bool bShowSpriteBounds ) :
mpSpriteCanvas( rRefDevice ),
mpSurface()
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index a3b57917ed7b..1772741a3fdf 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -99,7 +99,7 @@ namespace dxcanvas
CanvasCustomSprite( const css::geometry::RealSize2D& rSpriteSize,
const SpriteCanvasRef& rRefDevice,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
bool bShowSpriteBounds );
virtual void disposeThis() override;
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 94b9c322b5ea..72c63ffc2816 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -358,8 +358,8 @@ namespace dxcanvas
if(bIsMiter)
aPen.SetMiterLimit( static_cast< Gdiplus::REAL >(strokeAttributes.MiterLimit) );
- const ::std::vector< Gdiplus::REAL >& rDashArray(
- ::comphelper::sequenceToContainer< ::std::vector< Gdiplus::REAL >, double >(
+ const std::vector< Gdiplus::REAL >& rDashArray(
+ ::comphelper::sequenceToContainer< std::vector< Gdiplus::REAL >, double >(
strokeAttributes.DashArray ) );
if( !rDashArray.empty() )
{
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index c9853cf4a36e..4bebeb8c30f2 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -186,9 +186,9 @@ namespace dxcanvas
int numColorSteps( const Gdiplus::Color& rColor1, const Gdiplus::Color& rColor2 )
{
- return ::std::max(
+ return std::max(
labs( rColor1.GetRed() - rColor2.GetRed() ),
- ::std::max(
+ std::max(
labs( rColor1.GetGreen() - rColor2.GetGreen() ),
labs( rColor1.GetBlue() - rColor2.GetBlue() ) ) );
}
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 60429f2a500d..a748b5d9729f 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -174,7 +174,7 @@ namespace dxcanvas
}
void graphicsPathFromB2DPolygon( GraphicsPathSharedPtr& rOutput,
- ::std::vector< Gdiplus::PointF >& rPoints,
+ std::vector< Gdiplus::PointF >& rPoints,
const ::basegfx::B2DPolygon& rPoly,
bool bNoLineJoin)
{
@@ -406,7 +406,7 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromRealPoint2DSequence( const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
- ::std::vector< Gdiplus::PointF > aPoints;
+ std::vector< Gdiplus::PointF > aPoints;
sal_Int32 nCurrPoly;
for( nCurrPoly=0; nCurrPoly<points.getLength(); ++nCurrPoly )
@@ -419,7 +419,7 @@ namespace dxcanvas
// TODO(F1): Closed/open polygons
// convert from RealPoint2D array to Gdiplus::PointF array
- ::std::transform( points[nCurrPoly].getConstArray(),
+ std::transform( points[nCurrPoly].getConstArray(),
points[nCurrPoly].getConstArray()+nCurrSize,
aPoints.begin(),
implGdiPlusPointFromRealPoint2D );
@@ -434,7 +434,7 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly, bool bNoLineJoin )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
- ::std::vector< Gdiplus::PointF > aPoints;
+ std::vector< Gdiplus::PointF > aPoints;
graphicsPathFromB2DPolygon( pRes, aPoints, rPoly, bNoLineJoin );
@@ -444,7 +444,7 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, bool bNoLineJoin )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
- ::std::vector< Gdiplus::PointF > aPoints;
+ std::vector< Gdiplus::PointF > aPoints;
const sal_uInt32 nPolies( rPoly.count() );
for( sal_uInt32 nCurrPoly=0; nCurrPoly<nPolies; ++nCurrPoly )
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index f8661d82a0d3..d10a6fe66824 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -79,7 +79,7 @@ namespace dxcanvas
void SpriteCanvasHelper::init( SpriteCanvas& rParent,
::canvas::SpriteRedrawManager& rManager,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
const DXSurfaceBitmapSharedPtr& rBackBuffer,
const ::basegfx::B2ISize& rOutputOffset )
{
@@ -265,7 +265,7 @@ namespace dxcanvas
// repaint uncovered areas from backbuffer - take the
// _rounded_ rectangles from above, to have the update
// consistent with the scroll above.
- ::std::vector< ::basegfx::B2DRange > aUncoveredAreas;
+ std::vector< ::basegfx::B2DRange > aUncoveredAreas;
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
@@ -283,7 +283,7 @@ namespace dxcanvas
}
void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpRenderModule &&
mpBackBuffer,
@@ -313,7 +313,7 @@ namespace dxcanvas
}
void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpRenderModule &&
mpBackBuffer,
diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
index d3f48ab0cfa9..5137d6f9f208 100644
--- a/canvas/source/directx/dx_spritecanvashelper.hxx
+++ b/canvas/source/directx/dx_spritecanvashelper.hxx
@@ -46,7 +46,7 @@ namespace dxcanvas
void init( SpriteCanvas& rParent,
::canvas::SpriteRedrawManager& rManager,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
const DXSurfaceBitmapSharedPtr& rBackBuffer,
const ::basegfx::B2ISize& rOutputOffset );
@@ -119,10 +119,10 @@ namespace dxcanvas
const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
void opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
void genericUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
private:
/// For generating sprites
@@ -134,7 +134,7 @@ namespace dxcanvas
/// DX device, handling all low-level rendering
IDXRenderModuleSharedPtr mpRenderModule;
- ::std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxy;
+ std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxy;
/// Backbuffer, contains the static canvas render output
DXSurfaceBitmapSharedPtr mpBackBuffer;
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index ac8ce68d2c82..41f5b63ba655 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -56,8 +56,8 @@ namespace dxcanvas
bool /*bFullscreen*/ )
{
// #i60490# ensure backbuffer has sensible minimal size
- const sal_Int32 w( ::std::max(sal_Int32(1),sal_Int32(rRect.Width)));
- const sal_Int32 h( ::std::max(sal_Int32(1),sal_Int32(rRect.Height)));
+ const sal_Int32 w( std::max(sal_Int32(1),sal_Int32(rRect.Width)));
+ const sal_Int32 h( std::max(sal_Int32(1),sal_Int32(rRect.Height)));
rSpriteCanvas.setWindow(
uno::Reference<awt::XWindow2>(
@@ -185,8 +185,8 @@ namespace dxcanvas
// #i60490# ensure backbuffer has sensible minimal size
const sal_Int32 x(rBounds.X);
const sal_Int32 y(rBounds.Y);
- const sal_Int32 w(::std::max(sal_Int32(1),sal_Int32(rBounds.Width)));
- const sal_Int32 h(::std::max(sal_Int32(1),sal_Int32(rBounds.Height)));
+ const sal_Int32 w(std::max(sal_Int32(1),sal_Int32(rBounds.Width)));
+ const sal_Int32 h(std::max(sal_Int32(1),sal_Int32(rBounds.Height)));
if( mpRenderModule )
mpRenderModule->resize(::basegfx::B2IRange(x,y,x+w,y+h));
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 9d5eed1b9789..88848d4bf0ce 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -68,7 +68,7 @@ namespace dxcanvas
const IDXRenderModuleSharedPtr& getRenderModule() const { return mpRenderModule; }
const DXSurfaceBitmapSharedPtr& getBackBuffer() const { return mpBackBuffer; }
- const ::std::shared_ptr<canvas::ISurfaceProxyManager> &getSurfaceProxy() const { return mpSurfaceProxyManager; }
+ const std::shared_ptr<canvas::ISurfaceProxyManager> &getSurfaceProxy() const { return mpSurfaceProxyManager; }
css::uno::Any isAccelerated() const;
@@ -89,7 +89,7 @@ namespace dxcanvas
DXSurfaceBitmapSharedPtr mpBackBuffer;
/// Instance passing out HW textures
- ::std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxyManager;
+ std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxyManager;
/// Our encapsulation interface to DirectX
IDXRenderModuleSharedPtr mpRenderModule;
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index fb8e184f9cc6..6e279788a8c1 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -201,7 +201,7 @@ namespace dxcanvas
{
// create the DXArray
const sal_Int32 nLen( rLogicalAdvancements.getLength() );
- ::std::unique_ptr<sal_Int32[]> pDXArray( new sal_Int32[nLen] );
+ std::unique_ptr<sal_Int32[]> pDXArray( new sal_Int32[nLen] );
for( sal_Int32 i=0; i<nLen; ++i )
pDXArray[i] = basegfx::fround( rLogicalAdvancements[i] );
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index cb1840d4d42b..1214c99c71cd 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -122,7 +122,7 @@ namespace dxcanvas
COMReference& operator=( const COMReference& rRHS )
{
COMReference aTmp(rRHS);
- ::std::swap( mp, aTmp.mp );
+ std::swap( mp, aTmp.mp );
return *this;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 06:33:02 +0000