diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 12:29:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-14 11:50:00 +0200 |
| commit | 8447d31e529985ef7fc71933f0e55685530f9fc9 (patch) | |
| tree | c8f01ee85837024482ab77c8770c8bca442ddd06 /vcl/headless | |
| parent | 1cf27cb44380f4a2bd6778c2dbbdef2a2a00cbc8 (diff) | |
return SalBitmap using std::shared_ptr
since we hold it like that in Bitmap anyway
Change-Id: I6264dfaaae6210cb008df5db8a421fc80c508f5b
Reviewed-on: https://gerrit.libreoffice.org/55458
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 5 | ||||
| -rw-r--r-- | vcl/headless/svpinst.cxx | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 4b5050420e7a..9163d8cf8133 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1309,9 +1309,9 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR, releaseCairoContext(cr, false, extents); } -SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) +std::shared_ptr<SalBitmap> SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) { - SvpSalBitmap* pBitmap = new SvpSalBitmap(); + std::shared_ptr<SvpSalBitmap> pBitmap = std::make_shared<SvpSalBitmap>(); BitmapPalette aPal; if (GetBitCount() == 1) { @@ -1323,7 +1323,6 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeigh if (!pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal)) { SAL_WARN("vcl.gdi", "SvpSalGraphics::getBitmap, cannot create bitmap"); - delete pBitmap; return nullptr; } diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index ad265e335265..3b43c46aae36 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -260,12 +260,12 @@ SalSystem* SvpSalInstance::CreateSalSystem() return new SvpSalSystem(); } -SalBitmap* SvpSalInstance::CreateSalBitmap() +std::shared_ptr<SalBitmap> SvpSalInstance::CreateSalBitmap() { #ifdef IOS - return new QuartzSalBitmap(); + return std::make_shared<QuartzSalBitmap>(); #else - return new SvpSalBitmap(); + return std::make_shared<SvpSalBitmap>(); #endif } |