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/source/bitmap/bitmap.cxx | |
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/source/bitmap/bitmap.cxx')
-rw-r--r-- | vcl/source/bitmap/bitmap.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index 23477b6e60ab..2de0da7b1a72 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -41,7 +41,7 @@ Bitmap::Bitmap(const Bitmap& rBitmap) { } -Bitmap::Bitmap(SalBitmap* pSalBitmap) +Bitmap::Bitmap(std::shared_ptr<SalBitmap> const & pSalBitmap) : mxSalBmp(pSalBitmap) , maPrefMapMode(MapMode(MapUnit::MapPixel)) , maPrefSize(mxSalBmp->GetSize()) @@ -104,7 +104,7 @@ Bitmap::Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalett pRealPal = const_cast<BitmapPalette*>(pPal); } - mxSalBmp.reset(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap(); mxSalBmp->Create( rSizePixel, nBitCount, pRealPal ? *pRealPal : aPal ); } } @@ -311,7 +311,7 @@ void Bitmap::ImplMakeUnique() if (mxSalBmp && mxSalBmp.use_count() > 1) { std::shared_ptr<SalBitmap> xOldImpBmp = mxSalBmp; - mxSalBmp.reset(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap(); mxSalBmp->Create(*xOldImpBmp); } } |