* Apply patch #735595. Add miminumAcceptable{Height,Width}

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 1e8806468382a39c710fab505f682c0cd34e5f0c..dd6423fff72696176bd3e717ae3b81adafac0fad 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -50,7 +50,9 @@
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

+#ifdef wxHAVE_RAW_BITMAP

 #include "wx/rawbmp.h"
 #include "wx/rawbmp.h"

+#endif

 
 // missing from mingw32 header
 #ifndef CLR_INVALID
 
 // missing from mingw32 header
 #ifndef CLR_INVALID


@@ -100,10 +102,18 @@ public:
     wxDC         *m_selectedInto;
 #endif // __WXDEBUG__
 
     wxDC         *m_selectedInto;
 #endif // __WXDEBUG__
 

+    // when GetRawData() is called for a DDB we need to convert it to a DIB
+    // first to be able to provide direct access to it and we cache that DIB
+    // here and convert it back to DDB when UngetRawData() is called
+    wxDIB *m_dib;
+

     // true if we have alpha transparency info and can be drawn using
     // AlphaBlend()
     bool m_hasAlpha;
 
     // true if we have alpha transparency info and can be drawn using
     // AlphaBlend()
     bool m_hasAlpha;
 

+    // true if our HBITMAP is a DIB section, false if it is a DDB
+    bool m_isDIB;
+

 private:
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;
 private:
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;


@@ -162,7 +172,11 @@ wxBitmapRefData::wxBitmapRefData()
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;

+

     m_hBitmap = (WXHBITMAP) NULL;
     m_hBitmap = (WXHBITMAP) NULL;

+    m_dib = NULL;
+
+    m_isDIB =

     m_hasAlpha = FALSE;
 }
 
     m_hasAlpha = FALSE;
 }
 


