Changeset 1966 for trunk/src/gdi32/dibsect.cpp

Timestamp:

Dec 4, 1999, 2:53:14 PM (26 years ago)

Author:

hugh

Message:

Implemented DEFAULT_GUI_FONT for GetStockObject
DIBSecttion now get the DC Palette on creation and updated if DC pal changes.

File:

• trunk/src/gdi32/dibsect.cpp (modified) (11 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.10 1999-12-02 13:26:04 achimha Exp $ */
+/* $Id: dibsect.cpp,v 1.11 1999-12-04 13:53:12 hugh Exp $ */
 
 /*
@@ -101 +101 @@
    dprintf(("pOS2bmp->ulCompression %d\n", pOS2bmp->ulCompression));
    dprintf(("pOS2bmp->cbImage       %d\n", pOS2bmp->cbImage));
+   dprintf(("Bits at 0x%08X\n",bmpBits));
 
    this->handle = handle;
@@ -123 +124 @@
      dsect->next = this;
    }
+
    dprintf(("Class created"));
 }
@@ -134 +136 @@
         free(pOS2bmp);
 
-   if(section == this) {
-        section = this->next;
-   }
-   else {
-        DIBSection *dsect = section;
-
-        while(dsect->next != this) {
-                dsect = dsect->next;
-        }
-        dsect->next = this->next;
+   if(section == this)
+   {
+     section = this->next;
+   }
+   else
+   {
+     DIBSection *dsect = section;
+
+     while(dsect->next != this)
+     {
+       dsect = dsect->next;
+     }
+     dsect->next = this->next;
    }
 }
@@ -161 +166 @@
   switch(pbmi->biBitCount)
   {
-        case 1:
-                bmpsize /= 8;
-                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
-                os2bmpsize += palsize;
-                break;
-        case 4:
-                bmpsize /= 2;
-                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
-                os2bmpsize += palsize;
-                break;
-        case 8:
-                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
-                os2bmpsize += palsize;
-                break;
-        case 16:
-                bmpsize *= 2;
-                break;
-        case 24:
-                bmpsize *= 3;
-                break;
-        case 32:
-                bmpsize *= 4;
-                break;
-   }
-   if(bmpsize & 3) {
-        bmpsize = (bmpsize + 3) & ~3;
+    case 1:
+      bmpsize /= 8;
+      palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+      os2bmpsize += palsize;
+      break;
+    case 4:
+      bmpsize /= 2;
+      palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+      os2bmpsize += palsize;
+      break;
+    case 8:
+      palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+      os2bmpsize += palsize;
+      break;
+    case 16:
+      bmpsize *= 2;
+      break;
+    case 24:
+      bmpsize *= 3;
+      break;
+    case 32:
+      bmpsize *= 4;
+      break;
+   }
+
+   if(bmpsize & 3)
+   {
+     bmpsize = (bmpsize + 3) & ~3;
    }
 
@@ -216 +223 @@
  int i;
 
-  if(startIdx + cEntries > (1 << pOS2bmp->cBitCount)) {
-        dprintf(("DIBSection::SetDIBColorTable, invalid nr of entries %d %d\n", startIdx, cEntries));
-        return(0);
-  }
+  if(startIdx + cEntries > (1 << pOS2bmp->cBitCount))
+  {
+    dprintf(("DIBSection::SetDIBColorTable, invalid nr of entries %d %d\n", startIdx, cEntries));
+    return(0);
+  }
+
   memcpy(&pOS2bmp->argbColor[startIdx], rgb, cEntries*sizeof(RGB2));
-  for(i=startIdx;i<cEntries;i++) {
-        pOS2bmp->argbColor[i].fcOptions = 0;
-  }
+
+  for(i=startIdx;i<cEntries;i++)
+  {
+    pOS2bmp->argbColor[i].fcOptions = 0;
+    dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&pOS2bmp->argbColor[i])) ));
+  }
+
   return(cEntries);
 }
@@ -306 +319 @@
   this->hdc  = hdc;
   hwndParent = WinWindowFromDC(hdc);
+  dprintf(("SelectDIBObject(0x%08X) hwndParent = 0x%08X\n",hdc, hwndParent));
 }
 //******************************************************************************
@@ -313 +327 @@
  DIBSection *dsect = section;
 
-  while(dsect) {
-        if(dsect->handle == handle) {
-                return(dsect);
-        }
-        dsect = dsect->next;
+  while(dsect)
+  {
+    if(dsect->handle == handle)
+    {
+      return(dsect);
+    }
+    dsect = dsect->next;
   }
   return(NULL);
@@ -328 +344 @@
  DIBSection *dsect = section;
 
-  while(dsect) {
-        if(dsect->hdc == hdc) {
-                return(dsect);
-        }
-        dsect = dsect->next;
+  while(dsect)
+  {
+    if(dsect->hdc == hdc)
+    {
+      return(dsect);
+    }
+    dsect = dsect->next;
   }
   return(NULL);
@@ -343 +361 @@
 
   if(dsect)
-        delete dsect;
-
-}
-//******************************************************************************
-//******************************************************************************
-int DIBSection::GetDIBSection(int iSize , DIBSECTION *pDIBSection){
+    delete dsect;
+
+}
+//******************************************************************************
+//******************************************************************************
+int DIBSection::GetDIBSection(int iSize , DIBSECTION *pDIBSection)
+{
   if( (sizeof(DIBSECTION)==iSize) &&
       (pDIBSection !=NULL))
@@ -388 +407 @@
 //******************************************************************************
 //******************************************************************************
+char  DIBSection::GetBitCount()
+{
+   if(NULL==pOS2bmp)
+     return 0;
+   else
+     return pOS2bmp->cBitCount;
+}
+//******************************************************************************
+//******************************************************************************
 DIBSection *DIBSection::section = NULL;
-