summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-30 11:52:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-09-30 11:53:31 +0100
commit524ce218ea40e0c419367c973cba7b7d677da740 (patch)
treecd598ec8c556f71c212c115f96c61edcc2b48e0a
parent51035a3d4518a56bd4177a77923f606612052247 (diff)
Revert "these are equal to the defaults"
This reverts commit 9e09827b0111b2acd8c2b78369ed46a5732931aa. Revert "coverity#1371302 Missing move assignment operator" This reverts commit e214fab7a318f7881d0bd2803f54ce4e1ac2cb83.
-rw-r--r--include/vcl/alpha.hxx7
-rw-r--r--vcl/source/gdi/alpha.cxx9
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;