X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/487659e0fa411e8c78959146192341691c4c6780..a353dc9852cc44fcffd339895ba3024d0eebbad7:/src/common/image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index aa19e4ea35..0a12ff7847 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "image.h"
 #endif
 
@@ -32,10 +32,11 @@
 #include "wx/intl.h"
 #include "wx/module.h"
 #include "wx/hash.h"
+#include "wx/utils.h"
+#include "wx/math.h"
 
 // For memcpy
 #include <string.h>
-#include <math.h>
 
 #ifdef __SALFORDC__
     #undef FAR
@@ -85,18 +86,19 @@ wxImageRefData::wxImageRefData()
     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;
-    m_hasMask = FALSE;
+    m_hasMask = false;
 
-    m_ok = FALSE;
-    m_static = FALSE;
+    m_ok = false;
+    m_static = false;
 }
 
 wxImageRefData::~wxImageRefData()
 {
-    if ( !m_static )
+    if (!m_static)
+    {
         free( m_data );
-
-    free(m_alpha);
+        free( m_alpha );
+    }
 }
 
 wxList wxImage::sm_handlers;
@@ -109,18 +111,19 @@ wxImage wxNullImage;
 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 
-wxImage::wxImage()
+wxImage::wxImage( int width, int height, bool clear )
 {
+    Create( width, height, clear );
 }
 
-wxImage::wxImage( int width, int height )
+wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
 {
-    Create( width, height );
+    Create( width, height, data, static_data );
 }
 
-wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
+wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
 {
-    Create( width, height, data, static_data );
+    Create( width, height, data, alpha, static_data );
 }
 
 wxImage::wxImage( const wxString& name, long type, int index )
@@ -156,45 +159,62 @@ wxImage::wxImage( const wxImage* image )
     if (image) Ref(*image);
 }
 
-void wxImage::Create( int width, int height )
+bool wxImage::Create( int width, int height, bool clear )
 {
     UnRef();
 
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
-    if (M_IMGDATA->m_data)
-    {
-        for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0;
-
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-    }
-    else
+    if (!M_IMGDATA->m_data)
     {
         UnRef();
+        return false;
     }
+
+    if (clear)
+        memset(M_IMGDATA->m_data, 0, width*height*3);
+
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+
+    return true;
 }
 
-void wxImage::Create( int width, int height, unsigned char* data, bool static_data )
+bool wxImage::Create( int width, int height, unsigned char* data, bool static_data )
 {
     UnRef();
 
+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = data;
-    if (M_IMGDATA->m_data)
-    {
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-        M_IMGDATA->m_static = static_data;
-    }
-    else
-    {
-        UnRef();
-    }
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;
+}
+
+bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
+{
+    UnRef();
+
+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = data;
+    M_IMGDATA->m_alpha = alpha;
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;
 }
 
 void wxImage::Destroy()
@@ -208,7 +228,7 @@ wxImage wxImage::Copy() const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();
 
@@ -219,6 +239,11 @@ wxImage wxImage::Copy() const
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
+    // also copy the image options
+    wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
+    imgData->m_optionNames = M_IMGDATA->m_optionNames;
+    imgData->m_optionValues = M_IMGDATA->m_optionValues;
+
     return image;
 }
 
@@ -226,7 +251,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 {
     if( xFactor == 1 && yFactor == 1 )
         return Copy() ;
-        
+
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
@@ -237,14 +262,14 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 
     long old_height = M_IMGDATA->m_height,
          old_width  = M_IMGDATA->m_width;
-         
+
     wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
                  wxT("invalid old image size") );
 
     long width = old_width / xFactor ;
     long height = old_height / yFactor ;
 
-    image.Create( width , height );
+    image.Create( width, height, false );
 
     char unsigned *data = image.GetData();
 
@@ -260,14 +285,14 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
         maskRed = M_IMGDATA->m_maskRed;
         maskGreen = M_IMGDATA->m_maskGreen;
         maskBlue =M_IMGDATA->m_maskBlue ;
-      
+
         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }
     char unsigned *source_data = M_IMGDATA->m_data;
     char unsigned *target_data = data;
