diff options
Diffstat (limited to 'vcl/unx/generic/gdi/salbmp.cxx')
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 84 |
1 files changed, 6 insertions, 78 deletions
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 ) |