Ticket #216: qpixmap_pm.diff

qpixmap_pm.cpp

@@ -159 +159 @@
     hbm = GpiCreateBitmap(hps, bmh, CBM_INIT, (PBYTE)(const uchar *)image.bits(),
                           (PBITMAPINFO2)&bmi);
 
-    if (mask && hasAlpha()) {
+    if (mask ) {
         // get the mask
         QImage mask;
-        if (!embedRealAlpha) {
-            // We prefer QImage::createAlphaMask() over QPixmap::mask()
-            // since the former will dither while the latter will convert any
-            // non-zero alpha value to an opaque pixel
-            mask = image.createAlphaMask().convertToFormat(QImage::Format_Mono);
+        if (hasAlpha()) {
+            if (!embedRealAlpha) {
+                // We prefer QImage::createAlphaMask() over QPixmap::mask()
+                // since the former will dither while the latter will convert any
+                // non-zero alpha value to an opaque pixel
+                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
+                // 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);
+                // create the AND mask
+                mask.invertPixels();
+                // add the XOR mask (and leave it zeroed)
+                mask = mask.copy(0, -h, w, h * 2);
+            } else {
+                // if we embedded real alpha, we still need a mask if we are going
+                // to create a pointer out of this pixmap (WinCreatePointerIndirect()
+                // requirement), but we will use QPixmap::mask() because it won't be
+                // able to destroy the alpha channel of non-fully transparent pixels
+                // when preparing the color bitmap for masking later. We could also
+                // skip this prepare step, but well, let's go this way, it won't hurt.
+                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);
+            }
         } else {
-            // if we embedded real alpha, we still need a mask if we are going
-            // to create a pointer out of this pixmap (WinCreatePointerIndirect()
-            // requirement), but we will use QPixmap::mask() because it won't be
-            // able to destroy the alpha channel of non-fully transparent pixels
-            // when preparing the color bitmap for masking later. We could also
-            // skip this prepare step, but well, let's go this way, it won't hurt.
-            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);
+            mask = QImage(w, h * 2, QImage::Format_Mono);
+            mask.fill(0);
         }
 
         // create the mask bitmap