-    
+
     for (long y = 0; y < height; y++)
     {
         for (long x = 0; x < width; x++)
@@ -303,9 +328,9 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
             }
             else
             {
-                *(target_data++) = avgRed / counter ;
-                *(target_data++) = avgGreen / counter ;
-                *(target_data++) = avgBlue / counter ;
+                *(target_data++) = (unsigned char)(avgRed / counter);
+                *(target_data++) = (unsigned char)(avgGreen / counter);
+                *(target_data++) = (unsigned char)(avgBlue / counter);
             }
         }
     }
@@ -341,7 +366,7 @@ wxImage wxImage::Scale( int width, int height ) const
     {
         return ShrinkBy( old_width / width , old_height / height ) ;
     }
-    image.Create( width, height );
+    image.Create( width, height, false );
 
     unsigned char *data = image.GetData();
 
@@ -357,43 +382,29 @@ wxImage wxImage::Scale( int width, int height ) const
     unsigned char *source_data = M_IMGDATA->m_data;
     unsigned char *target_data = data;
 
-#if 0
-    // This is nonsense, RR.
+    long x_delta = (old_width<<16) / width;
+    long y_delta = (old_height<<16) / height;
 
-    // We do (x, y) -> (x, y)*oldSize/newSize but the valid values of x and y
-    // are from 0 to size-1, hence all decrement the sizes
-    long old_old_width = old_width;
-    old_height--;
-    old_width--;
-    height--;
-    width--;
-    for ( long j = 0; j <= height; j++ )
-    {
-        // don't crash for images with height == 1
-        long y_offset = height ? (j * old_height / height)* old_old_width : 0;
+    unsigned char* dest_pixel = target_data;
 
-        for ( long i = 0; i <= width; i++ )
+    long y = 0;
+    for ( long j = 0; j < height; j++ )
         {
-            long x_offset = width ? (i * old_width) / width : 0;
+        unsigned char* src_line = &source_data[(y>>16)*old_width*3];
 
-            memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 );
-            target_data += 3;
-        }
-    }
-#else
-    for (long j = 0; j < height; j++)
-    {
-        long y_offset = (j * old_height / height) * old_width;
-
-        for (long i = 0; i < width; i++)
+        long x = 0;
+        for ( long i = 0; i < width; i++ )
         {
-            memcpy( target_data,
-                source_data + 3*(y_offset + ((i * old_width )/ width)),
-                3 );
-            target_data += 3;
+             unsigned char* src_pixel = &src_line[(x>>16)*3];
+             dest_pixel[0] = src_pixel[0];
+             dest_pixel[1] = src_pixel[1];
+             dest_pixel[2] = src_pixel[2];
+             dest_pixel += 3;
+             x += x_delta;
         }
+
+        y += y_delta;
     }
-#endif
 
     // In case this is a cursor, make sure the hotspot is scalled accordingly:
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
@@ -412,7 +423,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
-    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
+    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );
 
     unsigned char *data = image.GetData();
 
@@ -449,7 +460,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();
 
@@ -503,7 +514,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
     int subwidth=rect.GetWidth();
     const int subheight=rect.GetHeight();
 
-    image.Create( subwidth, subheight );
+    image.Create( subwidth, subheight, false );
 
     unsigned char *subdata = image.GetData(), *data=GetData();
 
@@ -637,7 +648,7 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();
 
@@ -750,7 +761,7 @@ void wxImage::SetData( unsigned char *data )
     newRefData->m_width = M_IMGDATA->m_width;
     newRefData->m_height = M_IMGDATA->m_height;
     newRefData->m_data = data;
-    newRefData->m_ok = TRUE;
+    newRefData->m_ok = true;
     newRefData->m_maskRed = M_IMGDATA->m_maskRed;
     newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
     newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
@@ -770,7 +781,7 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;
-        newRefData->m_ok = TRUE;
+        newRefData->m_ok = true;
         newRefData->m_maskRed = M_IMGDATA->m_maskRed;
         newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
         newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
@@ -781,7 +792,7 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;
-        newRefData->m_ok = TRUE;
+        newRefData->m_ok = true;
     }
 
     UnRef();
