remove internal use of 16-bit packed formats

none of our supported hardware uses these any more

Change-Id: Ic95d6df619a05df0bec1f5870596cb2bb3bcc6cb
Reviewed-on: https://gerrit.libreoffice.org/79476
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 7 insertions, 102 deletions

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index a9047abd49ed..a4a83b820a51 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2630,24 +2630,6 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
                 aVI.green_mask      = 0x00FF00;
                 aVI.blue_mask       = 0x0000FF;
             }
-            else if( 16 == nDepth ) // 565
-            {
-                aVI.red_mask        = 0x00F800;
-                aVI.green_mask      = 0x0007E0;
-                aVI.blue_mask       = 0x00001F;
-            }
-            else if( 15 == nDepth ) // 555
-            {
-                aVI.red_mask        = 0x007C00;
-                aVI.green_mask      = 0x0003E0;
-                aVI.blue_mask       = 0x00001F;
-            }
-            else if( 12 == nDepth ) // 444
-            {
-                aVI.red_mask        = 0x000F00;
-                aVI.green_mask      = 0x0000F0;
-                aVI.blue_mask       = 0x00000F;
-            }
             else if( 8 == nDepth ) // 332
             {
                 aVI.red_mask        = 0x0000E0;
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 4881e27e5b29..0a96048ae21f 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -120,7 +120,6 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
            nBitCount ==  1
         || nBitCount ==  4
         || nBitCount ==  8
-        || nBitCount == 16
         || nBitCount == 24
         , "Unsupported BitCount!"
     );
@@ -148,37 +147,10 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
         case 1: pDIB->mnFormat |= ScanlineFormat::N1BitMsbPal; break;
         case 4: pDIB->mnFormat |= ScanlineFormat::N4BitMsnPal; break;
         case 8: pDIB->mnFormat |= ScanlineFormat::N8BitPal; break;
-#ifdef OSL_BIGENDIAN
-        case 16:
-        {
-            pDIB->mnFormat|= ScanlineFormat::N16BitTcMsbMask;
-            ColorMaskElement aRedMask(0xf800);
-            aRedMask.CalcMaskShift();
-            ColorMaskElement aGreenMask(0x07e0);
-            aGreenMask.CalcMaskShift();
-            ColorMaskElement aBlueMask(0x001f);
-            aBlueMask.CalcMaskShift();
-            pDIB->maColorMask = ColorMask(aRedMask, aGreenMask, aBlueMask);
-            break;
-        }
-#else
-        case 16:
-        {
-            pDIB->mnFormat|= ScanlineFormat::N16BitTcLsbMask;
-            ColorMaskElement aRedMask(0xf800);
-            aRedMask.CalcMaskShift();
-            ColorMaskElement aGreenMask(0x07e0);
-            aGreenMask.CalcMaskShift();
-            ColorMaskElement aBlueMask(0x001f);
-            aBlueMask.CalcMaskShift();
-            pDIB->maColorMask = ColorMask(aRedMask, aGreenMask, aBlueMask);
-            break;
-        }
-#endif
+        case 24: pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr; break;
         default:
+            assert(false);
             nBitCount = 24;
-            [[fallthrough]];
-        case 24:
             pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr;
         break;
     }
@@ -291,27 +263,6 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
                 }
                 break;
 
-                case 16:
-                {
-                    ColorMaskElement aRedMask(pImage->red_mask);
-                    aRedMask.CalcMaskShift();
-                    ColorMaskElement aGreenMask(pImage->green_mask);
-                    aGreenMask.CalcMaskShift();
-                    ColorMaskElement aBlueMask(pImage->blue_mask);
-                    aBlueMask.CalcMaskShift();
-                    aSrcBuf.maColorMask = ColorMask(aRedMask, aGreenMask, aBlueMask);
-
-                    if( LSBFirst == pImage->byte_order )
-                    {
-                        aSrcBuf.mnFormat |= ScanlineFormat::N16BitTcLsbMask;
-                    }
-                    else
-                    {
-                        aSrcBuf.mnFormat |= ScanlineFormat::N16BitTcMsbMask;
-                    }
-                }
-                break;
-
                 case 24:
                 {
                     if( ( LSBFirst == pImage->byte_order ) && ( pImage->red_mask == 0xFF ) )
@@ -335,6 +286,8 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
                                             );
                 }
                 break;
+
+                default: assert(false);
             }
 
             BitmapPalette& rPal = aSrcBuf.maPalette;
@@ -452,33 +405,6 @@ XImage* X11SalBitmap::ImplCreateXImage(
                     nDstFormat |= ScanlineFormat::N8BitPal;
                 break;
 
-                case 16:
-                {
-                    #ifdef OSL_BIGENDIAN
-
-                    if( MSBFirst == pImage->byte_order )
-                        nDstFormat |= ScanlineFormat::N16BitTcMsbMask;
-                    else
-                        nDstFormat |= ScanlineFormat::N16BitTcLsbMask;
-
-                    #else /* OSL_LITENDIAN */
-
-                    nDstFormat |= ScanlineFormat::N16BitTcLsbMask;
-                    if( MSBFirst == pImage->byte_order )
-                        pImage->byte_order = LSBFirst;
-
-                    #endif
-
-                    ColorMaskElement aRedMask(pImage->red_mask);
-                    aRedMask.CalcMaskShift();
-                    ColorMaskElement aGreenMask(pImage->green_mask);
-                    aGreenMask.CalcMaskShift();
-                    ColorMaskElement aBlueMask(pImage->blue_mask);
-                    aBlueMask.CalcMaskShift();
-                    xMask.reset(new ColorMask(aRedMask, aGreenMask, aBlueMask));
-                }
-                break;
-
                 case 24:
                 {
                     if( ( LSBFirst == pImage->byte_order ) && ( pImage->red_mask == 0xFF ) )
@@ -502,6 +428,8 @@ XImage* X11SalBitmap::ImplCreateXImage(
                                         );
                 }
                 break;
+
+                default: assert(false);
             }
 
             if( pImage->depth == 1 )
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 942b7ea9e522..61d924caf999 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -118,10 +118,6 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer)
             mpFncGetPixel = BitmapReadAccess::GetPixelForN8BitPal;      break;
         case ScanlineFormat::N8BitTcMask:
             mpFncGetPixel = BitmapReadAccess::GetPixelForN8BitTcMask;  break;
-        case ScanlineFormat::N16BitTcMsbMask:
-            mpFncGetPixel = BitmapReadAccess::GetPixelForN16BitTcMsbMask; break;
-        case ScanlineFormat::N16BitTcLsbMask:
-            mpFncGetPixel = BitmapReadAccess::GetPixelForN16BitTcLsbMask; break;
         case ScanlineFormat::N24BitTcBgr:
             mpFncGetPixel = BitmapReadAccess::GetPixelForN24BitTcBgr;  break;
         case ScanlineFormat::N24BitTcRgb:
@@ -175,7 +171,6 @@ SalPrinterBmp::GetDepth () const
             nDepth = 8;
             break;
 
-        case 16:
         case 24:
         case 32:
             nDepth = 24;
@@ -183,7 +178,7 @@ SalPrinterBmp::GetDepth () const
 
         default:
             nDepth = 1;
-            OSL_FAIL("Error: unsupported bitmap depth in SalPrinterBmp::GetDepth()");
+            assert(false && "Error: unsupported bitmap depth in SalPrinterBmp::GetDepth()");
             break;
     }