Changeset 262 for trunk/src/gui/image

Timestamp:

Oct 28, 2009, 9:48:50 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QPixmap: A number of fixes to the HBITMAP/HPOINTER conversion code.

File:

• trunk/src/gui/image/qpixmap_pm.cpp (modified) (5 diffs)

trunk/src/gui/image/qpixmap_pm.cpp

@@ -46 +46 @@
 
 #include "qicon.h"
+
 
 #include "qt_os2.h"
@@ -121 +122 @@
     int h = d->image.height();
 
-    HPS hps = qt_alloc_mem_ps(w, h);
+    HPS hps = qt_alloc_mem_ps(w, h);
     if (hps == NULLHANDLE)
         return NULLHANDLE;
@@ -149 +150 @@
         // since the former will dither while the latter will convert any
         // non-zero alpha value to an opaque pixel
-        QImage mask = image.createAlphaMask().mirrored();
-
-        // create the mask bitmap (AND and XOR stripes)
+#if 1
+        QImage mask = image.createAlphaMask().convertToFormat(QImage::Format_Mono);
+
+        // note: for some strange reason, createAlphaMask() (as opposed to
+        // mask().toImage()) returns an image already flipped top to bottom,
+        // so take it into account
+
+        // create the AND mask
+        mask.invertPixels();
+        // add the XOR mask (and leave it zeroed)
+        mask = mask.copy(0, -h, w, h * 2);
+
+#else
+        QImage mask = this->mask().toImage().convertToFormat(QImage::Format_Mono);
+
+        // create the AND mask
+        mask.invertPixels();
+        // add the XOR mask (and leave it zeroed)
+        mask = mask.copy(0, 0, w, h * 2);
+        // flip the bitmap top to bottom for PM
+        mask = mask.mirrored(false, true);
+#endif
+
+        // create the mask bitmap
         bmh.cbFix = sizeof(BITMAPINFOHEADER2);
         bmh.cx = w;
-        bmh.cy = h;
+        bmh.cy = h;
         bmh.cPlanes = 1;
         bmh.cBitCount = 1;
@@ -160 +182 @@
         pal[0] = 0;
         pal[1] = 0x00FFFFFF;
-        hbmMask = GpiCreateBitmap(hps, &bmh, 0, NULL, NULL);
-
-        // create AND mask (XOR mask is left zeroed -- it's okay)
-        GpiSetBitmap(hps, hbmMask);
+        hbmMask = GpiCreateBitmap(hps, &bmh, CBM_INIT,
+                                  (PBYTE)(const uchar *)mask.bits(),
+                                  (PBITMAPINFO2)&bmi);
+
+        // prepare the bitmap for masking by setting transparent pixels to black
+        GpiSetBitmap(hps, hbm);
 
         POINTL ptls[] = {
-            { 0, h }, { w - 1, h * 2 - 1 }, // dst: inclusive-inclusive
-            { 0, 0 }, { w, h }, // src: inclusive-exclusive
+            { 0,  // dst: inclusive-inclusive
+            { 0,  // src: inclusive-exclusive
         };
-        GpiDrawBits(hps, (PBYTE)(const uchar *)mask.bits(), (PBITMAPINFO2)&bmi,
-                    4, ptls, ROP_NOTSRCCOPY, BBO_IGNORE);
-
-        // prepare the bitmap for masking by setting transparent pixels to black
-        GpiSetBitmap(hps, hbmMask);
-
         ptls[0].y -= h;
         ptls[1].y -= h;
@@ -234 +252 @@
     info.yHotspot = hotY;
     info.hbmColor = pm.toPmHBITMAP(&info.hbmPointer);
-    if (!pmMini.isNull())
-    info.hbmMiniColor = pmMini.toPmHBITMAP(&info.hbmMiniPointer);
+    if (!pmMini.isNull()) {
+        info.hbmMiniColor = pmMini.toPmHBITMAP(&info.hbmMiniPointer);
+    } else {
+        info.hbmMiniPointer = NULLHANDLE;
+        info.hbmMiniColor = NULLHANDLE;
+    }
 
     HPOINTER hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &info);