Changeset 5333 for trunk/src

Timestamp:

Mar 19, 2001, 8:27:53 PM (24 years ago)

Author:

sandervl

Message:

check y inversion during dib section resync

Location:

trunk/src/gdi32

Files:

• dibsect.cpp (modified) (6 diffs)
• dibsect.h (modified) (2 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.45 2001-01-05 23:25:30 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.46 2001-03-19 19:27:53 sandervl Exp $ */
 
 /*
@@ -600 +600 @@
         DIBSection *destdib = DIBSection::findHDC(hdcDest);
         if(destdib) {
-            destdib->sync(hps, nYdest, nDestHeight);
+            destdib->sync(hps, nYdest, nDestHeight, FALSE);
         }
 #ifdef INVERT
@@ -619 +619 @@
 }
 //******************************************************************************
-int WIN32API GetDIBits(HDC hdc, HBITMAP hBitmap, UINT uStartScan, UINT cScanLines,
-                       void *lpvBits, BITMAPINFO_W * lpbi, UINT uUsage);
-
-//******************************************************************************
-void DIBSection::sync(HDC hdc, DWORD nYdest, DWORD nDestHeight)
+//******************************************************************************
+void DIBSection::sync(HDC hdc, DWORD nYdest, DWORD nDestHeight, BOOL orgYInversion)
 {
  APIRET rc;
  char  *destBuf;
 
-  dprintf(("Sync destination dibsection %x (%x)", handle, hdc));
-
-#if 0
-  BITMAPINFO_W *tmphdr = (BITMAPINFO_W *)malloc(os2bmphdrsize + sizeof(BITMAPINFO_W));
-  tmphdr->bmiHeader.biSize = sizeof(BITMAPINFOHEADER_W);
-  GetDIBits(hdc, handle, nYdest, nDestHeight, NULL, tmphdr, 0);
-  destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
-  rc = GetDIBits(hdc, handle, nYdest, nDestHeight, destBuf, tmphdr, 0);
-#ifdef DEBUG_PALETTE
-  if(rc && tmphdr->bmiHeader.biBitCount <= 8) {
-    for(int i=0;i<(1<<tmphdr->bmiHeader.biBitCount);i++)
-    {
-        dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&tmphdr->bmiColors[i])) ));
-    }
-  }
-#endif
-
-#else
+  dprintf(("Sync destination dibsection %x (%x) (%d,%d) flip %d", handle, hdc, nYdest, nDestHeight, fFlip));
+
   BITMAPINFO2 *tmphdr = (BITMAPINFO2 *)malloc(os2bmphdrsize);
   memcpy(tmphdr, pOS2bmp, os2bmphdrsize);
+
+#ifdef INVERT
+  int oldyinversion = 0;
+  if(orgYInversion == TRUE) {
+      oldyinversion = GpiQueryYInversion(hdc);
+      dprintf(("Sync destination dibsection: hdc y inversion = %d", oldyinversion));
+      if(oldyinversion != 0) {
+          GpiEnableYInversion(hdc, 0);
+      }
+  }
+#endif
 
   if(fFlip & FLIP_VERT) {
@@ -666 +658 @@
         destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
         rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
-                          tmphdr);
+                                tmphdr);
+
 #ifdef DEBUG_PALETTE
         if(rc != GPI_ALTERROR && tmphdr->cBitCount <= 8) {
@@ -676 +669 @@
 #endif
   }
-#endif
+
 #if 0
   if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
@@ -693 +686 @@
     DebugInt3();
   }
+
+#ifdef INVERT
+  if(oldyinversion) GpiEnableYInversion(hdc, oldyinversion);
+#endif
+
 }
 //******************************************************************************

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.22 2000-11-09 18:16:56 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.23 2001-03-19 19:27:53 sandervl Exp $ */
 
 /*
@@ -97 +97 @@
                            int nSrcWidth, int nSrcHeight,
                            DWORD Rop);
-              void  sync(HDC hdc, DWORD nYdest, DWORD nDestHeight);
+              void  sync(HDC hdc, DWORD nYdest, DWORD nDestHeight, BOOL orgYInversion = TRUE);
               void  sync(DWORD xDst, DWORD yDst, DWORD widthDst, DWORD heightDst, PVOID bits);
                int  SetDIBColorTable(int startIdx, int cEntries, RGBQUAD *rgb);