@@ -805,7 +816,7 @@ void wxImage::SetAlpha(int x, int y, unsigned char alpha)
     M_IMGDATA->m_alpha[y*w + x] = alpha;
 }
 
-unsigned char wxImage::GetAlpha(int x, int y)
+unsigned char wxImage::GetAlpha(int x, int y) const
 {
     wxCHECK_MSG( Ok() && HasAlpha(), 0, wxT("invalid image or no alpha channel") );
 
@@ -817,17 +828,43 @@ unsigned char wxImage::GetAlpha(int x, int y)
     return M_IMGDATA->m_alpha[y*w + x];
 }
 
+bool wxImage::ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b )
+{
+    SetAlpha( NULL );
+
+    int w = M_IMGDATA->m_width,
+        h = M_IMGDATA->m_height;
+
+    unsigned char *alpha = GetAlpha();
+    unsigned char *data = GetData();
+
+    int x,y;
+    for (y = 0; y < h; y++)
+        for (x = 0; x < w; x++)
+            {
+                *alpha = *data;
+                alpha++;
+                *data = r;
+                data++;
+                *data = g;
+                data++;
+                *data = b;
+                data++;
+            }
+
+    return true;
+}
+
 void wxImage::SetAlpha( unsigned char *alpha )
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
     if ( !alpha )
     {
-        alpha = (unsigned char *)
-                    malloc(M_IMGDATA->m_width*M_IMGDATA->m_height*3);
+        alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
     }
 
-    delete [] M_IMGDATA->m_alpha;
+    free(M_IMGDATA->m_alpha);
     M_IMGDATA->m_alpha = alpha;
 }
 
@@ -849,7 +886,7 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;
     M_IMGDATA->m_maskBlue = b;
-    M_IMGDATA->m_hasMask = TRUE;
+    M_IMGDATA->m_hasMask = true;
 }
 
 unsigned char wxImage::GetMaskRed() const
@@ -882,7 +919,7 @@ void wxImage::SetMask( bool mask )
 
 bool wxImage::HasMask() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
 
     return M_IMGDATA->m_hasMask;
 }
@@ -907,16 +944,16 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     // check that the images are the same size
     if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
     {
-        wxLogError( _("Image and Mask have different sizes") );
-        return FALSE;
+        wxLogError( _("Image and mask have different sizes.") );
+        return false;
     }
 
     // find unused colour
     unsigned char r,g,b ;
     if (!FindFirstUnusedColour(&r, &g, &b))
     {
-        wxLogError( _("No Unused Color in image being masked") );
-        return FALSE ;
+        wxLogError( _("No unused colour in image being masked.") );
+        return false ;
     }
 
     unsigned char *imgdata = GetData();
@@ -941,9 +978,49 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     }
 
     SetMaskColour(r, g, b);
-    SetMask(TRUE);
+    SetMask(true);
 
-    return TRUE;
+    return true;
+}
+
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
+{
+    if (!HasAlpha())
+        return true;
+
+    unsigned char mr, mg, mb;
+    if (!FindFirstUnusedColour(&mr, &mg, &mb))
+    {
+        wxLogError( _("No unused colour in image being masked.") );
+        return false;
+    }
+
+    SetMask(true);
+    SetMaskColour(mr, mg, mb);
+
+    unsigned char *imgdata = GetData();
+    unsigned char *alphadata = GetAlpha();
+
+    int w = GetWidth();
+    int h = GetHeight();
+
+    for (int y = 0; y < h; y++)
+    {
+        for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
+        {
+            if (*alphadata < threshold)
+            {
+                imgdata[0] = mr;
+                imgdata[1] = mg;
+                imgdata[2] = mb;
+            }
+        }
+    }
+
+    free(M_IMGDATA->m_alpha);
+    M_IMGDATA->m_alpha = NULL;
+
+    return true;
 }
 
 #if wxUSE_PALETTE
@@ -953,7 +1030,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
 bool wxImage::HasPalette() const
 {
     if (!Ok())
-        return FALSE;
+        return false;
 
     return M_IMGDATA->m_palette.Ok();
 }
