diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 15:04:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 07:45:28 +0000 |
| commit | 52360bf8dd567598593cb212ac85f0c919315618 (patch) | |
| tree | a97967592055bbd07abf983db840a8b2ead77c77 /vcl/source/gdi/bitmap.cxx | |
| parent | ba9b66eecf9ced0d890ff9d6b7a6efda35825382 (diff) | |
convert BmpCombine to scoped enum and drop unused
Change-Id: Ic67474683a25a25e5753777f4bbbeded6ceba414
Reviewed-on: https://gerrit.libreoffice.org/33793
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/gdi/bitmap.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 87 |
1 files changed, 2 insertions, 85 deletions
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index ec382f267612..16aa9adf590d 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -1721,31 +1721,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) switch( eCombine ) { - case BMP_COMBINE_COPY: - { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) - { - if( pMaskAcc->GetPixel( nY, nX ) == aMaskBlack ) - pAcc->SetPixel( nY, nX, aBlack ); - else - pAcc->SetPixel( nY, nX, aWhite ); - } - } - break; - - case BMP_COMBINE_INVERT: - { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) - { - if( pAcc->GetPixel( nY, nX ) == aBlack ) - pAcc->SetPixel( nY, nX, aWhite ); - else - pAcc->SetPixel( nY, nX, aBlack ); - } - } - break; - - case BMP_COMBINE_AND: + case BmpCombine::And: { for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) { @@ -1757,19 +1733,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) } break; - case BMP_COMBINE_NAND: - { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) - { - if( pMaskAcc->GetPixel( nY, nX ) != aMaskBlack && pAcc->GetPixel( nY, nX ) != aBlack ) - pAcc->SetPixel( nY, nX, aBlack ); - else - pAcc->SetPixel( nY, nX, aWhite ); - } - } - break; - - case BMP_COMBINE_OR: + case BmpCombine::Or: { for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) { @@ -1781,53 +1745,6 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) } break; - case BMP_COMBINE_NOR: - { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) - { - if( pMaskAcc->GetPixel( nY, nX ) != aMaskBlack || pAcc->GetPixel( nY, nX ) != aBlack ) - pAcc->SetPixel( nY, nX, aBlack ); - else - pAcc->SetPixel( nY, nX, aWhite ); - } - } - break; - - case BMP_COMBINE_XOR: - { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) - { - aPixel = pAcc->GetPixel( nY, nX ); - aMaskPixel = pMaskAcc->GetPixel( nY, nX ); - - if( ( aMaskPixel != aMaskBlack && aPixel == aBlack ) || - ( aMaskPixel == aMaskBlack && aPixel != aBlack ) ) - { - pAcc->SetPixel( nY, nX, aWhite ); - } - else - pAcc->SetPixel( nY, nX, aBlack ); - } - } - break; - - case BMP_COMBINE_NXOR: - { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) - { - aPixel = pAcc->GetPixel( nY, nX ); - aMaskPixel = pMaskAcc->GetPixel( nY, nX ); - - if( ( aMaskPixel != aMaskBlack && aPixel == aBlack ) || - ( aMaskPixel == aMaskBlack && aPixel != aBlack ) ) - { - pAcc->SetPixel( nY, nX, aBlack ); - } - else - pAcc->SetPixel( nY, nX, aWhite ); - } - } - break; } bRet = true; |