Fix wxMSW compilation in wxUSE_STL==1 case.

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 21a5c2fc95c10e906eea8d595a2278b5035b871c..be10fcf0470dc2cddcc0abff76a9520d6c6dff4f 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -6,7 +6,7 @@
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 /*
 ///////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -30,29 +30,25 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_WXDIB
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#if wxUSE_WXDIB
-
-#include "wx/bitmap.h"
-#include "wx/intl.h"

 #include "wx/file.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "wx/file.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 

-#if !defined(__MWERKS__) && !defined(__SALFORDC__)
+#if !defined(__MWERKS__)

     #include <memory.h>
 #endif
 
     #include <memory.h>
 #endif
 

-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#include "wx/image.h"

 #include "wx/msw/dib.h"
 
 #ifdef __WXWINCE__
 #include "wx/msw/dib.h"
 
 #ifdef __WXWINCE__


@@ -69,7 +65,7 @@ static inline WORD GetNumberOfColours(WORD bitsPerPixel)
 {
     // only 1, 4 and 8bpp bitmaps use palettes (well, they could be used with
     // 24bpp ones too but we don't support this as I think it's quite uncommon)
 {
     // only 1, 4 and 8bpp bitmaps use palettes (well, they could be used with
     // 24bpp ones too but we don't support this as I think it's quite uncommon)

-    return bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0;
+    return (WORD)(bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0);

 }
 
 // wrapper around ::GetObject() for DIB sections
 }
 
 // wrapper around ::GetObject() for DIB sections


@@ -95,44 +91,38 @@ bool wxDIB::Create(int width, int height, int depth)
 {
     // we don't support formats using palettes right now so we only create
     // either 24bpp (RGB) or 32bpp (RGBA) bitmaps
 {
     // we don't support formats using palettes right now so we only create
     // either 24bpp (RGB) or 32bpp (RGBA) bitmaps

-    wxASSERT_MSG( depth, _T("invalid image depth in wxDIB::Create()") );
+    wxASSERT_MSG( depth, wxT("invalid image depth in wxDIB::Create()") );

     if ( depth < 24 )
         depth = 24;
 
     // allocate memory for bitmap structures
     if ( depth < 24 )
         depth = 24;
 
     // allocate memory for bitmap structures

-    static const int sizeHeader = sizeof(BITMAPINFOHEADER);
-
-    BITMAPINFO *info = (BITMAPINFO *)malloc(sizeHeader);
-    wxCHECK_MSG( info, false, _T("malloc(BITMAPINFO) failed") );
+    BITMAPINFO info;
+    wxZeroMemory(info);

 
 

-    memset(info, 0, sizeHeader);
-
-    info->bmiHeader.biSize = sizeHeader;
-    info->bmiHeader.biWidth = width;
+    info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    info.bmiHeader.biWidth = width;

 
     // we use positive height here which corresponds to a DIB with normal, i.e.
     // bottom to top, order -- normally using negative height (which means
     // reversed for MS and hence natural for all the normal people top to
     // bottom line scan order) could be used to avoid the need for the image
     // reversal in Create(image) but this doesn't work under NT, only Win9x!
 
     // we use positive height here which corresponds to a DIB with normal, i.e.
     // bottom to top, order -- normally using negative height (which means
     // reversed for MS and hence natural for all the normal people top to
     // bottom line scan order) could be used to avoid the need for the image
     // reversal in Create(image) but this doesn't work under NT, only Win9x!

-    info->bmiHeader.biHeight = height;
+    info.bmiHeader.biHeight = height;

 
 

-    info->bmiHeader.biPlanes = 1;
-    info->bmiHeader.biBitCount = depth;
-    info->bmiHeader.biSizeImage = GetLineSize(width, depth)*height;
+    info.bmiHeader.biPlanes = 1;
+    info.bmiHeader.biBitCount = (WORD)depth;
+    info.bmiHeader.biSizeImage = GetLineSize(width, depth)*height;

 
     m_handle = ::CreateDIBSection
                  (
                     0,              // hdc (unused with DIB_RGB_COLORS)
 
     m_handle = ::CreateDIBSection
                  (
                     0,              // hdc (unused with DIB_RGB_COLORS)

-                    info,           // bitmap description
+                    &info,          // bitmap description

                     DIB_RGB_COLORS, // use RGB, not palette
                     &m_data,        // [out] DIB bits
                     NULL,           // don't use file mapping
                     0               // file mapping offset (not used here)
                  );
 
                     DIB_RGB_COLORS, // use RGB, not palette
                     &m_data,        // [out] DIB bits
                     NULL,           // don't use file mapping
                     0               // file mapping offset (not used here)
                  );
 

-    free(info);
-

     if ( !m_handle )
     {
         wxLogLastError(wxT("CreateDIBSection"));
     if ( !m_handle )
     {
         wxLogLastError(wxT("CreateDIBSection"));


@@ -149,12 +139,20 @@ bool wxDIB::Create(int width, int height, int depth)
 
 bool wxDIB::Create(const wxBitmap& bmp)
 {
 
 bool wxDIB::Create(const wxBitmap& bmp)
 {

-    wxCHECK_MSG( bmp.Ok(), false, _T("wxDIB::Create(): invalid bitmap") );
+    wxCHECK_MSG( bmp.Ok(), false, wxT("wxDIB::Create(): invalid bitmap") );
+
+    if ( !Create(GetHbitmapOf(bmp)) )
+        return false;
+
+    m_hasAlpha = bmp.HasAlpha();
+
+    return true;
+}

 
 

+bool wxDIB::Create(HBITMAP hbmp)
+{

     // this bitmap could already be a DIB section in which case we don't need
     // to convert it to DIB
     // this bitmap could already be a DIB section in which case we don't need
     // to convert it to DIB

-    HBITMAP hbmp = GetHbitmapOf(bmp);
-

     DIBSECTION ds;
     if ( GetDIBSection(hbmp, &ds) )
     {
     DIBSECTION ds;
     if ( GetDIBSection(hbmp, &ds) )
     {


@@ -172,13 +170,20 @@ bool wxDIB::Create(const wxBitmap& bmp)
     }
     else // no, it's a DDB -- convert it to DIB
     {
     }
     else // no, it's a DDB -- convert it to DIB
     {

-        const int w = bmp.GetWidth();
-        const int h = bmp.GetHeight();
-        int d = bmp.GetDepth();
+        // prepare all the info we need
+        BITMAP bm;
+        if ( !::GetObject(hbmp, sizeof(bm), &bm) )
+        {
+            wxLogLastError(wxT("GetObject(bitmap)"));
+
+            return false;
+        }
+
+        int d = bm.bmBitsPixel;

         if ( d <= 0 )
             d = wxDisplayDepth();
 
         if ( d <= 0 )
             d = wxDisplayDepth();
 

-        if ( !Create(w, h, d) || !CopyFromDDB(hbmp) )
+        if ( !Create(bm.bmWidth, bm.bmHeight, d) || !CopyFromDDB(hbmp) )

             return false;
     }
 
             return false;
     }
 


@@ -221,7 +226,7 @@ bool wxDIB::CopyFromDDB(HBITMAP hbmp)
                     SRCCOPY
                   ) )
     {
                     SRCCOPY
                   ) )
     {

-        wxLogLastError(_T("BitBlt(DDB -> DIB)"));
+        wxLogLastError(wxT("BitBlt(DDB -> DIB)"));

 
         return false;
     }
 
         return false;
     }


@@ -237,7 +242,7 @@ bool wxDIB::CopyFromDDB(HBITMAP hbmp)
     if ( !GetDIBSection(m_handle, &ds) )
     {
         // we're sure that our handle is a DIB section, so this should work
     if ( !GetDIBSection(m_handle, &ds) )
     {
         // we're sure that our handle is a DIB section, so this should work

-        wxFAIL_MSG( _T("GetObject(DIBSECTION) unexpectedly failed") );
+        wxFAIL_MSG( wxT("GetObject(DIBSECTION) unexpectedly failed") );

 
         return false;
     }
 
         return false;
     }


@@ -275,7 +280,7 @@ bool wxDIB::Load(const wxString& filename)
     m_handle = (HBITMAP)::LoadImage
                          (
                             wxGetInstance(),
     m_handle = (HBITMAP)::LoadImage
                          (
                             wxGetInstance(),

-                            filename,
+                            filename.t_str(),

                             IMAGE_BITMAP,
                             0, 0, // don't specify the size
                             LR_CREATEDIBSECTION | LR_LOADFROMFILE
                             IMAGE_BITMAP,
                             0, 0, // don't specify the size
                             LR_CREATEDIBSECTION | LR_LOADFROMFILE


@@ -284,7 +289,7 @@ bool wxDIB::Load(const wxString& filename)
 
     if ( !m_handle )
     {
 
     if ( !m_handle )
     {

-        wxLogLastError(_T("Loading DIB from file"));
+        wxLogLastError(wxT("Loading DIB from file"));

 
         return false;
     }
 
         return false;
     }


@@ -294,8 +299,9 @@ bool wxDIB::Load(const wxString& filename)
 
 bool wxDIB::Save(const wxString& filename)
 {
 
 bool wxDIB::Save(const wxString& filename)
 {

-    wxCHECK_MSG( m_handle, false, _T("wxDIB::Save(): invalid object") );
+    wxCHECK_MSG( m_handle, false, wxT("wxDIB::Save(): invalid object") );

 
 

+#if wxUSE_FILE

     wxFile file(filename, wxFile::write);
     bool ok = file.IsOpened();
     if ( ok )
     wxFile file(filename, wxFile::write);
     bool ok = file.IsOpened();
     if ( ok )


@@ -303,7 +309,7 @@ bool wxDIB::Save(const wxString& filename)
         DIBSECTION ds;
         if ( !GetDIBSection(m_handle, &ds) )
         {
         DIBSECTION ds;
         if ( !GetDIBSection(m_handle, &ds) )
         {

-            wxLogLastError(_T("GetObject(hDIB)"));
+            wxLogLastError(wxT("GetObject(hDIB)"));

         }
         else
         {
         }
         else
         {


@@ -324,6 +330,9 @@ bool wxDIB::Save(const wxString& filename)
                         file.Write(ds.dsBm.bmBits, sizeImage) == sizeImage;
         }
     }
                         file.Write(ds.dsBm.bmBits, sizeImage) == sizeImage;
         }
     }

+#else // !wxUSE_FILE
+    bool ok = false;
+#endif // wxUSE_FILE/!wxUSE_FILE

 
     if ( !ok )
     {
 
     if ( !ok )
     {


@@ -352,7 +361,7 @@ void wxDIB::DoGetObject() const
         DIBSECTION ds;
         if ( !GetDIBSection(m_handle, &ds) )
         {
         DIBSECTION ds;
         if ( !GetDIBSection(m_handle, &ds) )
         {

-            wxLogLastError(_T("GetObject(hDIB)"));
+            wxLogLastError(wxT("GetObject(hDIB)"));

             return;
         }
 
             return;
         }
 


@@ -373,23 +382,47 @@ void wxDIB::DoGetObject() const
 
 HBITMAP wxDIB::CreateDDB(HDC hdc) const
 {
 
 HBITMAP wxDIB::CreateDDB(HDC hdc) const
 {

-    wxCHECK_MSG( m_handle, 0, _T("wxDIB::CreateDDB(): invalid object") );
+    wxCHECK_MSG( m_handle, 0, wxT("wxDIB::CreateDDB(): invalid object") );

 
     DIBSECTION ds;
     if ( !GetDIBSection(m_handle, &ds) )
     {
 
     DIBSECTION ds;
     if ( !GetDIBSection(m_handle, &ds) )
     {

-        wxLogLastError(_T("GetObject(hDIB)"));
+        wxLogLastError(wxT("GetObject(hDIB)"));

 
         return 0;
     }
 
 
         return 0;
     }
 

-    return ConvertToBitmap((BITMAPINFO *)&ds.dsBmih, hdc, ds.dsBm.bmBits);
+    // how many colours are we going to have in the palette?
+    DWORD biClrUsed = ds.dsBmih.biClrUsed;
+    if ( !biClrUsed )
+    {
+        // biClrUsed field might not be set
+        biClrUsed = GetNumberOfColours(ds.dsBmih.biBitCount);
+    }
+
+    if ( !biClrUsed )
+    {
+        return ConvertToBitmap((BITMAPINFO *)&ds.dsBmih, hdc, ds.dsBm.bmBits);
+    }
+    else
+    {
+        // fake a BITMAPINFO w/o bits, just the palette info
+        wxCharBuffer bmi(sizeof(BITMAPINFO) + (biClrUsed - 1)*sizeof(RGBQUAD));
+        BITMAPINFO *pBmi = (BITMAPINFO *)bmi.data();
+        MemoryHDC hDC;
+        // get the colour table
+        SelectInHDC sDC(hDC, m_handle);
+        ::GetDIBColorTable(hDC, 0, biClrUsed, pBmi->bmiColors);
+        memcpy(&pBmi->bmiHeader, &ds.dsBmih, ds.dsBmih.biSize);
+
+        return ConvertToBitmap(pBmi, hdc, ds.dsBm.bmBits);
+    }

 }
 
 /* static */
 HBITMAP wxDIB::ConvertToBitmap(const BITMAPINFO *pbmi, HDC hdc, void *bits)
 {
 }
 
 /* static */
 HBITMAP wxDIB::ConvertToBitmap(const BITMAPINFO *pbmi, HDC hdc, void *bits)
 {

-    wxCHECK_MSG( pbmi, 0, _T("invalid DIB in ConvertToBitmap") );
+    wxCHECK_MSG( pbmi, 0, wxT("invalid DIB in ConvertToBitmap") );

 
     // here we get BITMAPINFO struct followed by the actual bitmap bits and
     // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
 
     // here we get BITMAPINFO struct followed by the actual bitmap bits and
     // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info


@@ -525,17 +558,17 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
     {
         // this is an error which does risk to happen especially under Win9x
         // and which the user may understand so let him know about it
     {
         // this is an error which does risk to happen especially under Win9x
         // and which the user may understand so let him know about it

-        wxLogError(_("Failed to allocated %luKb of memory for bitmap data."),
+        wxLogError(_("Failed to allocate %luKb of memory for bitmap data."),

                    (unsigned long)(size / 1024));
 
         return NULL;
     }
 
                    (unsigned long)(size / 1024));
 
         return NULL;
     }
 

-    if ( !ConvertFromBitmap((BITMAPINFO *)(void *)GlobalPtr(hDIB), hbmp) )
+    if ( !ConvertFromBitmap((BITMAPINFO *)(void *)GlobalPtrLock(hDIB), hbmp) )

     {
         // this really shouldn't happen... it worked the first time, why not
         // now?
     {
         // this really shouldn't happen... it worked the first time, why not
         // now?

-        wxFAIL_MSG( _T("wxDIB::ConvertFromBitmap() unexpectedly failed") );
+        wxFAIL_MSG( wxT("wxDIB::ConvertFromBitmap() unexpectedly failed") );

 
         return NULL;
     }
 
         return NULL;
     }


@@ -553,12 +586,16 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 
 wxPalette *wxDIB::CreatePalette() const
 {
 
 wxPalette *wxDIB::CreatePalette() const
 {

-    wxCHECK_MSG( m_handle, NULL, _T("wxDIB::CreatePalette(): invalid object") );
+    // GetDIBColorTable not available in eVC3
+#if defined(_WIN32_WCE) && _WIN32_WCE < 400
+    return NULL;
+#else
+    wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );

 
     DIBSECTION ds;
     if ( !GetDIBSection(m_handle, &ds) )
     {
 
     DIBSECTION ds;
     if ( !GetDIBSection(m_handle, &ds) )
     {

-        wxLogLastError(_T("GetObject(hDIB)"));
+        wxLogLastError(wxT("GetObject(hDIB)"));

 
         return 0;
     }
 
         return 0;
     }


@@ -580,18 +617,23 @@ wxPalette *wxDIB::CreatePalette() const
         return NULL;
     }
 
         return NULL;
     }
 

