diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-27 11:36:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-27 12:59:25 +0200 |
| commit | 404630c6052919c1a0b5dab405084c2a39fc2f5c (patch) | |
| tree | b27ac3d74104ee750bb1aac45800923632a59b4e /vcl | |
| parent | f7445e1014815a9eb02e2c22257bbce32dc43589 (diff) | |
simplify Bitmap operator==/IsEqual (stage1)
It looks like operator== is actually only useful internally. So inline
that, and rename the other call sites to use IsEqual().
As a second stage, I will rename IsEqual to operator==, the intention
being to make it obvious how the call sites are modified.
Change-Id: I37f2920a8cafaffb25e8c5c16e6559546206684b
Reviewed-on: https://gerrit.libreoffice.org/42846
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index bce74703689c..aef5cf4b2428 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -779,7 +779,7 @@ bool Bitmap::CopyPixel( const tools::Rectangle& rRectDst, if( !aRectDst.IsEmpty() ) { - if( pBmpSrc && ( *pBmpSrc != *this ) ) + if( pBmpSrc && ( pBmpSrc->mxImpBmp != mxImpBmp ) ) { Bitmap* pSrc = const_cast<Bitmap*>(pBmpSrc); const Size aCopySizePix( pSrc->GetSizePixel() ); @@ -958,7 +958,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const t if( !aRectDst.IsEmpty() ) { - if( pBmpSrc && ( *pBmpSrc != *this ) ) + if( pBmpSrc && ( pBmpSrc->mxImpBmp != mxImpBmp ) ) { Bitmap* pSrc = const_cast<Bitmap*>(pBmpSrc); const Size aCopySizePix( pSrc->GetSizePixel() ); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 99cf6846b243..4a15547435cf 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -193,7 +193,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const if( eTransparent != rBitmapEx.eTransparent ) return false; - if( aBitmap != rBitmapEx.aBitmap ) + if( !aBitmap.IsEqual(rBitmapEx.aBitmap) ) return false; if( aBitmapSize != rBitmapEx.aBitmapSize ) @@ -205,7 +205,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const if( eTransparent == TransparentType::Color ) return aTransparentColor == rBitmapEx.aTransparentColor; - return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) ); + return aMask.IsEqual(rBitmapEx.aMask) && bAlpha == rBitmapEx.bAlpha; } bool BitmapEx::IsEmpty() const |