@@ -171,6 +185,8 @@ void wxBitmapRefData::Free()
     wxASSERT_MSG( !m_selectedInto,
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
     wxASSERT_MSG( !m_selectedInto,
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 

+    wxASSERT_MSG( !m_dib, _T("forgot to call wxBitmap::UngetRawData()!") );
+

     if ( m_hBitmap)
     {
         if ( !::DeleteObject((HBITMAP)m_hBitmap) )
     if ( m_hBitmap)
     {
         if ( !::DeleteObject((HBITMAP)m_hBitmap) )


@@ -434,6 +450,13 @@ wxBitmap::wxBitmap(int w, int h, int d)
     (void)Create(w, h, d);
 }
 
     (void)Create(w, h, d);
 }
 

+wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
+{
+    Init();
+
+    (void)Create(w, h, dc);
+}
+

 wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
 {
     Init();
 wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
 {
     Init();


@@ -486,8 +509,8 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
         // don't delete the DIB section in dib object dtor
         hbmp = dib.Detach();
 
         // don't delete the DIB section in dib object dtor
         hbmp = dib.Detach();
 

+        GetBitmapData()->m_isDIB = TRUE;

         GetBitmapData()->m_depth = d;
         GetBitmapData()->m_depth = d;

-        GetBitmapData()->m_hasAlpha = d == 32; // 32bpp DIBs have alpha channel

     }
     else // create a DDB
     {
     }
     else // create a DDB
     {


@@ -767,11 +790,14 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
     HBITMAP hbitmap;
 
     // are we going to use DIB?
     HBITMAP hbitmap;
 
     // are we going to use DIB?

-    if ( wxShouldCreateDIB(w, h, depth, hdc) )
+    //
+    // NB: DDBs don't support alpha so if we have alpha channel we must use DIB
+    if ( image.HasAlpha() || wxShouldCreateDIB(w, h, depth, hdc) )

     {
         // don't delete the DIB section in dib object dtor
         hbitmap = dib.Detach();
 
     {
         // don't delete the DIB section in dib object dtor
         hbitmap = dib.Detach();
 

+        refData->m_isDIB = TRUE;

         refData->m_depth = dib.GetDepth();
     }
     else // we need to convert DIB to DDB
         refData->m_depth = dib.GetDepth();
     }
     else // we need to convert DIB to DDB


@@ -1068,11 +1094,13 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 

+#if wxUSE_PALETTE

 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
                            : (wxPalette *) NULL;
 }
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
                            : (wxPalette *) NULL;
 }

+#endif

 
 wxMask *wxBitmap::GetMask() const
 {
 
 wxMask *wxBitmap::GetMask() const
 {


@@ -1097,6 +1125,12 @@ int wxBitmap::GetQuality() const
 
 #endif // WXWIN_COMPATIBILITY_2_4
 
 
 #endif // WXWIN_COMPATIBILITY_2_4
 

+void wxBitmap::UseAlpha()
+{
+    if ( GetBitmapData() )
+        GetBitmapData()->m_hasAlpha = true;
+}
+

 bool wxBitmap::HasAlpha() const
 {
     return GetBitmapData() && GetBitmapData()->m_hasAlpha;
 bool wxBitmap::HasAlpha() const
 {
     return GetBitmapData() && GetBitmapData()->m_hasAlpha;


@@ -1157,41 +1191,138 @@ void wxBitmap::SetQuality(int WXUNUSED(quality))
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 

-bool wxBitmap::GetRawData(wxRawBitmapData *data)
+#ifdef wxHAVE_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)

 {
 {

-    wxCHECK_MSG( data, FALSE, _T("NULL pointer in wxBitmap::GetRawData") );
-

     if ( !Ok() )
     {
         // no bitmap, no data (raw or otherwise)
     if ( !Ok() )
     {
         // no bitmap, no data (raw or otherwise)

-        return FALSE;
+        return NULL;
+    }
+
+    // if we're already a DIB we can access our data directly, but if not we
+    // need to convert this DDB to a DIB section and use it for raw access and
+    // then convert it back
+    HBITMAP hDIB;
+    if ( !GetBitmapData()->m_isDIB )
+    {
+        wxCHECK_MSG( !GetBitmapData()->m_dib, FALSE,
+                        _T("GetRawData() may be called only once") );
+
+        wxDIB *dib = new wxDIB(*this);
+        if ( !dib->IsOk() )
+        {
+            delete dib;
+
+            return NULL;
+        }
+
+        // we'll free it in UngetRawData()
+        GetBitmapData()->m_dib = dib;
+
+        hDIB = dib->GetHandle();
+    }
+    else // we're a DIB
+    {
+        hDIB = GetHbitmap();

     }
 
     }
 

-    // we only support raw access to the DIBs, so check if we have one

     DIBSECTION ds;
     DIBSECTION ds;

-    if ( !::GetObject(GetHbitmap(), sizeof(ds), &ds) )
+    if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )

     {
     {

-        return FALSE;
+        wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );
+
+        return NULL;

     }
 
     }
 

-    // ok, store the relevant info in wxRawBitmapData
+    // check that the bitmap is in correct format
+    if ( ds.dsBm.bmBitsPixel != bpp )
+    {
+        wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+
+        return NULL;
+    }
+
+    // ok, store the relevant info in wxPixelDataBase

     const LONG h = ds.dsBm.bmHeight;
 
     const LONG h = ds.dsBm.bmHeight;
 

-    data->m_width = ds.dsBm.bmWidth;
-    data->m_height = h;
-    data->m_bypp = ds.dsBm.bmBitsPixel / 8;
+    data.m_width = ds.dsBm.bmWidth;
+    data.m_height = h;

 
     // remember that DIBs are stored in top to bottom order!
     const LONG bytesPerRow = ds.dsBm.bmWidthBytes;
 
     // remember that DIBs are stored in top to bottom order!
     const LONG bytesPerRow = ds.dsBm.bmWidthBytes;

-    data->m_stride = -bytesPerRow;
-    data->m_pixels = (unsigned char *)ds.dsBm.bmBits;
+    data.m_stride = -bytesPerRow;
+
+    char *bits = (char *)ds.dsBm.bmBits;

     if ( h > 1 )
     {
     if ( h > 1 )
     {

-        data->m_pixels += (h - 1)*bytesPerRow;
+        bits += (h - 1)*bytesPerRow;

     }
 
     }
 

-    return TRUE;
+    return bits;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+{
+    if ( !Ok() )
+        return;
+
+    // the cast is ugly but we can't do without it and without making this
+    // function template (and hence inline) unfortunately
+    typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> PixelData;
+    PixelData& data = (PixelData &)dataBase;
+
+    if ( !data )
+    {
+        // invalid data, don't crash -- but don't assert neither as we're
+        // called automatically from wxPixelDataBase dtor and so there is no
+        // way to prevent this from happening
+        return;
+    }
+
+    if ( GetBitmapData()->m_hasAlpha )
+    {
+        // AlphaBlend() wants to have premultiplied source alpha but
+        // wxRawBitmap API uses normal, not premultiplied, colours, so adjust
+        // them here now
+        PixelData::Iterator p(data);
+
+        const int w = data.GetWidth();
+        const int h = data.GetHeight();
+
+        for ( int y = 0; y < h; y++ )
+        {
+            PixelData::Iterator rowStart = p;
+
+            for ( int x = 0; x < w; x++ )
+            {
+                const unsigned alpha = p.Alpha();
+
+                p.Red() = (p.Red() * alpha + 127) / 255;
+                p.Blue() = (p.Blue() * alpha + 127) / 255;
+                p.Green() = (p.Green() * alpha + 127) / 255;
+
+                ++p;
+            }
+
+            p = rowStart;
+            p.OffsetY(data, 1);
+        }
+
+        // if we're a DDB we need to convert DIB back to DDB now to make the
+        // changes made via raw bitmap access effective
+        if ( !GetBitmapData()->m_isDIB )
+        {
+            wxDIB *dib = GetBitmapData()->m_dib;
+            GetBitmapData()->m_dib = NULL;
+
+            // TODO: convert
+
+            delete dib;
+        }
+    }

 }
 }

+#endif // #ifdef wxHAVE_RAW_BITMAP

 
 // ----------------------------------------------------------------------------
 // wxMask
 
 // ----------------------------------------------------------------------------
 // wxMask