diff options
| -rw-r--r-- | include/vcl/alpha.hxx | 7 | ||||
| -rw-r--r-- | vcl/source/gdi/alpha.cxx | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 31a0e7a979d3..2445cf2bbec7 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -33,13 +33,12 @@ public: AlphaMask(); AlphaMask( const Bitmap& rBitmap ); - AlphaMask( const AlphaMask& rAlphaMask ) = default; - AlphaMask( AlphaMask&& rAlphaMask ) = default; + AlphaMask( const AlphaMask& rAlphaMask ); AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = nullptr ); + virtual ~AlphaMask() override; AlphaMask& operator=( const Bitmap& rBitmap ); - AlphaMask& operator=( const AlphaMask& rAlphaMask ) = default; - AlphaMask& operator=( AlphaMask&& rAlphaMask ) = default; + AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); } bool operator!() const { return Bitmap::operator!(); } bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index ec39af5aae00..01a57f61e0ed 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -33,6 +33,11 @@ AlphaMask::AlphaMask( const Bitmap& rBitmap ) : Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS ); } +AlphaMask::AlphaMask( const AlphaMask& rAlphaMask ) : + Bitmap( rAlphaMask ) +{ +} + AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) : Bitmap( rSizePixel, 8, &Bitmap::GetGreyPalette( 256 ) ) { @@ -40,6 +45,10 @@ AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) : Bitmap::Erase( Color( *pEraseTransparency, *pEraseTransparency, *pEraseTransparency ) ); } +AlphaMask::~AlphaMask() +{ +} + AlphaMask& AlphaMask::operator=( const Bitmap& rBitmap ) { *static_cast<Bitmap*>(this) = rBitmap; |