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

Timestamp:

Nov 9, 2000, 7:16:57 PM (25 years ago)

Author:

sandervl

Message:

DeleteDC + CreateDIBSection fixes

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.41 2000-10-07 11:39:16 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.42 2000-11-09 18:16:56 sandervl Exp $ */
 
 /*
@@ -395 +395 @@
 //******************************************************************************
 //******************************************************************************
+int DIBSection::SetDIBColorTable(int startIdx, int cEntries, PALETTEENTRY *palentry)
+{
+ int i;
+
+  if(startIdx + cEntries > (1 << pOS2bmp->cBitCount))
+  {
+    dprintf(("DIBSection::SetDIBColorTable, invalid nr of entries %d %d\n", startIdx, cEntries));
+    return(0);
+  }
+
+  for(i=startIdx;i<cEntries;i++)
+  {
+    pOS2bmp->argbColor[i].fcOptions = 0;
+    pOS2bmp->argbColor[i].bBlue  = palentry[i].peBlue;
+    pOS2bmp->argbColor[i].bGreen = palentry[i].peGreen;
+    pOS2bmp->argbColor[i].bRed   = palentry[i].peRed;
+  }
+
+  return(cEntries);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL DIBSection::BitBlt(HDC hdcDest, int nXdest, int nYdest, int nDestWidth,
                         int nDestHeight, int nXsrc, int nYsrc,
@@ -428 +450 @@
 
         if(fFrameWindowDC) {
-            GetWindowRect(hwndDest, &rect);
+              GetWindowRect(hwndDest, &rect);
         }
         else  GetClientRect(hwndDest, &rect);
@@ -488 +510 @@
   }
 */
+#ifdef INVERT
   oldyinversion = GpiQueryYInversion(hps);
   if(oldyinversion != 0) {
@@ -493 +516 @@
         fRestoryYInversion = TRUE;
   }
+#endif
+
+#ifdef DEBUG
+  RECTL rcltemp;
+  GreGetDCOrigin(hps, (PPOINTL)&rcltemp);
+  dprintf(("origin (%d,%d) yinv %d", rcltemp.xLeft, rcltemp.yBottom, oldyinversion));
+#endif
 
   if(fFlip & FLIP_HOR)
@@ -572 +602 @@
             destdib->sync(hps, nYdest, nDestHeight);
         }
+#ifdef INVERT
         //restore old y inversion height
         if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
+#endif
             SetLastError(ERROR_SUCCESS_W);
 
         return(TRUE);
   }
+#ifdef INVERT
   if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
+#endif
 
   dprintf(("DIBSection::BitBlt %X (%d,%d) (%d,%d) to (%d,%d) (%d,%d) returned %d\n", hps, point[0].x, point[0].y, point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y, rc));