@@ -979,7 +1056,7 @@ void wxImage::SetOption(const wxString& name, const wxString& value)
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
-    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);
     if (idx == wxNOT_FOUND)
     {
         M_IMGDATA->m_optionNames.Add(name);
@@ -1003,7 +1080,7 @@ wxString wxImage::GetOption(const wxString& name) const
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
 
-    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);
     if (idx == wxNOT_FOUND)
         return wxEmptyString;
     else
@@ -1019,9 +1096,9 @@ int wxImage::GetOptionInt(const wxString& name) const
 
 bool wxImage::HasOption(const wxString& name) const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
 
-    return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
+    return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);
 }
 
 bool wxImage::LoadFile( const wxString& filename, long type, int index )
@@ -1037,10 +1114,10 @@ bool wxImage::LoadFile( const wxString& filename, long type, int index )
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
-        return FALSE;
+        return false;
     }
 #else // !wxUSE_STREAMS
-    return FALSE;
+    return false;
 #endif // wxUSE_STREAMS
 }
 
@@ -1057,10 +1134,10 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
-        return FALSE;
+        return false;
     }
 #else // !wxUSE_STREAMS
-    return FALSE;
+    return false;
 #endif // wxUSE_STREAMS
 }
 
@@ -1074,12 +1151,12 @@ bool wxImage::SaveFile( const wxString& filename ) const
     if (pHandler)
     {
         SaveFile(filename, pHandler->GetType());
-        return TRUE;
+        return true;
     }
 
     wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
 
-    return FALSE;
+    return false;
 }
 
 bool wxImage::SaveFile( const wxString& filename, int type ) const
@@ -1096,7 +1173,7 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const
     }
 #endif // wxUSE_STREAMS
 
-    return FALSE;
+    return false;
 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
@@ -1113,7 +1190,7 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) con
     }
 #endif // wxUSE_STREAMS
 
-    return FALSE;
+    return false;
 }
 
 bool wxImage::CanRead( const wxString &name )
@@ -1122,7 +1199,7 @@ bool wxImage::CanRead( const wxString &name )
   wxFileInputStream stream(name);
   return CanRead(stream);
 #else
-  return FALSE;
+  return false;
 #endif
 }
 
@@ -1143,14 +1220,14 @@ bool wxImage::CanRead( wxInputStream &stream )
 {
     const wxList& list = GetHandlers();
 
-    for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 int wxImage::GetImageCount( wxInputStream &stream, long type )
@@ -1161,7 +1238,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     {
         wxList &list=GetHandlers();
 
-        for (wxList::Node *node = list.GetFirst(); node; node = node->GetNext())
+        for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
@@ -1178,7 +1255,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     if ( !handler )
     {
         wxLogWarning(_("No image handler for type %d defined."), type);
-        return FALSE;
+        return false;
     }
 
     if ( handler->CanRead(stream) )
@@ -1204,16 +1281,16 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
     {
         wxList &list=GetHandlers();
 
-        for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+        for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
-                 return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+                 return handler->LoadFile(this, stream, true/*verbose*/, index);
 
         }
 
         wxLogWarning( _("No handler found for image type.") );
-        return FALSE;
+        return false;
     }
 
     handler = FindHandler(type);
@@ -1222,10 +1299,10 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 
-        return FALSE;
+        return false;
     }
 
-    return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+    return handler->LoadFile(this, stream, true/*verbose*/, index);
 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
@@ -1240,15 +1317,15 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
-        return FALSE;
+        return false;
     }
 
-    return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
+    return handler->LoadFile( this, stream, true/*verbose*/, index );
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
 
     wxImageHandler *handler = FindHandler(type);
 
@@ -1256,7 +1333,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 
-        return FALSE;
+        return false;
     }
 
     return handler->SaveFile( (wxImage*)this, stream );
@@ -1264,7 +1341,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 
@@ -1272,7 +1349,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
-        return FALSE;
+        return false;
     }
 
     return handler->SaveFile( (wxImage*)this, stream );
