[Libreoffice-commits] core.git: include/vcl vcl/source
Caolán McNamara
caolanm at redhat.com
Fri Sep 30 13:39:17 UTC 2016
include/vcl/alpha.hxx | 2 ++
vcl/source/gdi/alpha.cxx | 5 +++++
2 files changed, 7 insertions(+)
New commits:
commit 264f3830d70f683f2f11ebf344ffa233a454cea6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 30 12:00:18 2016 +0100
coverity#1371302 Missing move assignment operator
Change-Id: I3df51235e9c8140ac8711b4bd7a9a677fe9ad9eb
Reviewed-on: https://gerrit.libreoffice.org/29402
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 2445cf2..738bd5a 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -34,11 +34,13 @@ public:
AlphaMask();
AlphaMask( const Bitmap& rBitmap );
AlphaMask( const AlphaMask& rAlphaMask );
+ AlphaMask( AlphaMask&& rAlphaMask );
AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = nullptr );
virtual ~AlphaMask() override;
AlphaMask& operator=( const Bitmap& rBitmap );
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); }
+ AlphaMask& operator=( 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 01a57f6..d88d093 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -38,6 +38,11 @@ AlphaMask::AlphaMask( const AlphaMask& rAlphaMask ) :
{
}
+AlphaMask::AlphaMask( AlphaMask&& rAlphaMask ) :
+ Bitmap( std::move(rAlphaMask) )
+{
+}
+
AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) :
Bitmap( rSizePixel, 8, &Bitmap::GetGreyPalette( 256 ) )
{
More information about the Libreoffice-commits
mailing list