summaryrefslogtreecommitdiff
path: root/canvas/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/tools')
-rw-r--r--canvas/source/tools/page.cxx2
-rw-r--r--canvas/source/tools/page.hxx16
-rw-r--r--canvas/source/tools/pagemanager.hxx6
-rw-r--r--canvas/source/tools/surface.cxx8
-rw-r--r--canvas/source/tools/surface.hxx4
-rw-r--r--canvas/source/tools/surfaceproxy.cxx2
-rw-r--r--canvas/source/tools/surfaceproxy.hxx4
-rw-r--r--canvas/source/tools/surfaceproxymanager.cxx8
8 files changed, 25 insertions, 25 deletions
diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx
index d9b7c08f3f75..4d83851d806a 100644
--- a/canvas/source/tools/page.cxx
+++ b/canvas/source/tools/page.cxx
@@ -23,7 +23,7 @@
namespace canvas
{
- Page::Page( const IRenderModuleSharedPtr &rRenderModule ) :
+ Page::Page( const std::shared_ptr<IRenderModule> &rRenderModule ) :
mpRenderModule(rRenderModule),
mpSurface(rRenderModule->createSurface(::basegfx::B2ISize()))
{
diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index f2c3ff054214..70ee866d3cb4 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.hxx
@@ -42,20 +42,20 @@ namespace canvas
class Page
{
public:
- explicit Page( const IRenderModuleSharedPtr& rRenderModule );
+ explicit Page( const std::shared_ptr<IRenderModule>& rRenderModule );
FragmentSharedPtr allocateSpace( const ::basegfx::B2ISize& rSize );
bool nakedFragment( const FragmentSharedPtr& pFragment );
void free( const FragmentSharedPtr& pFragment );
- const ISurfaceSharedPtr& getSurface() const { return mpSurface; }
+ const std::shared_ptr<ISurface>& getSurface() const { return mpSurface; }
bool isValid() const;
void validate();
private:
typedef std::list<FragmentSharedPtr> FragmentContainer_t;
- IRenderModuleSharedPtr mpRenderModule;
- ISurfaceSharedPtr mpSurface;
+ std::shared_ptr<IRenderModule> mpRenderModule;
+ std::shared_ptr<ISurface> mpSurface;
FragmentContainer_t mpFragments;
bool insert( SurfaceRect& r );
@@ -92,7 +92,7 @@ namespace canvas
const SurfaceRect& getRect() const { return maRect; }
const ::basegfx::B2IPoint& getPos() const { return maRect.maPos; }
const ::basegfx::B2ISize& getSize() const { return maRect.maSize; }
- void setColorBuffer( const IColorBufferSharedPtr& pColorBuffer ) { mpBuffer=pColorBuffer; }
+ void setColorBuffer( const std::shared_ptr<IColorBuffer>& pColorBuffer ) { mpBuffer=pColorBuffer; }
void setSourceOffset( const ::basegfx::B2IPoint& rOffset ) { maSourceOffset=rOffset; }
void setPage( Page* pPage ) { mpPage=pPage; }
@@ -112,7 +112,7 @@ namespace canvas
if(!(mpPage))
return false;
- ISurfaceSharedPtr pSurface(mpPage->getSurface());
+ std::shared_ptr<ISurface> pSurface(mpPage->getSurface());
// select this surface before wiping the contents
// since a specific implementation could trigger
@@ -129,7 +129,7 @@ namespace canvas
if(!(mpPage))
return false;
- ISurfaceSharedPtr pSurface(mpPage->getSurface());
+ std::shared_ptr<ISurface> pSurface(mpPage->getSurface());
return pSurface->update( maRect.maPos,
::basegfx::B2IRectangle(
@@ -141,7 +141,7 @@ namespace canvas
private:
Page* mpPage;
SurfaceRect maRect;
- IColorBufferSharedPtr mpBuffer;
+ std::shared_ptr<IColorBuffer> mpBuffer;
::basegfx::B2IPoint maSourceOffset;
};
}
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index 03a5470ea2af..d89754d51ec6 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -32,7 +32,7 @@ namespace canvas
class PageManager
{
public:
- explicit PageManager(const canvas::IRenderModuleSharedPtr& rRenderModule)
+ explicit PageManager(const std::shared_ptr<canvas::IRenderModule>& rRenderModule)
: mpRenderModule(rRenderModule)
{
}
@@ -41,7 +41,7 @@ namespace canvas
// accelerated page, e.g. OpenGL texture.
::basegfx::B2ISize getPageSize() const;
- const canvas::IRenderModuleSharedPtr& getRenderModule() const { return mpRenderModule; }
+ const std::shared_ptr<canvas::IRenderModule>& getRenderModule() const { return mpRenderModule; }
FragmentSharedPtr allocateSpace( const ::basegfx::B2ISize& rSize );
void free( const FragmentSharedPtr& pFragment );
@@ -53,7 +53,7 @@ namespace canvas
private:
// the pagemanager needs access to the rendermodule
// since we query for system resources from it.
- canvas::IRenderModuleSharedPtr mpRenderModule;
+ std::shared_ptr<canvas::IRenderModule> mpRenderModule;
// here we collect all fragments that will be created
// since we need them for relocation purposes.
diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index c1ff5a218f65..ec924f7d4e49 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.cxx
@@ -28,7 +28,7 @@
namespace canvas
{
Surface::Surface( const PageManagerSharedPtr& rPageManager,
- const IColorBufferSharedPtr& rColorBuffer,
+ const std::shared_ptr<IColorBuffer>& rColorBuffer,
const ::basegfx::B2IPoint& rPos,
const ::basegfx::B2ISize& rSize ) :
mpColorBuffer(rColorBuffer),
@@ -93,7 +93,7 @@ namespace canvas
const ::basegfx::B2DPoint& rPos,
const ::basegfx::B2DHomMatrix& rTransform )
{
- IRenderModuleSharedPtr pRenderModule(mpPageManager->getRenderModule());
+ std::shared_ptr<IRenderModule> pRenderModule(mpPageManager->getRenderModule());
RenderModuleGuard aGuard( pRenderModule );
@@ -193,7 +193,7 @@ namespace canvas
if( rArea.isEmpty() )
return true; // immediate exit for empty area
- IRenderModuleSharedPtr pRenderModule(mpPageManager->getRenderModule());
+ std::shared_ptr<IRenderModule> pRenderModule(mpPageManager->getRenderModule());
RenderModuleGuard aGuard( pRenderModule );
@@ -310,7 +310,7 @@ namespace canvas
const ::basegfx::B2DPolygon& rClipPoly,
const ::basegfx::B2DHomMatrix& rTransform )
{
- IRenderModuleSharedPtr pRenderModule(mpPageManager->getRenderModule());
+ std::shared_ptr<IRenderModule> pRenderModule(mpPageManager->getRenderModule());
RenderModuleGuard aGuard( pRenderModule );
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index d6b8d90995e0..1b7a463fc588 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -46,7 +46,7 @@ namespace canvas
public:
Surface( const PageManagerSharedPtr& rPageManager,
- const IColorBufferSharedPtr& rColorBuffer,
+ const std::shared_ptr<IColorBuffer>& rColorBuffer,
const ::basegfx::B2IPoint& rPos,
const ::basegfx::B2ISize& rSize );
~Surface();
@@ -111,7 +111,7 @@ namespace canvas
const ::basegfx::B2DHomMatrix& rTransform );
private:
- IColorBufferSharedPtr mpColorBuffer;
+ std::shared_ptr<IColorBuffer> mpColorBuffer;
// invoking any of the above defined 'draw' methods
// will forward primitive commands to the rendermodule.
diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx
index a2ffd3204a42..a9fb781fcb9a 100644
--- a/canvas/source/tools/surfaceproxy.cxx
+++ b/canvas/source/tools/surfaceproxy.cxx
@@ -27,7 +27,7 @@
namespace canvas
{
- SurfaceProxy::SurfaceProxy( const canvas::IColorBufferSharedPtr& pBuffer,
+ SurfaceProxy::SurfaceProxy( const std::shared_ptr<canvas::IColorBuffer>& pBuffer,
const PageManagerSharedPtr& pPageManager ) :
mpPageManager( pPageManager ),
maSurfaceList(),
diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx
index f89850d92af4..09cd36d7f6b0 100644
--- a/canvas/source/tools/surfaceproxy.hxx
+++ b/canvas/source/tools/surfaceproxy.hxx
@@ -39,7 +39,7 @@ namespace canvas
{
public:
- SurfaceProxy( const canvas::IColorBufferSharedPtr& pBuffer,
+ SurfaceProxy( const std::shared_ptr<canvas::IColorBuffer>& pBuffer,
const PageManagerSharedPtr &pPageManager );
// ISurfaceProxy interface
@@ -112,7 +112,7 @@ namespace canvas
// pointer to the source of image data
// which always is stored in system memory,
// 32bit rgba and can have any size.
- canvas::IColorBufferSharedPtr mpBuffer;
+ std::shared_ptr<canvas::IColorBuffer> mpBuffer;
};
}
diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx
index 1e318f941125..d0ddfff51f66 100644
--- a/canvas/source/tools/surfaceproxymanager.cxx
+++ b/canvas/source/tools/surfaceproxymanager.cxx
@@ -30,7 +30,7 @@ namespace canvas
{
public:
- explicit SurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule ) :
+ explicit SurfaceProxyManager( const std::shared_ptr<IRenderModule>& rRenderModule ) :
mpPageManager( new PageManager(rRenderModule) )
{
}
@@ -48,7 +48,7 @@ namespace canvas
texture may be distributed to several real hardware
surfaces.
*/
- virtual std::shared_ptr<ISurfaceProxy> createSurfaceProxy( const IColorBufferSharedPtr& pBuffer ) const override
+ virtual std::shared_ptr<ISurfaceProxy> createSurfaceProxy( const std::shared_ptr<IColorBuffer>& pBuffer ) const override
{
// not much to do for now, simply allocate a new surface
// proxy from our internal pool and initialize this thing
@@ -60,9 +60,9 @@ namespace canvas
PageManagerSharedPtr mpPageManager;
};
- ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule )
+ std::shared_ptr<ISurfaceProxyManager> createSurfaceProxyManager( const std::shared_ptr<IRenderModule>& rRenderModule )
{
- return ISurfaceProxyManagerSharedPtr(
+ return std::shared_ptr<ISurfaceProxyManager>(
new SurfaceProxyManager(
rRenderModule));
}
generated by cgit (git 2.34.1) at 2024-07-13 13:21:09 +0000