X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f16e72c8371e1dd64eb44b65148dcf6b9cfcb8e1..94e36a5196e52314b56c1b4d29bae0d02519af55:/src/os2/bitmap.cpp

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 6a6be7033f..94dcdeaa5d 100644
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -227,6 +227,8 @@ wxBitmap::wxBitmap(
         pzData = (char *)zBits;    // const_cast is harmless
     }
 
+    if (nDepth > 24)
+        nDepth = 24; // MAX supported in PM
     memset(&vHeader, '\0', 16);
     vHeader.cbFix           = 16;
     vHeader.cx              = (USHORT)nWidth;
@@ -346,6 +348,9 @@ bool wxBitmap::Create(
         hDCScreen = ::GpiQueryDevice(hPSScreen);
         ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount);
 
+        if (lBitCount > 24)
+            lBitCount = 24;
+
         memset(&vHeader, '\0', 16);
         vHeader.cbFix     =  16;
         vHeader.cx        = nW;
@@ -548,7 +553,7 @@ bool wxBitmap::CreateFromImage (
     SetWidth(nWidth);
     SetHeight(nBmpHeight);
     if (nDepth == -1)
-        nDepth = 16; // wxDisplayDepth();
+        nDepth = wxDisplayDepth();
     SetDepth(nDepth);
 
 #if wxUSE_PALETTE
@@ -574,12 +579,6 @@ bool wxBitmap::CreateFromImage (
     vHeader.cPlanes         = 1L;
     vHeader.cBitCount       = 24;
 
-    memset(&vInfo, '\0', 16);
-    vInfo.cbFix           = 16;
-    vInfo.cx              = (ULONG)nWidth;
-    vInfo.cy              = (ULONG)nHeight;
-    vInfo.cPlanes         = 1L;
-    vInfo.cBitCount       = 24;
     //
     // Memory for DIB data
     //
@@ -591,6 +590,7 @@ bool wxBitmap::CreateFromImage (
         wxFAIL_MSG(wxT("could not allocate memory for DIB"));
         return FALSE;
     }
+    memset(pucBits, '\0', (nBytePerLine * nHeight));
 
     //
     // Create and set the device-dependent bitmap
@@ -600,11 +600,18 @@ bool wxBitmap::CreateFromImage (
     HDC                             hDC   = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
     HPS                             hPS   = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
     LONG                            lScans;
-    HDC                             hDCScreen = ::WinOpenWindowDC(HWND_DESKTOP);
+    HDC                             hDCScreen = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
     HPS                             hPSScreen;
     HBITMAP                         hBmp;
     HBITMAP                         hBmpOld;
 
+    memset(&vInfo, '\0', 16);
+    vInfo.cbFix           = 16;
+    vInfo.cx              = (ULONG)nWidth;
+    vInfo.cy              = (ULONG)nHeight;
+    vInfo.cPlanes         = 1;
+    vInfo.cBitCount       = 24; // Set to desired count going in
+
     hBmp = ::GpiCreateBitmap( hPS
                              ,&vHeader
                              ,0L
@@ -674,6 +681,9 @@ bool wxBitmap::CreateFromImage (
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         }
+        //
+        // Debug stuff
+        //
 
         hPSScreen = ::GpiCreatePS( vHabmain
                                   ,hDCScreen
@@ -708,11 +718,11 @@ bool wxBitmap::CreateFromImage (
     //
     if (rImage.HasMask())
     {
-        vHeader.cbFix     =  sizeof(BITMAPINFOHEADER2);
+        vHeader.cbFix     = 16;
         vHeader.cx        = nWidth;
         vHeader.cy        = nHeight;
         vHeader.cPlanes   = 1;
-        vHeader.cBitCount = 1;
+        vHeader.cBitCount = 24;
         hBmp = ::GpiCreateBitmap( hPS
                                  ,&vHeader
                                  ,0L
@@ -725,7 +735,6 @@ bool wxBitmap::CreateFromImage (
         else
             nHeight = nSizeLimit / nBytePerLine;
         vHeader.cy = (DWORD)(nHeight);
-        vHeader.cbImage = nBytePerLine * nHeight;
         nOrigin = 0;
 
         unsigned char               cRed   = rImage.GetMaskRed();
@@ -745,7 +754,6 @@ bool wxBitmap::CreateFromImage (
                 //
                 nHeight         = nHRemain;
                 vHeader.cy      = (DWORD)(nHeight);
-                vHeader.cbImage = nBytePerLine * nHeight;
             }
             ptbits = pucBits;
             for (int j = 0; j < nHeight; j++)
@@ -801,7 +809,7 @@ bool wxBitmap::CreateFromImage (
 
         pMask->SetMaskBitmap((WXHBITMAP)hBmp);
         SetMask(pMask);
-        hBmpOld = ::GpiSetBitmap(hPS, hBmp);
+        hBmpOld = ::GpiSetBitmap(hPS, hBmpOld);
     }
 
     //
@@ -809,6 +817,7 @@ bool wxBitmap::CreateFromImage (
     //
     ::GpiSetBitmap(hPS, NULLHANDLE);
     ::GpiDestroyPS(hPS);
+    ::DevCloseDC(hDCScreen);
     ::DevCloseDC(hDC);
     free(pucBits);
     return TRUE;
@@ -817,6 +826,7 @@ bool wxBitmap::CreateFromImage (
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage                         vImage;
+    wxDC*                           pDC;
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
@@ -836,12 +846,13 @@ wxImage wxBitmap::ConvertToImage() const
     long                            lScans;
     BITMAPINFOHEADER2               vDIBh;
     BITMAPINFO2                     vDIBInfo;
-    HDC                             hDCMem;
-    PSZ                             pszData[4] = { "Display", NULL, NULL, NULL };
     HPS                             hPSMem;
     HPS                             hPS;
-    SIZEL                           vSizlPage = {0,0};
     HBITMAP                         hBitmap;
+    HBITMAP                         hOldBitmap;
+    DEVOPENSTRUC                    vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+    SIZEL                           vSizlPage = {0,0};
+    HDC                             hDCMem;
 
     vImage.Create( nWidth
                   ,nHeight
@@ -884,35 +895,56 @@ wxImage wxBitmap::ConvertToImage() const
         free(pData);
         return wxNullImage;
     }
+    memset(lpBits, '\0', (nBytePerLine * nHeight));
+    hBitmap = (HBITMAP)GetHBITMAP();
+
+    //
+    // May already be selected into a PS
+    //
+    if ((pDC = GetSelectedInto()) != NULL)
+    {
+        hPSMem = pDC->GetHPS();
+    }
+    else
+    {
+        hDCMem = ::DevOpenDC( vHabmain
+                             ,OD_MEMORY
+                             ,"*"
+                             ,5L
+                             ,(PDEVOPENDATA)&vDop
+                             ,NULLHANDLE
+                            );
+        hPSMem = ::GpiCreatePS( vHabmain
+                               ,hDCMem
+                               ,&vSizlPage
+                               ,PU_PELS | GPIA_ASSOC
+                              );
+        if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR)
+        {
+            ERRORID                 vError;
+            wxString                sError;
+
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+        }
+    }
 
     //
     // Copy data from the device-dependent bitmap to the DIB
     //
-    hDCMem = ::DevOpenDC( vHabmain
-                         ,OD_MEMORY
-                         ,"*"
-                         ,4
-                         ,(PDEVOPENDATA)pszData
-                         ,NULLHANDLE
-                        );
-    hPSMem = ::GpiCreatePS( vHabmain
-                           ,hDCMem
-                           ,&vSizlPage
-                           ,PU_PELS | GPIA_ASSOC | GPIT_MICRO
-                          );
-    hBitmap = ::GpiCreateBitmap( hPSMem
-                                ,&vDIBh
-                                ,0L
-                                ,NULL
-                                ,NULL
-                               );
-    ::GpiSetBitmap(hPSMem, hBitmap);
-    lScans = ::GpiQueryBitmapBits( hPSMem
-                                  ,0L
-                                  ,(LONG)nHeight
-                                  ,(PBYTE)lpBits
-                                  ,&vDIBInfo
-                                 );
+    if ((lScans = ::GpiQueryBitmapBits( hPSMem
+                                       ,0L
+                                       ,(LONG)nHeight
+                                       ,(PBYTE)lpBits
+                                       ,&vDIBInfo
+                                      )) == GPI_ALTERROR)
+    {
+        ERRORID                     vError;
+        wxString                    sError;
+
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+    }
 
     //
     // Copy DIB data into the wxImage object
@@ -933,7 +965,12 @@ wxImage wxBitmap::ConvertToImage() const
         }
         ptbits += nPadding;
     }
-    ::GpiSetBitmap(hPSMem, NULLHANDLE);
+    if ((pDC = GetSelectedInto()) == NULL)
+    {
+        ::GpiSetBitmap(hPSMem, NULLHANDLE);
+        ::GpiDestroyPS(hPSMem);
+        ::DevCloseDC(hDCMem);
+    }
 
     //
     // Similarly, set data according to the possible mask bitmap
@@ -945,17 +982,17 @@ wxImage wxBitmap::ConvertToImage() const
         //
         // Memory DC/PS created, color set, data copied, and memory DC/PS deleted
         //
-        HDC                         hMemDC = ::DevOpenDC( vHabmain
-                                                         ,OD_MEMORY
-                                                         ,"*"
-                                                         ,4
-                                                         ,(PDEVOPENDATA)pszData
-                                                         ,NULLHANDLE
-                                                        );
+        HDC                        hMemDC = ::DevOpenDC( vHabmain
+                                                        ,OD_MEMORY
+                                                        ,"*"
+                                                        ,5L
+                                                        ,(PDEVOPENDATA)&vDop
+                                                        ,NULLHANDLE
+                                                       );
         HPS                         hMemPS = ::GpiCreatePS( vHabmain
                                                            ,hMemDC
                                                            ,&vSizlPage
-                                                           ,PU_PELS | GPIA_ASSOC | GPIT_MICRO
+                                                           ,PU_PELS | GPIA_ASSOC
                                                           );
         ::GpiSetColor(hMemPS, OS2RGB(0, 0, 0));
         ::GpiSetBackColor(hMemPS, OS2RGB(255, 255, 255) );
@@ -1009,8 +1046,6 @@ wxImage wxBitmap::ConvertToImage() const
     //
     // Free allocated resources
     //
-    ::GpiDestroyPS(hPSMem);
-    ::DevCloseDC(hDCMem);
     free(lpBits);
     return vImage;
 } // end of wxBitmap::ConvertToImage