summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2022-07-20 23:43:47 +0200
committerTomaž Vajngerl <quikee@gmail.com>2022-07-21 18:16:25 +0200
commita02d4f656add39658c30669f2652bf6536207098 (patch)
tree7ed5b2bed0d2e9902adee51bb8f0eaf62fc4b743
parentc7b6c9407ce109ab27257f4c1ec66b86b48622df (diff)
remove 4-bit bitmap bits that were still present in QuartzSalBitmap
Change-Id: I3a363f9b382e298422e3a4bd6b58504cbaba077e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137286 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/quartz/salbmp.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index f0f5fb9a5b8f..cdc405ad362c 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -224,7 +224,6 @@ bool QuartzSalBitmap::AllocateUserData()
switch( mnBits )
{
case 1: mnBytesPerRow = (mnWidth + 7) >> 3; break;
- case 4: mnBytesPerRow = (mnWidth + 1) >> 1; break;
case 8: mnBytesPerRow = mnWidth; break;
case 24: mnBytesPerRow = (mnWidth << 1) + mnWidth; break;
case 32: mnBytesPerRow = mnWidth << 2; break;
@@ -370,20 +369,17 @@ static const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
// since all other platforms do so, too.
static bool bDefPalInit = false;
static BitmapPalette aDefPalette256;
- static BitmapPalette aDefPalette16;
static BitmapPalette aDefPalette2;
if( ! bDefPalInit )
{
bDefPalInit = true;
aDefPalette256.SetEntryCount( 256 );
- aDefPalette16.SetEntryCount( 16 );
aDefPalette2.SetEntryCount( 2 );
// Standard colors
unsigned int i;
for( i = 0; i < 16; i++ )
{
- aDefPalette16[i] =
aDefPalette256[i] = BitmapColor( aImplSalSysPalEntryAry[i].mnRed,
aImplSalSysPalEntryAry[i].mnGreen,
aImplSalSysPalEntryAry[i].mnBlue );
@@ -414,7 +410,6 @@ static const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
switch( mnBits )
{
case 1: return aDefPalette2;
- case 4: return aDefPalette16;
case 8: return aDefPalette256;
default: break;
}