diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2020-12-18 17:27:59 +1100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-12-19 04:20:32 +0100 |
| commit | 0920491fef0f20cea19d31547589e66a0d0912d7 (patch) | |
| tree | 66c474197c97fc577ad777d4c9a259929fc1b7da /vcl | |
| parent | f0e1f861d537e95bafeb52e240d093e574aa2ee9 (diff) | |
vcl: refactor - new local function shiftColor()
Change-Id: Ie1ee4dd3741e69dffe655f8c9c4035b980d59375
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107952
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 293f1682e00c..5c27100ef50a 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -732,6 +732,13 @@ void Bitmap::AdaptBitCount(Bitmap& rNew) const } } +static void shiftColor(tools::Long* pColorArray, BitmapColor const& rColor) +{ + *pColorArray++ = static_cast<tools::Long>(rColor.GetBlue()) << 12; + *pColorArray++ = static_cast<tools::Long>(rColor.GetGreen()) << 12; + *pColorArray++ = static_cast<tools::Long>(rColor.GetRed()) << 12; +} + bool Bitmap::Dither() { const Size aSize( GetSizePixel() ); @@ -767,11 +774,7 @@ bool Bitmap::Dither() Scanline pScanlineRead = pReadAcc->GetScanline(0); for( tools::Long nZ = 0; nZ < nWidth; nZ++ ) { - aColor = pReadAcc->GetPaletteColor( pReadAcc->GetIndexFromData( pScanlineRead, nZ ) ); - - *pTmp++ = static_cast<tools::Long>(aColor.GetBlue()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetGreen()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetRed()) << 12; + shiftColor(pTmp, pReadAcc->GetPaletteColor(pReadAcc->GetIndexFromData(pScanlineRead, nZ))); } } else @@ -779,11 +782,7 @@ bool Bitmap::Dither() Scanline pScanlineRead = pReadAcc->GetScanline(0); for( tools::Long nZ = 0; nZ < nWidth; nZ++ ) { - aColor = pReadAcc->GetPixelFromData( pScanlineRead, nZ ); - - *pTmp++ = static_cast<tools::Long>(aColor.GetBlue()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetGreen()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetRed()) << 12; + shiftColor(pTmp, pReadAcc->GetPixelFromData(pScanlineRead, nZ)); } } @@ -803,11 +802,7 @@ bool Bitmap::Dither() Scanline pScanlineRead = pReadAcc->GetScanline(nY); for( tools::Long nZ = 0; nZ < nWidth; nZ++ ) { - aColor = pReadAcc->GetPaletteColor( pReadAcc->GetIndexFromData( pScanlineRead, nZ ) ); - - *pTmp++ = static_cast<tools::Long>(aColor.GetBlue()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetGreen()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetRed()) << 12; + shiftColor(pTmp, pReadAcc->GetPaletteColor(pReadAcc->GetIndexFromData(pScanlineRead, nZ))); } } else @@ -815,11 +810,7 @@ bool Bitmap::Dither() Scanline pScanlineRead = pReadAcc->GetScanline(nY); for( tools::Long nZ = 0; nZ < nWidth; nZ++ ) { - aColor = pReadAcc->GetPixelFromData( pScanlineRead, nZ ); - - *pTmp++ = static_cast<tools::Long>(aColor.GetBlue()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetGreen()) << 12; - *pTmp++ = static_cast<tools::Long>(aColor.GetRed()) << 12; + shiftColor(pTmp, pReadAcc->GetPixelFromData(pScanlineRead, nZ)); } } } |