+    MemoryHDC hDC;
+

     // LOGPALETTE struct has only 1 element in palPalEntry array, we're
     // going to have biClrUsed of them so add necessary space
     LOGPALETTE *pPalette = (LOGPALETTE *)
         malloc(sizeof(LOGPALETTE) + (biClrUsed - 1)*sizeof(PALETTEENTRY));
     // LOGPALETTE struct has only 1 element in palPalEntry array, we're
     // going to have biClrUsed of them so add necessary space
     LOGPALETTE *pPalette = (LOGPALETTE *)
         malloc(sizeof(LOGPALETTE) + (biClrUsed - 1)*sizeof(PALETTEENTRY));

-    wxCHECK_MSG( pPalette, NULL, _T("out of memory") );
+    wxCHECK_MSG( pPalette, NULL, wxT("out of memory") );

 
     // initialize the palette header
     pPalette->palVersion = 0x300;  // magic number, not in docs but works
 
     // initialize the palette header
     pPalette->palVersion = 0x300;  // magic number, not in docs but works

-    pPalette->palNumEntries = biClrUsed;
+    pPalette->palNumEntries = (WORD)biClrUsed;

 
 

-    // and the colour table (it starts right after the end of the header)
-    const RGBQUAD *pRGB = (RGBQUAD *)((char *)&ds.dsBmih + ds.dsBmih.biSize);
+    // and the colour table
+    wxCharBuffer rgb(sizeof(RGBQUAD) * biClrUsed);
+    RGBQUAD *pRGB = (RGBQUAD*)rgb.data();
+    SelectInHDC selectHandle(hDC, m_handle);
+    ::GetDIBColorTable(hDC, 0, biClrUsed, pRGB);

     for ( DWORD i = 0; i < biClrUsed; i++, pRGB++ )
     {
         pPalette->palPalEntry[i].peRed = pRGB->rgbRed;
     for ( DWORD i = 0; i < biClrUsed; i++, pRGB++ )
     {
         pPalette->palPalEntry[i].peRed = pRGB->rgbRed;


@@ -606,7 +648,7 @@ wxPalette *wxDIB::CreatePalette() const
 
     if ( !hPalette )
     {
 
     if ( !hPalette )
     {

-        wxLogLastError(_T("CreatePalette"));
+        wxLogLastError(wxT("CreatePalette"));

 
         return NULL;
     }
 
         return NULL;
     }


@@ -615,6 +657,7 @@ wxPalette *wxDIB::CreatePalette() const
     palette->SetHPALETTE((WXHPALETTE)hPalette);
 
     return palette;
     palette->SetHPALETTE((WXHPALETTE)hPalette);
 
     return palette;

+#endif

 }
 
 #endif // wxUSE_PALETTE
 }
 
 #endif // wxUSE_PALETTE


