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>

14 files changed, 5 insertions, 200 deletions

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 7dfa5a89eb41..4524478078ac 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -81,21 +81,18 @@ static std::unique_ptr<BitmapBuffer> ImplCreateDIB(
         case 1:
             pDIB->mnFormat = ScanlineFormat::N1BitLsbPal;
             break;
-        case 4:
-            pDIB->mnFormat = ScanlineFormat::N4BitMsnPal;
-            break;
         case 8:
             pDIB->mnFormat = ScanlineFormat::N8BitPal;
             break;
         case 24:
             pDIB->mnFormat = SVP_24BIT_FORMAT;
             break;
-        default:
-            nBitCount = 32;
-            [[fallthrough]];
         case 32:
             pDIB->mnFormat = SVP_CAIRO_FORMAT;
             break;
+        default:
+            assert(false);
+            pDIB->mnFormat = SVP_CAIRO_FORMAT;
     }
 
     pDIB->mnFormat |= ScanlineFormat::TopDown;
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index bb7f762ee874..fd7932f879bd 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -236,10 +236,6 @@ BitmapBuffer* Qt5Bitmap::AcquireBuffer(BitmapAccessMode /*nMode*/)
             pBuffer->mnFormat = ScanlineFormat::N1BitMsbPal | ScanlineFormat::TopDown;
             pBuffer->maPalette = m_aPalette;
             break;
-        case 4:
-            pBuffer->mnFormat = ScanlineFormat::N4BitMsnPal | ScanlineFormat::TopDown;
-            pBuffer->maPalette = m_aPalette;
-            break;
         case 8:
             pBuffer->mnFormat = ScanlineFormat::N8BitPal | ScanlineFormat::TopDown;
             pBuffer->maPalette = m_aPalette;
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index f50c81c3b637..1b9a777616de 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -659,9 +659,6 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
         case 1:
             pBuffer->mnFormat = ScanlineFormat::N1BitMsbPal;
             break;
-        case 4:
-            pBuffer->mnFormat = ScanlineFormat::N4BitMsnPal;
-            break;
         case 8:
             pBuffer->mnFormat = ScanlineFormat::N8BitPal;
             break;
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 3b4ec7104af4..f9e17eed1b79 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -250,9 +250,6 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode nMode)
         case 1:
             buffer->mnFormat = ScanlineFormat::N1BitMsbPal;
             break;
-        case 4:
-            buffer->mnFormat = ScanlineFormat::N4BitMsnPal;
-            break;
         case 8:
             buffer->mnFormat = ScanlineFormat::N8BitPal;
             break;
diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx b/vcl/source/bitmap/BitmapReadAccess.cxx
index b0ad156ddf91..cf531189913c 100644
--- a/vcl/source/bitmap/BitmapReadAccess.cxx
+++ b/vcl/source/bitmap/BitmapReadAccess.cxx
@@ -64,10 +64,6 @@ FncGetPixel BitmapReadAccess::GetPixelFunction(ScanlineFormat nFormat)
             return GetPixelForN1BitMsbPal;
         case ScanlineFormat::N1BitLsbPal:
             return GetPixelForN1BitLsbPal;
-        case ScanlineFormat::N4BitMsnPal:
-            return GetPixelForN4BitMsnPal;
-        case ScanlineFormat::N4BitLsnPal:
-            return GetPixelForN4BitLsnPal;
         case ScanlineFormat::N8BitPal:
             return GetPixelForN8BitPal;
         case ScanlineFormat::N24BitTcBgr:
@@ -110,10 +106,6 @@ FncSetPixel BitmapReadAccess::SetPixelFunction(ScanlineFormat nFormat)
             return SetPixelForN1BitMsbPal;
         case ScanlineFormat::N1BitLsbPal:
             return SetPixelForN1BitLsbPal;
-        case ScanlineFormat::N4BitMsnPal:
-            return SetPixelForN4BitMsnPal;
-        case ScanlineFormat::N4BitLsnPal:
-            return SetPixelForN4BitLsnPal;
         case ScanlineFormat::N8BitPal:
             return SetPixelForN8BitPal;
         case ScanlineFormat::N24BitTcBgr:
