Changeset 940

Timestamp:

Aug 5, 2011, 1:51:26 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fixed assertion in QPixmap::setMask().

The mask size could be different due to incorrect error
handling in QPixmap::fromPmHBITMAP(). It was also
possible that a valid mask HBITMAP were incorrectly
processed. That would result into a QPixmap without a
mask.

File:

• trunk/src/gui/image/qpixmap_pm.cpp (modified) (1 diff)

trunk/src/gui/image/qpixmap_pm.cpp ¶

@@ -316 +316 @@
     QImage mask;
 
-    if (hbmMask != NULLHANDLE) {
+    if (hbmMask != NULLHANDLE && GpiQueryBitmapInfoHeader(hbmMask, bmh)) {
         // get the AND+XOR mask
-        GpiSetBitmap(hps, hbmMask);
-        mask = QImage(bmh->cx, bmh->cy * 2, QImage::Format_Mono);
-        bmh->cPlanes = 1;
-        bmh->cBitCount = 1;
-        if (GpiQueryBitmapBits(hps, 0, mask.height(), (PBYTE)mask.bits(),
-                               (PBITMAPINFO2)&bmi) != GPI_ALTERROR) {
-            // take the palette
-            QVector<QRgb> colors(2);
-            colors[0] = QRgb(pal[0]);
-            colors[1] = QRgb(pal[1]);
-            mask.setColorTable(colors);
-            // flip the bitmap top to bottom to cancel PM inversion
-            mask = mask.mirrored(false, true);
-            // drop the XOR mask
-            mask = mask.copy(0, 0, mask.width(), mask.height() / 2);
-            // create a normal mask from the AND mask
-            mask.invertPixels();
+        if ((int)bmh->cx == img.width() &&
+            (int)bmh->cy == img.height() * 2 &&
+            bmh->cPlanes == 1 && bmh->cBitCount == 1) {
+            GpiSetBitmap(hps, hbmMask);
+            mask = QImage(bmh->cx, bmh->cy, QImage::Format_Mono);
+            if (GpiQueryBitmapBits(hps, 0, mask.height(), (PBYTE)mask.bits(),
+                                   (PBITMAPINFO2)&bmi) != GPI_ALTERROR) {
+                // take the palette
+                QVector<QRgb> colors(2);
+                colors[0] = QRgb(pal[0]);
+                colors[1] = QRgb(pal[1]);
+                mask.setColorTable(colors);
+                // flip the bitmap top to bottom to cancel PM inversion
+                mask = mask.mirrored(false, true);
+                // drop the XOR mask
+                mask = mask.copy(0, 0, mask.width(), mask.height() / 2);
+                // create a normal mask from the AND mask
+                mask.invertPixels();
+            } else {
+                mask = QImage();
+            }
+            GpiSetBitmap(hps, NULLHANDLE);
+        } else {
+            Q_ASSERT(false);
         }
     }