diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bmpacc2.cxx | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx index 8501f00af171..ea02ab7598b6 100644 --- a/vcl/source/gdi/bmpacc2.cxx +++ b/vcl/source/gdi/bmpacc2.cxx @@ -127,7 +127,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline, lo { BitmapColor aBitmapColor; - aBitmapColor.SetBlue( *( pScanline = pScanline + nX * 3 )++ ); + pScanline = pScanline + nX * 3; + aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); @@ -136,7 +137,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline, lo void BitmapReadAccess::SetPixelForN24BitTcBgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { - *( pScanline = pScanline + nX * 3 )++ = rBitmapColor.GetBlue(); + pScanline = pScanline + nX * 3; + *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetRed(); } @@ -145,7 +147,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline, lo { BitmapColor aBitmapColor; - aBitmapColor.SetRed( *( pScanline = pScanline + nX * 3 )++ ); + pScanline = pScanline + nX * 3; + aBitmapColor.SetRed( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetBlue( *pScanline ); @@ -154,7 +157,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline, lo void BitmapReadAccess::SetPixelForN24BitTcRgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { - *( pScanline = pScanline + nX * 3 )++ = rBitmapColor.GetRed(); + pScanline = pScanline + nX * 3; + *pScanline++ = rBitmapColor.GetRed(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetBlue(); } @@ -175,7 +179,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline, l { BitmapColor aBitmapColor; - aBitmapColor.SetBlue( *( pScanline = pScanline + ( nX << 2 ) + 1 )++ ); + pScanline = pScanline + ( nX << 2 ) + 1; + aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); @@ -184,7 +189,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline, l void BitmapReadAccess::SetPixelForN32BitTcAbgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { - *( pScanline = pScanline + ( nX << 2 ) )++ = 0xFF; + pScanline = pScanline + ( nX << 2 ); + *pScanline++ = 0xFF; *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetRed(); @@ -194,7 +200,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline, l { BitmapColor aBitmapColor; - aBitmapColor.SetRed( *( pScanline = pScanline + ( nX << 2 ) + 1 )++ ); + pScanline = pScanline + ( nX << 2 ) + 1; + aBitmapColor.SetRed( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetBlue( *pScanline ); @@ -203,7 +210,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline, l void BitmapReadAccess::SetPixelForN32BitTcArgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { - *( pScanline = pScanline + ( nX << 2 ) )++ = 0xFF; + pScanline = pScanline + ( nX << 2 ); + *pScanline++ = 0xFF; *pScanline++ = rBitmapColor.GetRed(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetBlue(); @@ -213,7 +221,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgra(ConstScanline pScanline, l { BitmapColor aBitmapColor; - aBitmapColor.SetBlue( *( pScanline = pScanline + ( nX << 2 ) )++ ); + pScanline = pScanline + ( nX << 2 ); + aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); @@ -222,7 +231,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgra(ConstScanline pScanline, l void BitmapReadAccess::SetPixelForN32BitTcBgra(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { - *( pScanline = pScanline + ( nX << 2 ) )++ = rBitmapColor.GetBlue(); + pScanline = pScanline + ( nX << 2 ); + *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline++ = rBitmapColor.GetRed(); *pScanline = 0xFF; @@ -232,7 +242,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, l { BitmapColor aBitmapColor; - aBitmapColor.SetRed( *( pScanline = pScanline + ( nX << 2 ) )++ ); + pScanline = pScanline + ( nX << 2 ); + aBitmapColor.SetRed( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetBlue( *pScanline ); @@ -241,7 +252,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, l void BitmapReadAccess::SetPixelForN32BitTcRgba(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { - *( pScanline = pScanline + ( nX << 2 ) )++ = rBitmapColor.GetRed(); + pScanline = pScanline + ( nX << 2 ); + *pScanline++ = rBitmapColor.GetRed(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline++ = rBitmapColor.GetBlue(); *pScanline = 0xFF; |