diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 14:25:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 08:14:03 +0200 |
| commit | 224b770fa77fe12ad5dc543ce020aca316b6558d (patch) | |
| tree | 5bd71b4ccf39558b4afcd3f7f67744a111cda3b8 /include/vcl/salbtype.hxx | |
| parent | b2cb3196868deb499bb91fc9bdbe6c8f7d1e9033 (diff) | |
remove UL/L suffixes from shift-by-constant expressions
Change-Id: Ia470f643e3eefeccc14183133603db260460bd53
Reviewed-on: https://gerrit.libreoffice.org/41212
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl/salbtype.hxx')
| -rw-r--r-- | include/vcl/salbtype.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 7aa075aeed3c..47d51e00b799 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -524,7 +524,7 @@ inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, sal_uInt8* pP inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8UL ); + const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8 ); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } @@ -533,13 +533,13 @@ inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, sal_uInt8 { const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); - pPixel[ 0 ] = (sal_uInt8)(nVal >> 8U); + pPixel[ 0 ] = (sal_uInt8)(nVal >> 8); pPixel[ 1 ] = (sal_uInt8) nVal; } inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ); + const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } @@ -549,21 +549,21 @@ inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, sal_uInt8 const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); pPixel[ 0 ] = (sal_uInt8) nVal; - pPixel[ 1 ] = (sal_uInt8)(nVal >> 8U); + pPixel[ 1 ] = (sal_uInt8)(nVal >> 8); } inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | - ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL ); + const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ) | + ( (sal_uInt32) pPixel[ 2 ] << 16 ) | ( (sal_uInt32) pPixel[ 3 ] << 24 ); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | - ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL ); + const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ) | + ( (sal_uInt32) pPixel[ 2 ] << 16 ) | ( (sal_uInt32) pPixel[ 3 ] << 24 ); rAlpha = (sal_uInt8)(nVal >> 24); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); @@ -573,9 +573,9 @@ inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* p { const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); pPixel[ 0 ] = (sal_uInt8) nVal; - pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL ); - pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL ); - pPixel[ 3 ] = (sal_uInt8) ( nVal >> 24UL ); + pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8 ); + pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16 ); + pPixel[ 3 ] = (sal_uInt8) ( nVal >> 24 ); } #endif // INCLUDED_VCL_SALBTYPE_HXX |