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

Timestamp:

Oct 31, 1999, 10:38:20 PM (26 years ago)

Author:

achimha

Message:

Added DIB changes from Markus Montkowski to return initalized DIB structure + various bug fixes in DIB handling

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.5 1999-10-21 19:25:06 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.6 1999-10-31 21:38:15 achimha Exp $ */
 
 /*
@@ -12 +12 @@
 #define  INCL_GPI
 #define  INCL_WIN
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>  //Odin32 OS/2 api wrappers
 #include <stdlib.h>
 #include <string.h>
@@ -27 +27 @@
                 : bmpBits(NULL), pOS2bmp(NULL), next(NULL)
 {
- int bmpsize = pbmi->biWidth, os2bmpsize;
-
+  int  os2bmpsize;
+
+  bmpsize = pbmi->biWidth;
   /* @@@PH 98/06/07 -- high-color bitmaps don't have palette */
 
@@ -61 +62 @@
         bmpsize = (bmpsize + 3) & ~3;
    }
+
    bmpBits    = (char *)malloc(bmpsize*pbmi->biHeight);
 
@@ -85 +87 @@
    this->handle = handle;
 
-   if(section == NULL) {
-        section = this;
+   if(section == NULL)
+   {
+     dprintf(("section was NULL\n"));
+     section = this;
    }
    else
    {
      DIBSection *dsect = section;
+     dprintf(("Increment section starting at %08X\n",dsect));
 
      /* @@@PH 98/07/11 fix for dsect->next == NULL */
@@ -96 +101 @@
              (dsect->next != NULL) )
      {
-                dsect = dsect->next;
+       dprintf(("Increment section to %08X\n",dsect->next));
+       dsect = dsect->next;
      }
      dsect->next = this;
    }
+   dprintf(("Class created"));
 }
 //******************************************************************************
@@ -285 +292 @@
 //******************************************************************************
 //******************************************************************************
+int DIBSection::GetDIBSection(int iSize , DIBSECTION *pDIBSection){
+  if( (sizeof(DIBSECTION)==iSize) &&
+      (pDIBSection !=NULL))
+  {
+    // BITMAP struct
+    pDIBSection->dsBm.bmType       = 0;  // TODO: put the correct value here
+    pDIBSection->dsBm.bmWidth      = pOS2bmp->cx;
+    pDIBSection->dsBm.bmHeight     = pOS2bmp->cy;
+    pDIBSection->dsBm.bmWidthBytes = bmpsize;
+    pDIBSection->dsBm.bmPlanes     = pOS2bmp->cPlanes;
+    pDIBSection->dsBm.bmBitsPixel  = pOS2bmp->cBitCount;
+    pDIBSection->dsBm.bmBits       = bmpBits;
+        // BITMAPINFOHEADER     data
+        pDIBSection->dsBmih.biSize = sizeof(BITMAPINFOHEADER);
+    pDIBSection->dsBmih.biWidth       = pOS2bmp->cx;
+    pDIBSection->dsBmih.biHeight      = pOS2bmp->cy;
+    pDIBSection->dsBmih.biPlanes      = pOS2bmp->cPlanes;
+    pDIBSection->dsBmih.biBitCount    = pOS2bmp->cBitCount;
+    pDIBSection->dsBmih.biCompression = pOS2bmp->ulCompression;
+    pDIBSection->dsBmih.biSizeImage   = pOS2bmp->cbImage;
+    pDIBSection->dsBmih.biXPelsPerMeter = 0; // TODO: put the correct value here
+    pDIBSection->dsBmih.biYPelsPerMeter = 0;
+    pDIBSection->dsBmih.biClrUsed       = (1<< pOS2bmp->cBitCount);
+    pDIBSection->dsBmih.biClrImportant  = 0;
+
+    pDIBSection->dsBitfields[0] = 0; // TODO: put the correct value here
+    pDIBSection->dsBitfields[1] = 0;
+    pDIBSection->dsBitfields[2] = 0;
+
+        pDIBSection->dshSection = this->handle;
+        
+        pDIBSection->dsOffset = 0; // TODO: put the correct value here
+        
+        return 0; //ERROR_SUCCESS
+  }
+  return 87;    //ERROR_INVALID_PARAMETER
+
+}
+//******************************************************************************
+//******************************************************************************
 DIBSection *DIBSection::section = NULL;
+