Changeset 621

Timestamp:

Mar 3, 2010, 3:04:01 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QPixmap: Enhanced fromPmHBITMAO, added fromPmHPOINTER().

Location:

trunk/src/gui/image

Files:

• qpixmap.h (modified) (1 diff)
• qpixmap_pm.cpp (modified) (9 diffs)

trunk/src/gui/image/qpixmap.h

@@ -163 +163 @@
 #if defined(Q_WS_PM)
     HBITMAP toPmHBITMAP(HBITMAP *mask = 0, bool embedRealAlpha = false) const;
-    static QPixmap fromPmHBITMAP(HBITMAP hbm);
+    static QPixmap fromPmHBITMAP(HBITMAP hbm);
     static HPOINTER toPmHPOINTER(const QIcon &icon, bool isPointer = false,
                                  int hotX = 0, int hotY = 0,
                                  bool embedRealAlpha = false, bool isMini = true);
+
+
 #endif
 

trunk/src/gui/image/qpixmap_pm.cpp

@@ -93 +93 @@
     handle.
 
-    If \a mask is not NULL, the mask mode is turned. In this mode, the bitmap
+    If \a mask is not NULL, the mask mode is turned. In this mode, the bitmap
     mask is also created from the QPixmap's mask and returned in the given
     variable. This bitmap mask will contain two vertically adjacent sections,
@@ -233 +233 @@
 
 /*!
-    Returns a QPixmap that is equivalent to the given \a bitmap.
+    Returns a QPixmap that is equivalent to the given \a bitmap. If \a hbmMask
+    is not NULLHANDLE, it should contain vertically adjacent AND and XOR masks
+    for the given bitmap which will be used to create a mask for the returned
+    QPixmap.
+
+    Note that this method will attempt to auto-detect the presence of the real
+    alpha chennel in the high 8 bits of the 32-bit pixel value for each pixel if
+    the \a bitmap has 1 plane and the 32-bit depth. This alpha channel will be
+    used to create an alpha channel for the returned QPixmap.
 
     \warning This function is only available on OS/2.
@@ -241 +249 @@
 */
 // static
-QPixmap QPixmap::fromPmHBITMAP(HBITMAP hbm)
+QPixmap QPixmap::fromPmHBITMAP(HBITMAP hbm)
 {
     QPixmap res;
@@ -258 +266 @@
         return res;
 
-    HPS hps = qt_alloc_mem_ps(bmh->cx, bmh->cy);
+    HPS hps = qt_alloc_mem_ps(bmh->cx, bmh->cy);
     if (hps == NULLHANDLE)
         return res;
@@ -270 +278 @@
         // monochrome bitmap
         img = QImage(bmh->cx, bmh->cy, QImage::Format_Mono);
-        if (GpiQueryBitmapBits(hps, 0, bmh->cy, (PBYTE)img.bits(),
+        if (GpiQueryBitmapBits(hps, 0, , (PBYTE)img.bits(),
                                (PBITMAPINFO2)&bmi) != GPI_ALTERROR) {
             succeeded = true;
@@ -277 +285 @@
             colors[0] = QRgb(pal[0]);
             colors[1] = QRgb(pal[1]);
+
         }
     } else {
@@ -283 +292 @@
         bmh->cPlanes = 1;
         bmh->cBitCount = 32;
-        if (GpiQueryBitmapBits(hps, 0, bmh->cy, (PBYTE)img.bits(),
+        if (GpiQueryBitmapBits(hps, 0, , (PBYTE)img.bits(),
                                (PBITMAPINFO2)&bmi) != GPI_ALTERROR) {
             succeeded = true;
@@ -300 +309 @@
                 img = alphaImg;
             }
+
+
         }
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     qt_free_mem_ps(hps);
 
     if (succeeded) {
-        // flip the bitmap top to bottom to cancel PM inversion
-        img = img.mirrored();
         res = QPixmap::fromImage(img);
+
+
     }
 
@@ -399 +434 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QPixmap QPixmap::grabWindow(WId winId, int x, int y, int w, int h)
 {