Changeset 9764 for trunk/src

Timestamp:

Feb 6, 2003, 9:28:09 PM (23 years ago)

Author:

sandervl

Message:

CreateDIBSection: don't get palette from DC if bitmap bits provided

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (2 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.38 2003-01-04 18:18:05 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.39 2003-02-06 20:28:09 sandervl Exp $ */
 
 /*
@@ -238 +238 @@
         {
             PalSize = dsect->GetBitCount();
-            if(PalSize <= 8)
+
+            if(!ppvBits && PalSize <= 8)
             {
                 ULONG Pal[256], nrcolors;
                 LOGPALETTE tmpPal = { 0x300,1,{0,0,0,0}};
-                HPALETTE hpalCur, hpalTmp;
+                HPALETTE hpalCur;
 
                 // Now get the current Palette from the DC
-                hpalTmp = CreatePalette(&tmpPal);
-                hpalCur = SelectPalette(hdc, hpalTmp, FALSE);
+                hpalCur = GetCurrentObject(hdc, OBJ_PAL);
 
                 // and use it to set the DIBColorTable
                 nrcolors = GetPaletteEntries( hpalCur, 0, 1<<PalSize, (LPPALETTEENTRY)&Pal);
                 dsect->SetDIBColorTable(0, nrcolors, (LPPALETTEENTRY)&Pal);
-
-                // Restore the DC Palette
-                SelectPalette(hdc,hpalCur,FALSE);
-                DeleteObject(hpalTmp);
             }