summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/bitmap/BitmapReadAccess.cxx54
-rw-r--r--vcl/source/bitmap/BitmapWriteAccess.cxx6
-rw-r--r--vcl/source/bitmap/bitmappaint.cxx46
-rw-r--r--vcl/source/bitmap/bmpfast.cxx14
-rw-r--r--vcl/source/bitmap/dibtools.cxx1
-rw-r--r--vcl/source/bitmap/salbmp.cxx8
-rw-r--r--vcl/source/gdi/salmisc.cxx24
-rw-r--r--vcl/source/helper/canvasbitmap.cxx14
8 files changed, 1 insertions, 166 deletions
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;
generated by cgit (git 2.34.1) at 2024-06-28 17:40:45 +0000