@@ -627,15 +670,15 @@ wxPalette *wxDIB::CreatePalette() const
 
 bool wxDIB::Create(const wxImage& image)
 {
 
 bool wxDIB::Create(const wxImage& image)
 {

-    wxCHECK_MSG( image.Ok(), false, _T("invalid wxImage in wxDIB ctor") );
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid wxImage in wxDIB ctor") );

 
     const int h = image.GetHeight();
     const int w = image.GetWidth();
 
     // if we have alpha channel, we need to create a 32bpp RGBA DIB, otherwise
     // a 24bpp RGB is sufficient
 
     const int h = image.GetHeight();
     const int w = image.GetWidth();
 
     // if we have alpha channel, we need to create a 32bpp RGBA DIB, otherwise
     // a 24bpp RGB is sufficient

-    const bool hasAlpha = image.HasAlpha();
-    const int bpp = hasAlpha ? 32 : 24;
+    m_hasAlpha = image.HasAlpha();
+    const int bpp = m_hasAlpha ? 32 : 24;

 
     if ( !Create(w, h, bpp) )
         return false;
 
     if ( !Create(w, h, bpp) )
         return false;


@@ -645,23 +688,37 @@ bool wxDIB::Create(const wxImage& image)
     const int srcBytesPerLine = w * 3;
     const int dstBytesPerLine = GetLineSize(w, bpp);
     const unsigned char *src = image.GetData() + ((h - 1) * srcBytesPerLine);
     const int srcBytesPerLine = w * 3;
     const int dstBytesPerLine = GetLineSize(w, bpp);
     const unsigned char *src = image.GetData() + ((h - 1) * srcBytesPerLine);

-    const unsigned char *alpha = hasAlpha ? image.GetAlpha() + (h - 1)*w : NULL;
+    const unsigned char *alpha = m_hasAlpha ? image.GetAlpha() + (h - 1)*w
+                                            : NULL;

     unsigned char *dstLineStart = (unsigned char *)m_data;
     for ( int y = 0; y < h; y++ )
     {
         // copy one DIB line
         unsigned char *dst = dstLineStart;
     unsigned char *dstLineStart = (unsigned char *)m_data;
     for ( int y = 0; y < h; y++ )
     {
         // copy one DIB line
         unsigned char *dst = dstLineStart;

-        for ( int x = 0; x < w; x++ )
+        if ( alpha )

         {
         {

-            // also, the order of RGB is inversed for DIBs
-            *dst++ = src[2];
-            *dst++ = src[1];
-            *dst++ = src[0];
-
-            src += 3;
-
-            if ( alpha )
-                *dst++ = *alpha++;
+            for ( int x = 0; x < w; x++ )
+            {
+                // RGB order is reversed, and we need to premultiply
+                // all channels by alpha value for use with ::AlphaBlend.
+                const unsigned char a = *alpha++;
+                *dst++ = (unsigned char)((src[2] * a + 127) / 255);
+                *dst++ = (unsigned char)((src[1] * a + 127) / 255);
+                *dst++ = (unsigned char)((src[0] * a + 127) / 255);
+                *dst++ = a;
+                src += 3;
+            }
+        }
+        else // no alpha channel
+        {
+            for ( int x = 0; x < w; x++ )
+            {
+                // RGB order is reversed.
+                *dst++ = src[2];
+                *dst++ = src[1];
+                *dst++ = src[0];
+                src += 3;
+            }

         }
 
         // pass to the previous line in the image
         }
 
         // pass to the previous line in the image


@@ -691,19 +748,20 @@ wxImage wxDIB::ConvertToImage() const
         return wxNullImage;
     }
 
         return wxNullImage;
     }
 

-    const int bpp = GetDepth();
-    if ( bpp == 32 )
+    if ( m_hasAlpha )

     {
         image.SetAlpha();
     }
 
     // this is the same loop as in Create() just above but with copy direction
     // reversed
     {
         image.SetAlpha();
     }
 
     // this is the same loop as in Create() just above but with copy direction
     // reversed

+    const int bpp = GetDepth();

     const int dstBytesPerLine = w * 3;
     const int srcBytesPerLine = GetLineSize(w, bpp);
     unsigned char *dst = image.GetData() + ((h - 1) * dstBytesPerLine);
     unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() + (h - 1)*w
                                             : NULL;
     const int dstBytesPerLine = w * 3;
     const int srcBytesPerLine = GetLineSize(w, bpp);
     unsigned char *dst = image.GetData() + ((h - 1) * dstBytesPerLine);
     unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() + (h - 1)*w
                                             : NULL;

+    const bool is32bit = bpp == 32;

     const unsigned char *srcLineStart = (unsigned char *)GetData();
     for ( int y = 0; y < h; y++ )
     {
     const unsigned char *srcLineStart = (unsigned char *)GetData();
     for ( int y = 0; y < h; y++ )
     {


@@ -715,10 +773,26 @@ wxImage wxDIB::ConvertToImage() const
             dst[1] = *src++;
             dst[0] = *src++;
 
             dst[1] = *src++;
             dst[0] = *src++;
 

-            dst += 3;
+            if ( is32bit )
+            {
+                if ( alpha )
+                {
+                    // wxImage uses non premultiplied alpha so undo
+                    // premultiplication done in Create() above
+                    const unsigned char a = *src;
+                    *alpha++ = a;
+                    if ( a > 0 )
+                    {
+                        dst[0] = (dst[0] * 255) / a;
+                        dst[1] = (dst[1] * 255) / a;
+                        dst[2] = (dst[2] * 255) / a;
+                    }
+                }

 
 

-            if ( alpha )
-                *alpha++ = *src++;
+                src++;
+            }
+
+            dst += 3;

         }
 
         // pass to the previous line in the image
         }
 
         // pass to the previous line in the image


@@ -736,4 +810,3 @@ wxImage wxDIB::ConvertToImage() const
 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_WXDIB
 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_WXDIB

-