diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-16 10:39:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-16 16:03:07 +0000 |
| commit | 3cdb86054c09617cea85dfc24ecbaf9cba376d7b (patch) | |
| tree | 492627915c07805dec4ad696b363abb131fb40d3 /include | |
| parent | ed88e6bf6a492008bd2e03a0e2ccab844fc8511e (diff) | |
use std shared_ptr for sharing ImpBitmaps
Change-Id: I1a0360096964f6402bd3631f2b3f34bf9595ebc6
Reviewed-on: https://gerrit.libreoffice.org/22394
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/bitmap.hxx | 17 | ||||
| -rw-r--r-- | include/vcl/bitmapex.hxx | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 58fde1251ed5..e45c8f0dd9bb 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -716,10 +716,9 @@ public: public: - SAL_DLLPRIVATE void ImplReleaseRef(); SAL_DLLPRIVATE void ImplMakeUnique(); - ImpBitmap* ImplGetImpBitmap() const { return mpImpBmp;} - SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp ); + std::shared_ptr<ImpBitmap> ImplGetImpBitmap() const { return mxImpBmp;} + SAL_DLLPRIVATE void ImplSetImpBitmap( std::shared_ptr<ImpBitmap> xImpBmp ); SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const; @@ -787,7 +786,7 @@ public: private: - ImpBitmap* mpImpBmp; + std::shared_ptr<ImpBitmap> mxImpBmp; MapMode maPrefMapMode; Size maPrefSize; @@ -795,27 +794,27 @@ private: inline bool Bitmap::operator!() const { - return( mpImpBmp == nullptr ); + return( mxImpBmp == nullptr ); } inline bool Bitmap::operator==( const Bitmap& rBitmap ) const { - return( rBitmap.mpImpBmp == mpImpBmp ); + return( rBitmap.mxImpBmp == mxImpBmp ); } inline bool Bitmap::operator!=( const Bitmap& rBitmap ) const { - return( rBitmap.mpImpBmp != mpImpBmp ); + return( rBitmap.mxImpBmp != mxImpBmp ); } inline bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const { - return( rBitmap.mpImpBmp == mpImpBmp ); + return( rBitmap.mxImpBmp == mxImpBmp ); } inline bool Bitmap::IsEmpty() const { - return( mpImpBmp == nullptr ); + return( mxImpBmp == nullptr ); } inline const MapMode& Bitmap::GetPrefMapMode() const diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 1e8511cec0a8..a4dea75da7ae 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -445,8 +445,8 @@ public: const Size &rSize ); public: - SAL_DLLPRIVATE ImpBitmap* ImplGetBitmapImpBitmap() const { return aBitmap.ImplGetImpBitmap(); } - SAL_DLLPRIVATE ImpBitmap* ImplGetMaskImpBitmap() const { return aMask.ImplGetImpBitmap(); } + SAL_DLLPRIVATE std::shared_ptr<ImpBitmap> ImplGetBitmapImpBitmap() const { return aBitmap.ImplGetImpBitmap(); } + SAL_DLLPRIVATE std::shared_ptr<ImpBitmap> ImplGetMaskImpBitmap() const { return aMask.ImplGetImpBitmap(); } private: |