diff options
Diffstat (limited to 'vcl/source/gdi/bmpacc2.cxx')
| -rw-r--r-- | vcl/source/gdi/bmpacc2.cxx | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx index 25606c09509e..83865113234c 100644 --- a/vcl/source/gdi/bmpacc2.cxx +++ b/vcl/source/gdi/bmpacc2.cxx @@ -29,8 +29,10 @@ void BitmapReadAccess::SetPixelForN1BitMsbPal(const Scanline pScanline, long nX, { sal_uInt8& rByte = pScanline[ nX >> 3 ]; - ( rBitmapColor.GetIndex() & 1 ) ? ( rByte |= 1 << ( 7 - ( nX & 7 ) ) ) : - ( rByte &= ~( 1 << ( 7 - ( nX & 7 ) ) ) ); + if ( rBitmapColor.GetIndex() & 1 ) + rByte |= 1 << ( 7 - ( nX & 7 ) ); + else + rByte &= ~( 1 << ( 7 - ( nX & 7 ) ) ); } BitmapColor BitmapReadAccess::GetPixelForN1BitLsbPal(ConstScanline pScanline, long nX, const ColorMask&) @@ -42,8 +44,10 @@ void BitmapReadAccess::SetPixelForN1BitLsbPal(const Scanline pScanline, long nX, { sal_uInt8& rByte = pScanline[ nX >> 3 ]; - ( rBitmapColor.GetIndex() & 1 ) ? ( rByte |= 1 << ( nX & 7 ) ) : - ( rByte &= ~( 1 << ( nX & 7 ) ) ); + if ( rBitmapColor.GetIndex() & 1 ) + rByte |= 1 << ( nX & 7 ); + else + rByte &= ~( 1 << ( nX & 7 ) ); } BitmapColor BitmapReadAccess::GetPixelForN4BitMsnPal(ConstScanline pScanline, long nX, const ColorMask&) @@ -55,8 +59,16 @@ void BitmapReadAccess::SetPixelForN4BitMsnPal(const Scanline pScanline, long nX, { sal_uInt8& rByte = pScanline[ nX >> 1 ]; - ( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( rBitmapColor.GetIndex() & 0x0f ) ) : - ( rByte &= 0x0f, rByte |= ( rBitmapColor.GetIndex() << 4 ) ); + if ( nX & 1 ) + { + rByte &= 0xf0; + rByte |= ( rBitmapColor.GetIndex() & 0x0f ); + } + else + { + rByte &= 0x0f; + rByte |= ( rBitmapColor.GetIndex() << 4 ); + } } BitmapColor BitmapReadAccess::GetPixelForN4BitLsnPal(ConstScanline pScanline, long nX, const ColorMask&) @@ -68,8 +80,16 @@ void BitmapReadAccess::SetPixelForN4BitLsnPal(const Scanline pScanline, long nX, { sal_uInt8& rByte = pScanline[ nX >> 1 ]; - ( nX & 1 ) ? ( rByte &= 0x0f, rByte |= ( rBitmapColor.GetIndex() << 4 ) ) : - ( rByte &= 0xf0, rByte |= ( rBitmapColor.GetIndex() & 0x0f ) ); + if ( nX & 1 ) + { + rByte &= 0x0f; + rByte |= ( rBitmapColor.GetIndex() << 4 ); + } + else + { + rByte &= 0xf0; + rByte |= ( rBitmapColor.GetIndex() & 0x0f ); + } } BitmapColor BitmapReadAccess::GetPixelForN8BitPal(ConstScanline pScanline, long nX, const ColorMask&) |