diff options
author | Noel <noel.grandin@collabora.co.uk> | 2021-03-31 14:32:02 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-03-31 17:38:04 +0200 |
commit | 740757d17452e3b2f9bfa7897c05dedeca639e34 (patch) | |
tree | 653ebc09c09e53fd9d94863bc057d43a1a163c5b /vcl/source/gdi | |
parent | b5558e4ac6c2f134f07ea87a143694b17adb4482 (diff) |
remove internal 4bit scanline formats
since we have already removed the 4-bit internal bitmap formats.
Change-Id: Ie481aaa8e25642a47e30beb6f37e2d3beda304e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113412
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r-- | vcl/source/gdi/salmisc.cxx | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 593b2b706888..037ea8073bae 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -114,26 +114,6 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rD DOUBLE_SCANLINES(); } } - else if( RemoveScanline( rSrcBuffer.mnFormat ) == ScanlineFormat::N4BitMsnPal ) - { - tools::Long nMapX; - - for (tools::Long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY) - { - tools::Long nMapY = pMapY[nActY]; - Scanline pSrcScan(pSrcScanMap[nMapY]), pDstScan(pDstScanMap[nActY]); - - for (tools::Long nX = 0; nX < rDstBuffer.mnWidth;) - { - nMapX = pMapX[ nX ]; - pFncSetPixel( pDstScan, nX++, - pColBuf[ ( pSrcScan[ nMapX >> 1 ] >> ( nMapX & 1 ? 0 : 4 ) ) & 0x0f ], - rDstMask ); - } - - DOUBLE_SCANLINES(); - } - } else if( RemoveScanline( rSrcBuffer.mnFormat ) == ScanlineFormat::N8BitPal ) { for (tools::Long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY) @@ -271,8 +251,6 @@ std::unique_ptr<BitmapBuffer> StretchAndConvert( { IMPL_CASE_SET_FORMAT( N1BitMsbPal, 1 ); IMPL_CASE_SET_FORMAT( N1BitLsbPal, 1 ); - IMPL_CASE_SET_FORMAT( N4BitMsnPal, 1 ); - IMPL_CASE_SET_FORMAT( N4BitLsnPal, 4 ); IMPL_CASE_SET_FORMAT( N8BitPal, 8 ); IMPL_CASE_SET_FORMAT( N24BitTcBgr, 24 ); IMPL_CASE_SET_FORMAT( N24BitTcRgb, 24 ); @@ -325,8 +303,6 @@ std::unique_ptr<BitmapBuffer> StretchAndConvert( // do we need a destination palette or color mask? if( ( nDstScanlineFormat == ScanlineFormat::N1BitMsbPal ) || ( nDstScanlineFormat == ScanlineFormat::N1BitLsbPal ) || - ( nDstScanlineFormat == ScanlineFormat::N4BitMsnPal ) || - ( nDstScanlineFormat == ScanlineFormat::N4BitLsnPal ) || ( nDstScanlineFormat == ScanlineFormat::N8BitPal ) ) { assert(pDstPal && "destination buffer requires palette"); |