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>

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;
 }