@@ -292,52 +284,6 @@ void BitmapReadAccess::SetPixelForN1BitLsbPal(const Scanline pScanline, tools::L
         rByte &= ~(1 << (nX & 7));
 }
 
-BitmapColor BitmapReadAccess::GetPixelForN4BitMsnPal(ConstScanline pScanline, tools::Long nX,
-                                                     const ColorMask&)
-{
-    return BitmapColor((pScanline[nX >> 1] >> (nX & 1 ? 0 : 4)) & 0x0f);
-}
-
-void BitmapReadAccess::SetPixelForN4BitMsnPal(const Scanline pScanline, tools::Long nX,
-                                              const BitmapColor& rBitmapColor, const ColorMask&)
-{
-    sal_uInt8& rByte = pScanline[nX >> 1];
-
-    if (nX & 1)
-    {
-        rByte &= 0xf0;
-        rByte |= (rBitmapColor.GetIndex() & 0x0f);
-    }
-    else
-    {
-        rByte &= 0x0f;
-        rByte |= (rBitmapColor.GetIndex() << 4);
-    }
-}
-
-BitmapColor BitmapReadAccess::GetPixelForN4BitLsnPal(ConstScanline pScanline, tools::Long nX,
-                                                     const ColorMask&)
-{
-    return BitmapColor((pScanline[nX >> 1] >> (nX & 1 ? 4 : 0)) & 0x0f);
-}
-
-void BitmapReadAccess::SetPixelForN4BitLsnPal(const Scanline pScanline, tools::Long nX,
-                                              const BitmapColor& rBitmapColor, const ColorMask&)
-{
-    sal_uInt8& rByte = pScanline[nX >> 1];
-
-    if (nX & 1)
-    {
-        rByte &= 0x0f;
-        rByte |= (rBitmapColor.GetIndex() << 4);
-    }
-    else
-    {
-        rByte &= 0xf0;
-        rByte |= (rBitmapColor.GetIndex() & 0x0f);
-    }
-}
-
 BitmapColor BitmapReadAccess::GetPixelForN8BitPal(ConstScanline pScanline, tools::Long nX,
                                                   const ColorMask&)
 {
diff --git a/vcl/source/bitmap/BitmapWriteAccess.cxx b/vcl/source/bitmap/BitmapWriteAccess.cxx
index 8d6675ee7ba4..d30477b9f257 100644
--- a/vcl/source/bitmap/BitmapWriteAccess.cxx
+++ b/vcl/source/bitmap/BitmapWriteAccess.cxx
@@ -91,12 +91,6 @@ void BitmapWriteAccess::CopyScanline(tools::Long nY, ConstScanline aSrcScanline,
             case ScanlineFormat::N1BitLsbPal:
                 pFncGetPixel = GetPixelForN1BitLsbPal;
                 break;
-            case ScanlineFormat::N4BitMsnPal:
-                pFncGetPixel = GetPixelForN4BitMsnPal;
-                break;
-            case ScanlineFormat::N4BitLsnPal:
-                pFncGetPixel = GetPixelForN4BitLsnPal;
-                break;
             case ScanlineFormat::N8BitPal:
                 pFncGetPixel = GetPixelForN8BitPal;
                 break;
diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx
index 6acf00fe0cac..201f05e74a79 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -478,51 +478,7 @@ Bitmap Bitmap::CreateMask(const Color& rTransColor, sal_uInt8 nTol) const
             const BitmapColor aTest(pReadAcc->GetBestMatchingColor(rTransColor));
 
             if (pWriteAcc->GetBitCount() == 1
-                && (pReadAcc->GetScanlineFormat() == ScanlineFormat::N4BitMsnPal
-                    || pReadAcc->GetScanlineFormat() == ScanlineFormat::N4BitLsnPal))
-            {
-                // optimized for 4Bit-MSN/LSN source palette
-                const sal_uInt8 cTest = aTest.GetIndex();
-                const tools::Long nShiftInit
-                    = ((pReadAcc->GetScanlineFormat() == ScanlineFormat::N4BitMsnPal) ? 4 : 0);
-
-                if (pWriteAcc->GetScanlineFormat() == ScanlineFormat::N1BitMsbPal
-                    && aWhite.GetIndex() == 1)
-                {
-                    // optimized for 1Bit-MSB destination palette
-                    for (tools::Long nY = 0; nY < nHeight; ++nY)
-                    {
-                        Scanline pSrc = pReadAcc->GetScanline(nY);
-                        Scanline pDst = pWriteAcc->GetScanline(nY);
-                        for (tools::Long nX = 0, nShift = nShiftInit; nX < nWidth;
-                             nX++, nShift ^= 4)
-                        {
-                            if (cTest == ((pSrc[nX >> 1] >> nShift) & 0x0f))
-                                pDst[nX >> 3] |= 1 << (7 - (nX & 7));
-                            else
-                                pDst[nX >> 3] &= ~(1 << (7 - (nX & 7)));
-                        }
-                    }
-                }
-                else
-                {
-                    for (tools::Long nY = 0; nY < nHeight; ++nY)
-                    {
-                        Scanline pSrc = pReadAcc->GetScanline(nY);
-                        Scanline pDst = pWriteAcc->GetScanline(nY);
-                        for (tools::Long nX = 0, nShift = nShiftInit; nX < nWidth;
-                             nX++, nShift ^= 4)
-                        {
-                            if (cTest == ((pSrc[nX >> 1] >> nShift) & 0x0f))
-                                pWriteAcc->SetPixelOnData(pDst, nX, aWhite);
-                            else
-                                pWriteAcc->SetPixelOnData(pDst, nX, aBlack);
-                        }
-                    }
-                }
-            }
-            else if (pWriteAcc->GetBitCount() == 1
-                     && pReadAcc->GetScanlineFormat() == ScanlineFormat::N8BitPal)
+                && pReadAcc->GetScanlineFormat() == ScanlineFormat::N8BitPal)
             {
                 // optimized for 8Bit source palette
                 const sal_uInt8 cTest = aTest.GetIndex();
diff --git a/vcl/source/bitmap/bmpfast.cxx b/vcl/source/bitmap/bmpfast.cxx
index 1d8515762320..5ee7b22d9ddf 100644
--- a/vcl/source/bitmap/bmpfast.cxx
+++ b/vcl/source/bitmap/bmpfast.cxx
@@ -335,8 +335,6 @@ static bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc
     {
         case ScanlineFormat::N1BitMsbPal:
         case ScanlineFormat::N1BitLsbPal:
-        case ScanlineFormat::N4BitMsnPal:
-        case ScanlineFormat::N4BitLsnPal:
         case ScanlineFormat::N8BitPal:
             break;
 
@@ -422,8 +420,6 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc,
     {
         case ScanlineFormat::N1BitMsbPal:
         case ScanlineFormat::N1BitLsbPal:
-        case ScanlineFormat::N4BitMsnPal:
-        case ScanlineFormat::N4BitLsnPal:
             break;
 
         case ScanlineFormat::N32BitTcMask:
@@ -642,8 +638,6 @@ static bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, c
     {
         case ScanlineFormat::N1BitMsbPal:
         case ScanlineFormat::N1BitLsbPal:
-        case ScanlineFormat::N4BitMsnPal:
-        case ScanlineFormat::N4BitLsnPal:
         case ScanlineFormat::N8BitPal:
             break;
 
@@ -735,8 +729,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess const & rDstWA,
     {
         case ScanlineFormat::N1BitMsbPal:
         case ScanlineFormat::N1BitLsbPal:
-        case ScanlineFormat::N4BitMsnPal:
-        case ScanlineFormat::N4BitLsnPal:
             break;
 
         case ScanlineFormat::N32BitTcMask:
@@ -787,12 +779,6 @@ bool ImplFastEraseBitmap( BitmapBuffer& rDst, const BitmapColor& rColor )
             nFillByte = rColor.GetIndex();
             nFillByte = static_cast<sal_uInt8>( -(nFillByte & 1) ); // 0x00 or 0xFF
             break;
-        case ScanlineFormat::N4BitMsnPal:
-        case ScanlineFormat::N4BitLsnPal:
-            nFillByte = rColor.GetIndex();
-            nFillByte &= 0x0F;
-            nFillByte |= (nFillByte << 4);
-            break;
         case ScanlineFormat::N8BitPal:
             nFillByte = rColor.GetIndex();
             break;
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index a4cd7bcd8404..94341bad56f6 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -1291,7 +1291,6 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess const & rAcc, BitmapRead
         switch(rAcc.GetScanlineFormat())
         {
             case ScanlineFormat::N1BitMsbPal:
-            case ScanlineFormat::N4BitMsnPal:
             case ScanlineFormat::N8BitPal:
             case ScanlineFormat::N24BitTcBgr:
             {
diff --git a/vcl/source/bitmap/salbmp.cxx b/vcl/source/bitmap/salbmp.cxx
index 7159ac3d5a6b..a1fc7de7a60a 100644
--- a/vcl/source/bitmap/salbmp.cxx
+++ b/vcl/source/bitmap/salbmp.cxx
@@ -63,14 +63,6 @@ void SalBitmap::updateChecksum() const
                     extraBitsMask = mask1Bit[ extraBitsCount ];
                     break;
                 }
-                case ScanlineFormat::N4BitMsnPal:
-                    assert(extraBitsCount == 4);
-                    extraBitsMask = 0xf0;
-                    break;
-                case ScanlineFormat::N4BitLsnPal:
-                    assert(extraBitsCount == 4);
-                    extraBitsMask = 0x0f;
-                    break;
                 default:
                     break;
             }
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");
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 97a1293bfad7..67d01fb64336 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -152,20 +152,6 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
             m_aLayout.IsMsbFirst = false;
             break;
 
-        case ScanlineFormat::N4BitMsnPal:
-            m_bPalette           = true;
-            m_nBitsPerInputPixel = 4;
-            m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-            m_aLayout.IsMsbFirst = true;
-            break;
-
-        case ScanlineFormat::N4BitLsnPal:
-            m_bPalette           = true;
-            m_nBitsPerInputPixel = 4;
-            m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-            m_aLayout.IsMsbFirst = false;
-            break;
-
         case ScanlineFormat::N8BitPal:
             m_bPalette           = true;
             m_nBitsPerInputPixel = 8;
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 4c25000ec13c..4579fcfe7bdf 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -151,9 +151,9 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
     switch( nBitCount )
     {
         case 1: pDIB->mnFormat |= ScanlineFormat::N1BitMsbPal; break;
-        case 4: pDIB->mnFormat |= ScanlineFormat::N4BitMsnPal; break;
         case 8: pDIB->mnFormat |= ScanlineFormat::N8BitPal; break;
         case 24: pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr; break;
+        case 4: assert(false); break;
         default:
             SAL_WARN("vcl.gdi", "32-bit images not supported, converting to 24-bit");
             nBitCount = 24;
@@ -254,15 +254,6 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
                 }
                 break;
 
-                case 4:
-                {
-                    aSrcBuf.mnFormat |= ( LSBFirst == pImage->bitmap_bit_order
-                                            ? ScanlineFormat::N4BitLsnPal
-                                            : ScanlineFormat::N4BitMsnPal
-                                        );
-                }
-                break;
-
                 case 8:
                 {
                     aSrcBuf.mnFormat |= ScanlineFormat::N8BitPal;
@@ -400,13 +391,6 @@ XImage* X11SalBitmap::ImplCreateXImage(
                                     );
                 break;
 
-                case 4:
-                    nDstFormat |=   ( LSBFirst == pImage->bitmap_bit_order
-                                        ? ScanlineFormat::N4BitLsnPal
-                                        : ScanlineFormat::N4BitMsnPal
-                                    );
-                break;
-
                 case 8:
                     nDstFormat |= ScanlineFormat::N8BitPal;
                 break;
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index e807a2faef61..67ce7b381536 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -829,7 +829,6 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
             pBuffer.reset(new BitmapBuffer);
 
             pBuffer->mnFormat = pBIH->biBitCount == 1 ? ScanlineFormat::N1BitMsbPal :
-                                pBIH->biBitCount == 4 ? ScanlineFormat::N4BitMsnPal :
                                 pBIH->biBitCount == 8 ? ScanlineFormat::N8BitPal :
                                 pBIH->biBitCount == 24 ? ScanlineFormat::N24BitTcBgr :
                                 pBIH->biBitCount == 32 ? ScanlineFormat::N32BitTcMask :