@@ -1281,9 +1358,6 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 
 void wxImage::AddHandler( wxImageHandler *handler )
 {
-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
-
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {
@@ -1305,9 +1379,6 @@ void wxImage::AddHandler( wxImageHandler *handler )
 
 void wxImage::InsertHandler( wxImageHandler *handler )
 {
-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
-
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {
@@ -1328,15 +1399,16 @@ bool wxImage::RemoveHandler( const wxString& name )
     if (handler)
     {
         sm_handlers.DeleteObject(handler);
-        return TRUE;
+        delete handler;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {
-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
@@ -1349,7 +1421,7 @@ wxImageHandler *wxImage::FindHandler( const wxString& name )
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {
-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
@@ -1363,7 +1435,7 @@ wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {
-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
@@ -1375,11 +1447,11 @@ wxImageHandler *wxImage::FindHandler( long bitmapType )
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {
-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
-        if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
+        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
         node = node->GetNext();
     }
     return 0;
@@ -1394,15 +1466,33 @@ void wxImage::InitStandardHandlers()
 
 void wxImage::CleanUpHandlers()
 {
-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
-        wxNode *next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();
         delete handler;
-        delete node;
         node = next;
     }
+
+    sm_handlers.Clear();
+}
+
+wxString wxImage::GetImageExtWildcard()
+{
+    wxString fmts;
+
+    wxList& Handlers = wxImage::GetHandlers();
+    wxList::compatibility_iterator Node = Handlers.GetFirst();
+    while ( Node )
+    {
+        wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
+        fmts += wxT("*.") + Handler->GetExtension();
+        Node = Node->GetNext();
+        if ( Node ) fmts += wxT(";");
+    }
+
+    return wxT("(") + fmts + wxT(")|") + fmts;
 }
 
 //-----------------------------------------------------------------------------
@@ -1414,12 +1504,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
 #if wxUSE_STREAMS
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
 {
-    return FALSE;
+    return false;
 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
 {
-    return FALSE;
+    return false;
 }
 
 int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
@@ -1437,16 +1527,16 @@ bool wxImageHandler::CanRead( const wxString& name )
 
     wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
 
-    return FALSE;
+    return false;
 }
 
 bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 {
-    off_t posOld = stream.TellI();
+    wxFileOffset posOld = stream.TellI();
     if ( posOld == wxInvalidOffset )
     {
         // can't test unseekable stream
-        return FALSE;
+        return false;
     }
 
     bool ok = DoCanRead(stream);
@@ -1457,7 +1547,7 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
         wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
 
         // reading would fail anyhow as we're not at the right position
-        return FALSE;
+        return false;
     }
 
     return ok;
@@ -1465,37 +1555,6 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 
 #endif // wxUSE_STREAMS
 
-
-
-//-----------------------------------------------------------------------------
-// Deprecated wxBitmap conversion routines
-//-----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-
-#ifdef __WXGTK__
-wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
-{
-    wxImage mono = this->ConvertToMono( red, green, blue );
-    wxBitmap bitmap( mono, 1 );
-    return bitmap;
-}
-#endif
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap( *this );
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    *this = bitmap.ConvertToImage();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-
-
 // ----------------------------------------------------------------------------
 // image histogram stuff
 // ----------------------------------------------------------------------------
@@ -1524,8 +1583,8 @@ wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
                 b2++;
                 if ( b2 >= 255 )
                 {
-                    wxLogError(_("GetUnusedColour:: No Unused Color in image ") );
-                    return FALSE;
+                    wxLogError(_("No unused colour in image.") );
+                    return false;
                 }
             }
         }
@@ -1540,7 +1599,7 @@ wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
     if ( b )
         *b = b2;
 
-    return TRUE;
+    return true;
 }
 
 bool
@@ -1661,14 +1720,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     int i;
     angle = -angle;     // screen coordinates are a mirror image of "real" coordinates
 
+    bool has_alpha = HasAlpha();
+
     // Create pointer-based array to accelerate access to wxImage's data
     unsigned char ** data = new unsigned char * [GetHeight()];
-
     data[0] = GetData();
-
     for (i = 1; i < GetHeight(); i++)
         data[i] = data[i - 1] + (3 * GetWidth());
 
+    // Same for alpha channel
+    unsigned char ** alpha = NULL;
+    if (has_alpha)
+    {
+        alpha = new unsigned char * [GetHeight()];
+        alpha[0] = GetAlpha();
+        for (i = 1; i < GetHeight(); i++)
+            alpha[i] = alpha[i - 1] + GetWidth();
+    }
+
     // precompute coefficients for rotation formula
     // (sine and cosine of the angle)
     const double cos_angle = cos(angle);
@@ -1690,7 +1759,11 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
     int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
 
-    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
+    // Create rotated image
+    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1, false);
+    // With alpha channel
+    if (has_alpha)
+        rotated.SetAlpha();
 
     if (offset_after_rotation != NULL)
     {
@@ -1703,6 +1776,10 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     //
     unsigned char * dst = rotated.GetData();
 
+    unsigned char * alpha_dst = NULL;
+    if (has_alpha)
+        alpha_dst = rotated.GetAlpha();
+
     // GRG: if the original image has a mask, use its RGB values
     //      as the blank pixel, else, fall back to default (black).
     //
@@ -1788,28 +1865,52 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                         unsigned char *p = data[y1] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                        {
+                            unsigned char *p = alpha[y1] + x1;
+                            *(alpha_dst++) = *p;
+                        }
                     }
                     else if (d2 < gs_Epsilon)
                     {
                         unsigned char *p = data[y1] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                        {
+                            unsigned char *p = alpha[y1] + x2;
+                            *(alpha_dst++) = *p;
+                        }
                     }
                     else if (d3 < gs_Epsilon)
                     {
                         unsigned char *p = data[y2] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                        {
+                            unsigned char *p = alpha[y2] + x2;
+                            *(alpha_dst++) = *p;
+                        }
                     }
                     else if (d4 < gs_Epsilon)
                     {
                         unsigned char *p = data[y2] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                        {
+                            unsigned char *p = alpha[y2] + x1;
+                            *(alpha_dst++) = *p;
+                        }
                     }
                     else
                     {
@@ -1832,9 +1933,22 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                                w3 * *(v3++) + w4 * *(v4++)) /
                               (w1 + w2 + w3 + w4) );
                         *(dst++) = (unsigned char)
-                            ( (w1 * *(v1++) + w2 * *(v2++) +
-                               w3 * *(v3++) + w4 * *(v4++)) /
+                            ( (w1 * *v1 + w2 * *v2 +
+                               w3 * *v3 + w4 * *v4) /
                               (w1 + w2 + w3 + w4) );
+
+                        if (has_alpha)
+                        {
+                            unsigned char *v1 = alpha[y1] + (x1);
+                            unsigned char *v2 = alpha[y1] + (x2);
+                            unsigned char *v3 = alpha[y2] + (x2);
+                            unsigned char *v4 = alpha[y2] + (x1);
+
+                            *(alpha_dst++) = (unsigned char)
+                                ( (w1 * *v1 + w2 * *v2 +
+                                   w3 * *v3 + w4 * *v4) /
+                                  (w1 + w2 + w3 + w4) );
+                        }
                     }
                 }
                 else
@@ -1842,6 +1956,9 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     *(dst++) = blank_r;
                     *(dst++) = blank_g;
                     *(dst++) = blank_b;
+
+                    if (has_alpha)
+                        *(alpha_dst++) = 0;
                 }
             }
         }
@@ -1863,13 +1980,22 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     unsigned char *p = data[ys] + (3 * xs);
                     *(dst++) = *(p++);
                     *(dst++) = *(p++);
-                    *(dst++) = *(p++);
+                    *(dst++) = *p;
+
+                    if (has_alpha)
+                    {
+                        unsigned char *p = alpha[ys] + (xs);
+                        *(alpha_dst++) = *p;
+                    }
                 }
                 else
                 {
                     *(dst++) = blank_r;
                     *(dst++) = blank_g;
                     *(dst++) = blank_b;
+
+                    if (has_alpha)
+                        *(alpha_dst++) = 255;
                 }
             }
         }
@@ -1877,6 +2003,9 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
 
     delete [] data;
 
+    if (has_alpha)
+        delete [] alpha;
+
     return rotated;
 }
 
@@ -1893,7 +2022,7 @@ class wxImageModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; };
     void OnExit() { wxImage::CleanUpHandlers(); };
 };