Changeset 455 for trunk/src/gui/image/qpixmap_pm.cpp

Timestamp:

Jan 20, 2010, 7:50:47 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed warnings.

File:

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

trunk/src/gui/image/qpixmap_pm.cpp

@@ -59 +59 @@
         hdcCompat = GpiQueryDevice(compat);
 
-    static const PSZ hdcData[4] = { "Display", NULL, NULL, NULL };
+    static SZ hdcData[4] = { "Display", NULL, NULL, NULL };
     HDC hdc = DevOpenDC(0, OD_MEMORY, "*", 4, (PDEVOPENDATA) hdcData, hdcCompat);
     if (!hdc) {
@@ -148 +148 @@
     char bmi[sizeof(BITMAPINFOHEADER2) + 4 * 2];
     memset(bmi, 0, sizeof(bmi));
-    BITMAPINFOHEADER2 &bmh = *(PBITMAPINFOHEADER2)bmi;
-    bmh.cbFix = sizeof(BITMAPINFOHEADER2);
+    (PBITMAPINFOHEADER2)bmi;
+    bmhcbFix = sizeof(BITMAPINFOHEADER2);
     PULONG pal = (PULONG)(bmi + sizeof(BITMAPINFOHEADER2));
 
     // create the normal bitmap from the pixmap data
-    bmh.cx = w;
-    bmh.cy = h;
-    bmh.cPlanes = 1;
-    bmh.cBitCount = 32;
-    hbm = GpiCreateBitmap(hps, &bmh, CBM_INIT, (PBYTE)(const uchar *)image.bits(),
+    bmhcx = w;
+    bmhcy = h;
+    bmhcPlanes = 1;
+    bmhcBitCount = 32;
+    hbm = GpiCreateBitmap(hps, bmh, CBM_INIT, (PBYTE)(const uchar *)image.bits(),
                           (PBITMAPINFO2)&bmi);
 
@@ -195 +195 @@
 
         // create the mask bitmap
-        bmh.cbFix = sizeof(BITMAPINFOHEADER2);
-        bmh.cx = w;
-        bmh.cy = h * 2;
-        bmh.cPlanes = 1;
-        bmh.cBitCount = 1;
-        bmh.cclrUsed = 2;
+        bmhcbFix = sizeof(BITMAPINFOHEADER2);
+        bmhcx = w;
+        bmhcy = h * 2;
+        bmhcPlanes = 1;
+        bmhcBitCount = 1;
+        bmhcclrUsed = 2;
         pal[0] = 0;
         pal[1] = 0x00FFFFFF;
-        hbmMask = GpiCreateBitmap(hps, &bmh, CBM_INIT,
+        hbmMask = GpiCreateBitmap(hps, bmh, CBM_INIT,
                                   (PBYTE)(const uchar *)mask.bits(),
                                   (PBITMAPINFO2)&bmi);
@@ -251 +251 @@
     char bmi[sizeof(BITMAPINFOHEADER2) + 4 * 2];
     memset(bmi, 0, sizeof(bmi));
-    BITMAPINFOHEADER2 &bmh = *(PBITMAPINFOHEADER2)bmi;
-    bmh.cbFix = sizeof(BITMAPINFOHEADER2);
+    (PBITMAPINFOHEADER2)bmi;
+    bmhcbFix = sizeof(BITMAPINFOHEADER2);
     PULONG pal = (PULONG)(bmi + sizeof(BITMAPINFOHEADER2));
 
-    if (!GpiQueryBitmapInfoHeader(hbm, &bmh))
+    if (!GpiQueryBitmapInfoHeader(hbm, bmh))
         return res;
 
-    HPS hps = qt_alloc_mem_ps(bmh.cx, bmh.cy);
+    HPS hps = qt_alloc_mem_ps(bmhcy);
     if (hps == NULLHANDLE)
         return res;
@@ -267 +267 @@
     bool succeeded = false;
 
-    if (bmh.cPlanes == 1 && bmh.cBitCount == 1) {
+    if (bmhcBitCount == 1) {
         // monochrome bitmap
-        img = QImage(bmh.cx, bmh.cy, QImage::Format_Mono);
-        if (GpiQueryBitmapBits(hps, 0, bmh.cy, (PBYTE)img.bits(),
+        img = QImage(bmhcy, QImage::Format_Mono);
+        if (GpiQueryBitmapBits(hps, 0, bmhcy, (PBYTE)img.bits(),
                                (PBITMAPINFO2)&bmi) != GPI_ALTERROR) {
             succeeded = true;
@@ -280 +280 @@
     } else {
         // always convert to 32-bit otherwise
-        img = QImage(bmh.cx, bmh.cy, QImage::Format_RGB32);
-        bmh.cPlanes = 1;
-        bmh.cBitCount = 32;
-        if (GpiQueryBitmapBits(hps, 0, bmh.cy, (PBYTE)img.bits(),
+        img = QImage(bmhcy, QImage::Format_RGB32);
+        bmhcPlanes = 1;
+        bmhcBitCount = 32;
+        if (GpiQueryBitmapBits(hps, 0, bmhcy, (PBYTE)img.bits(),
                                (PBITMAPINFO2)&bmi) != GPI_ALTERROR) {
             succeeded = true;
@@ -296 +296 @@
             if (!allZero) {
                 // assume we've got the alpha channel
-                QImage alphaImg = QImage(bmh.cx, bmh.cy, QImage::Format_ARGB32);
+                QImage alphaImg = QImage(bmhcy, QImage::Format_ARGB32);
                 memcpy(alphaImg.bits(), img.bits(), img.numBytes());
                 img = alphaImg;