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 /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 'vcl')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/outdev/transparent.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index e33cfa60bd70..24b1c5403057 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -867,11 +867,11 @@ public: nAlpha = (nAlphaLine1 + nMapFY * ((nAlphaLine2 >> 7) - (nAlphaLine1 >> 7))) >> 7; - *pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor1, nAlpha); + *pDestScanline = ColorChannelMerge(*pDestScanline, nColor1, nAlpha); pDestScanline++; - *pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor2, nAlpha); + *pDestScanline = ColorChannelMerge(*pDestScanline, nColor2, nAlpha); pDestScanline++; - *pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor3, nAlpha); + *pDestScanline = ColorChannelMerge(*pDestScanline, nColor3, nAlpha); pDestScanline++; pDestScanline++; } diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 31d4c946bb36..764389dcbe78 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -558,9 +558,9 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, } if( ( *pRScan & cBit ) == cBlack ) { - pWScan[ 0 ] = COLOR_CHANNEL_MERGE( pWScan[ 0 ], nB, cTrans ); - pWScan[ 1 ] = COLOR_CHANNEL_MERGE( pWScan[ 1 ], nG, cTrans ); - pWScan[ 2 ] = COLOR_CHANNEL_MERGE( pWScan[ 2 ], nR, cTrans ); + pWScan[ 0 ] = ColorChannelMerge( pWScan[ 0 ], nB, cTrans ); + pWScan[ 1 ] = ColorChannelMerge( pWScan[ 1 ], nG, cTrans ); + pWScan[ 2 ] = ColorChannelMerge( pWScan[ 2 ], nR, cTrans ); } } } |