diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-08 14:34:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-09 07:18:54 +0100 |
| commit | c0847dc7b7a311d19b73d4943d1b0466b10cde4f (patch) | |
| tree | b4cb48dd32dbbb709002f2bf387d75e0a03264a4 /include/vcl | |
| parent | 46ab8c952aa535bd1c624aa95c8900460aa474bf (diff) | |
convert COLOR_CHANNEL_MERGE to constexpr function
Change-Id: Ie46e0a47b433517b0bae0deabb447ff5c1000f22
Reviewed-on: https://gerrit.libreoffice.org/47595
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/salbtype.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index ed38c9a41b8a..e9a3bdf599b7 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -480,9 +480,9 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn { assert( !mbIndex && "Pixel represents index into colortable" ); assert( !rBitmapColor.mbIndex && "Pixel represents index into colortable" ); - mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, rBitmapColor.mcBlueOrIndex, cTransparency ); - mcGreen = COLOR_CHANNEL_MERGE( mcGreen, rBitmapColor.mcGreen, cTransparency ); - mcRed = COLOR_CHANNEL_MERGE( mcRed, rBitmapColor.mcRed, cTransparency ); + mcBlueOrIndex = ColorChannelMerge( mcBlueOrIndex, rBitmapColor.mcBlueOrIndex, cTransparency ); + mcGreen = ColorChannelMerge( mcGreen, rBitmapColor.mcGreen, cTransparency ); + mcRed = ColorChannelMerge( mcRed, rBitmapColor.mcRed, cTransparency ); return *this; } |