Kaydet (Commit) 524ce218 authored tarafından Caolán McNamara's avatar Caolán McNamara

Revert "these are equal to the defaults"

This reverts commit 9e09827b.

Revert "coverity#1371302 Missing move assignment operator"

This reverts commit e214fab7.
üst 51035a3d
......@@ -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 ); }
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment