[Libreoffice-commits] core.git: vcl/quartz

[Tomaž Vajngerl (via logerrit)]

 vcl/quartz/salbmp.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit a02d4f656add39658c30669f2652bf6536207098
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Jul 20 23:43:47 2022 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Jul 21 18:16:25 2022 +0200

    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 <qui...@gmail.com>

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;
     }