fixing osx_carbon

[wxWidgets.git] / src / common / image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index ffdf89c740b091a153791b0a31f5a83adf839385..0cb1adf7886f143d508fd58617e1b0260fbb89fa 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        image.cpp
+// Name:        src/common/image.cpp

 // Purpose:     wxImage
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     wxImage
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "image.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -18,2839 +14,3053 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_IMAGE
+

 #include "wx/image.h"
 #include "wx/image.h"

-#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
-#include "wx/filefn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/hash.h"
+    #include "wx/utils.h"
+    #include "wx/math.h"
+    #include "wx/module.h"
+    #include "wx/palette.h"
+    #include "wx/intl.h"
+    #include "wx/colour.h"
+#endif
+

 #include "wx/wfstream.h"
 #include "wx/wfstream.h"

-#include "wx/intl.h"
-#include "wx/module.h"
+#include "wx/xpmdecod.h"

 
 // For memcpy
 #include <string.h>
 
 // For memcpy
 #include <string.h>

-#include <math.h>

 
 

-#ifdef __SALFORDC__
-    #undef FAR
+// make the code compile with either wxFile*Stream or wxFFile*Stream:
+#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
+
+#if HAS_FILE_STREAMS
+    #if wxUSE_FFILE
+        typedef wxFFileInputStream wxImageFileInputStream;
+        typedef wxFFileOutputStream wxImageFileOutputStream;
+    #elif wxUSE_FILE
+        typedef wxFileInputStream wxImageFileInputStream;
+        typedef wxFileOutputStream wxImageFileOutputStream;
+    #endif // wxUSE_FILE/wxUSE_FFILE
+#endif // HAS_FILE_STREAMS
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxImage,WXDLLEXPORT)

 #endif
 
 #endif
 

-#ifdef __WXMSW__
-    #include "wx/msw/private.h"
-#endif
+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+wxList wxImage::sm_handlers;
+wxImage wxNullImage;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxImage
+// wxImageRefData

 //-----------------------------------------------------------------------------
 
 class wxImageRefData: public wxObjectRefData
 {
 public:
     wxImageRefData();
 //-----------------------------------------------------------------------------
 
 class wxImageRefData: public wxObjectRefData
 {
 public:
     wxImageRefData();

-    ~wxImageRefData();
+    virtual ~wxImageRefData();

 
     int             m_width;
     int             m_height;
 
     int             m_width;
     int             m_height;

+    wxBitmapType    m_type;

     unsigned char  *m_data;
     unsigned char  *m_data;

+

     bool            m_hasMask;
     unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
     bool            m_hasMask;
     unsigned char   m_maskRed,m_maskGreen,m_maskBlue;

+
+    // alpha channel data, may be NULL for the formats without alpha support
+    unsigned char  *m_alpha;
+

     bool            m_ok;
     bool            m_ok;

+
+    // if true, m_data is pointer to static data and shouldn't be freed

     bool            m_static;
     bool            m_static;

+
+    // same as m_static but for m_alpha
+    bool            m_staticAlpha;
+
+#if wxUSE_PALETTE

     wxPalette       m_palette;
     wxPalette       m_palette;

+#endif // wxUSE_PALETTE
+

     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;

+
+    wxDECLARE_NO_COPY_CLASS(wxImageRefData);

 };
 
 wxImageRefData::wxImageRefData()
 {
     m_width = 0;
     m_height = 0;
 };
 
 wxImageRefData::wxImageRefData()
 {
     m_width = 0;
     m_height = 0;

-    m_data = (unsigned char*) NULL;
-    m_ok = FALSE;
+    m_type = wxBITMAP_TYPE_INVALID;
+    m_data =
+    m_alpha = (unsigned char *) NULL;
+

     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;
     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;

-    m_hasMask = FALSE;
-    m_static = FALSE;
+    m_hasMask = false;
+
+    m_ok = false;
+    m_static =
+    m_staticAlpha = false;

 }
 
 wxImageRefData::~wxImageRefData()
 {
 }
 
 wxImageRefData::~wxImageRefData()
 {

-    if (m_data && !m_static)
+    if ( !m_static )

         free( m_data );
         free( m_data );

+    if ( !m_staticAlpha )
+        free( m_alpha );

 }
 
 }
 

-wxList wxImage::sm_handlers;

 
 

+//-----------------------------------------------------------------------------
+// wxImage

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#define M_IMGDATA ((wxImageRefData *)m_refData)
+#define M_IMGDATA static_cast<wxImageRefData*>(m_refData)

 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 

-wxImage::wxImage()
+bool wxImage::Create(const char* const* xpmData)

 {
 {

-}
+#if wxUSE_XPM
+    UnRef();

 
 

-wxImage::wxImage( int width, int height )
-{
-    Create( width, height );
+    wxXPMDecoder decoder;
+    (*this) = decoder.ReadData(xpmData);
+    return IsOk();
+#else
+    return false;
+#endif

 }
 
 }
 

-wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
+bool wxImage::Create( int width, int height, bool clear )

 {
 {

-    Create( width, height, data, static_data );
-}
+    UnRef();

 
 

-wxImage::wxImage( const wxString& name, long type )
-{
-    LoadFile( name, type );
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
+    if (!M_IMGDATA->m_data)
+    {
+        UnRef();
+        return false;
+    }
+
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+
+    if (clear)
+    {
+        Clear();
+    }
+
+    return true;

 }
 
 }
 

-wxImage::wxImage( const wxString& name, const wxString& mimetype )
+bool wxImage::Create( int width, int height, unsigned char* data, bool static_data )

 {
 {

-    LoadFile( name, mimetype );
+    UnRef();
+
+    wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") );
+
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = data;
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;

 }
 
 }
 

-#if wxUSE_STREAMS
-wxImage::wxImage( wxInputStream& stream, long type )
+bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )

 {
 {

-    LoadFile( stream, type );
+    UnRef();
+
+    wxCHECK_MSG( data, false, wxT("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;
+    M_IMGDATA->m_staticAlpha = static_data;
+
+    return true;

 }
 
 }
 

-wxImage::wxImage( wxInputStream& stream, const wxString& mimetype )
+void wxImage::Destroy()

 {
 {

-    LoadFile( stream, mimetype );
+    UnRef();

 }
 }

-#endif // wxUSE_STREAMS

 
 

-wxImage::wxImage( const wxImage& image )
+void wxImage::Clear(unsigned char value)

 {
 {

-    Ref(image);
+    memset(M_IMGDATA->m_data, value, M_IMGDATA->m_width*M_IMGDATA->m_height*3);

 }
 
 }
 

-wxImage::wxImage( const wxImage* image )
+wxObjectRefData* wxImage::CreateRefData() const

 {
 {

-    if (image) Ref(*image);
+    return new wxImageRefData;

 }
 
 }
 

-void wxImage::Create( int width, int height )
+wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const

 {
 {

-    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;
+    const wxImageRefData* refData = static_cast<const wxImageRefData*>(that);
+    wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );

 
 

-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-    }
-    else
+    wxImageRefData* refData_new = new wxImageRefData;
+    refData_new->m_width = refData->m_width;
+    refData_new->m_height = refData->m_height;
+    refData_new->m_maskRed = refData->m_maskRed;
+    refData_new->m_maskGreen = refData->m_maskGreen;
+    refData_new->m_maskBlue = refData->m_maskBlue;
+    refData_new->m_hasMask = refData->m_hasMask;
+    refData_new->m_ok = true;
+    unsigned size = unsigned(refData->m_width) * unsigned(refData->m_height);
+    if (refData->m_alpha != NULL)

     {
     {

-        UnRef();
+        refData_new->m_alpha = (unsigned char*)malloc(size);
+        memcpy(refData_new->m_alpha, refData->m_alpha, size);

     }
     }

+    size *= 3;
+    refData_new->m_data = (unsigned char*)malloc(size);
+    memcpy(refData_new->m_data, refData->m_data, size);
+#if wxUSE_PALETTE
+    refData_new->m_palette = refData->m_palette;
+#endif
+    refData_new->m_optionNames = refData->m_optionNames;
+    refData_new->m_optionValues = refData->m_optionValues;
+    return refData_new;

 }
 
 }
 

-void wxImage::Create( int width, int height, unsigned char* data, bool static_data )
+// returns a new image with the same dimensions, alpha, and mask as *this
+// if on_its_side is true, width and height are swapped
+wxImage wxImage::MakeEmptyClone(int flags) const

 {
 {

-    UnRef();
+    wxImage image;

 
 

-    m_refData = new wxImageRefData();
+    wxCHECK_MSG( IsOk(), image, wxS("invalid image") );

 
 

-    M_IMGDATA->m_data = data;
-    if (M_IMGDATA->m_data)
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    if ( flags & Clone_SwapOrientation )
+        wxSwap( width, height );
+
+    if ( !image.Create( width, height, false ) )

     {
     {

-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-        M_IMGDATA->m_static = static_data;
+        wxFAIL_MSG( wxS("unable to create image") );
+        return image;

     }
     }

-    else
+
+    if ( M_IMGDATA->m_alpha )

     {
     {

-        UnRef();
+        image.SetAlpha();
+        wxCHECK2_MSG( image.GetAlpha(), return wxImage(),
+                      wxS("unable to create alpha channel") );

     }
     }

-}

 
 

-void wxImage::Destroy()
-{
-    UnRef();
+    if ( M_IMGDATA->m_hasMask )
+    {
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                             M_IMGDATA->m_maskGreen,
+                             M_IMGDATA->m_maskBlue );
+    }
+
+    return image;

 }
 
 wxImage wxImage::Copy() const
 {
     wxImage image;
 
 }
 
 wxImage wxImage::Copy() const
 {
     wxImage image;
 

-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
-
-    char unsigned *data = image.GetData();
-
-    wxCHECK_MSG( data, image, wxT("unable to create image") );
-
-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );

 
 

-    memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
+    image.m_refData = CloneRefData(m_refData);

 
     return image;
 }
 
 
     return image;
 }
 

-wxImage wxImage::Scale( int width, int height ) const
+wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const

 {
 {

+    if( xFactor == 1 && yFactor == 1 )
+        return *this;
+

     wxImage image;
 
     wxImage image;
 

-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );

 
 

-    wxCHECK_MSG( (width > 0) && (height > 0), image, wxT("invalid image size") );
+    // can't scale to/from 0 size
+    wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,
+                 wxT("invalid new image size") );

 
 

-    image.Create( width, height );
+    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, false );

 
     char unsigned *data = image.GetData();
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     char unsigned *data = image.GetData();
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-
-    long old_height = M_IMGDATA->m_height;
-    long old_width  = M_IMGDATA->m_width;
+    bool hasMask = false ;
+    unsigned char maskRed = 0;
+    unsigned char maskGreen = 0;
+    unsigned char maskBlue = 0 ;

 
 

-    char unsigned *source_data = M_IMGDATA->m_data;
-    char unsigned *target_data = data;
+    const unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data;
+    const unsigned char *source_alpha = 0 ;
+    unsigned char *target_alpha = 0 ;
+    if (M_IMGDATA->m_hasMask)
+    {
+        hasMask = true ;
+        maskRed = M_IMGDATA->m_maskRed;
+        maskGreen = M_IMGDATA->m_maskGreen;
+        maskBlue =M_IMGDATA->m_maskBlue ;

 
 

-    for (long j = 0; j < height; j++)
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                             M_IMGDATA->m_maskGreen,
+                             M_IMGDATA->m_maskBlue );
+    }
+    else

     {
     {

-        long y_offset = (j * old_height / height) * old_width;
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )
+        {
+            image.SetAlpha() ;
+            target_alpha = image.GetAlpha() ;
+        }
+    }

 
 

-        for (long i = 0; i < width; i++)
+    for (long y = 0; y < height; y++)
+    {
+        for (long x = 0; x < width; x++)

         {
         {

-            memcpy( target_data,
-                source_data + 3*(y_offset + ((i * old_width )/ width)),
-                3 );
-            target_data += 3;
+            unsigned long avgRed = 0 ;
+            unsigned long avgGreen = 0;
+            unsigned long avgBlue = 0;
+            unsigned long avgAlpha = 0 ;
+            unsigned long counter = 0 ;
+            // determine average
+            for ( int y1 = 0 ; y1 < yFactor ; ++y1 )
+            {
+                long y_offset = (y * yFactor + y1) * old_width;
+                for ( int x1 = 0 ; x1 < xFactor ; ++x1 )
+                {
+                    const unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;
+                    unsigned char red = pixel[0] ;
+                    unsigned char green = pixel[1] ;
+                    unsigned char blue = pixel[2] ;
+                    unsigned char alpha = 255  ;
+                    if ( source_alpha )
+                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                    if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                    {
+                        if ( alpha > 0 )
+                        {
+                            avgRed += red ;
+                            avgGreen += green ;
+                            avgBlue += blue ;
+                        }
+                        avgAlpha += alpha ;
+                        counter++ ;
+                    }
+                }
+            }
+            if ( counter == 0 )
+            {
+                *(target_data++) = M_IMGDATA->m_maskRed ;
+                *(target_data++) = M_IMGDATA->m_maskGreen ;
+                *(target_data++) = M_IMGDATA->m_maskBlue ;
+            }
+            else
+            {
+                if ( source_alpha )
+                    *(target_alpha++) = (unsigned char)(avgAlpha / counter ) ;
+                *(target_data++) = (unsigned char)(avgRed / counter);
+                *(target_data++) = (unsigned char)(avgGreen / counter);
+                *(target_data++) = (unsigned char)(avgBlue / counter);
+            }

         }
     }
 
         }
     }
 

+    // In case this is a cursor, make sure the hotspot is scaled accordingly:
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y))/yFactor);
+

     return image;
 }
 
     return image;
 }
 

-wxImage wxImage::Rotate90( bool clockwise ) const
+wxImage
+wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const

 {
     wxImage image;
 
 {
     wxImage image;
 

-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );

 
 

-    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
+    // can't scale to/from 0 size
+    wxCHECK_MSG( (width > 0) && (height > 0), image,
+                 wxT("invalid new image size") );

 
 

-    char unsigned *data = image.GetData();
+    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") );

 
 

-    wxCHECK_MSG( data, image, wxT("unable to create image") );
+    // If the image's new width and height are the same as the original, no
+    // need to waste time or CPU cycles
+    if ( old_width == width && old_height == height )
+        return *this;

 
 

-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    if (quality == wxIMAGE_QUALITY_HIGH)
+    {
+        quality = (width < old_width && height < old_height)
+            ? wxIMAGE_QUALITY_BOX_AVERAGE
+            : wxIMAGE_QUALITY_BICUBIC;
+    }

 
 

-    long height = M_IMGDATA->m_height;
-    long width  = M_IMGDATA->m_width;
+    // Resample the image using the method as specified.
+    switch ( quality )
+    {
+        case wxIMAGE_QUALITY_NEAREST:
+            if ( old_width % width == 0 && old_width >= width &&
+                old_height % height == 0 && old_height >= height )
+            {
+                return ShrinkBy( old_width / width , old_height / height );
+            }

 
 

-    char unsigned *source_data = M_IMGDATA->m_data;
-    char unsigned *target_data;
+            image = ResampleNearest(width, height);
+            break;

 
 

-    for (long j = 0; j < height; j++)
+        case wxIMAGE_QUALITY_BILINEAR:
+            image = ResampleBilinear(width, height);
+            break;
+
+        case wxIMAGE_QUALITY_BICUBIC:
+            image = ResampleBicubic(width, height);
+            break;
+
+        case wxIMAGE_QUALITY_BOX_AVERAGE:
+            image = ResampleBox(width, height);
+            break;
+    }
+
+    // If the original image has a mask, apply the mask to the new image
+    if (M_IMGDATA->m_hasMask)

     {
     {

-        for (long i = 0; i < width; i++)
-        {
-            if (clockwise)
-                target_data = data + (((i+1)*height) - j - 1)*3;
-            else
-                target_data = data + ((height*(width-1)) + j - (i*height))*3;
-            memcpy( target_data, source_data, 3 );
-            source_data += 3;
-        }
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                            M_IMGDATA->m_maskGreen,
+                            M_IMGDATA->m_maskBlue );

     }
 
     }
 

+    // In case this is a cursor, make sure the hotspot is scaled accordingly:
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
+

     return image;
 }
 
     return image;
 }
 

-wxImage wxImage::Mirror( bool horizontally ) const
+wxImage wxImage::ResampleNearest(int width, int height) const

 {
     wxImage image;
 {
     wxImage image;

+    image.Create( width, height, false );

 
 

-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
-
-    char unsigned *data = image.GetData();
+    unsigned char *data = image.GetData();

 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-
-    long height = M_IMGDATA->m_height;
-    long width  = M_IMGDATA->m_width;
-
-    char unsigned *source_data = M_IMGDATA->m_data;
-    char unsigned *target_data;
+    const unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data;
+    const unsigned char *source_alpha = 0 ;
+    unsigned char *target_alpha = 0 ;

 
 

-    if (horizontally)
+    if ( !M_IMGDATA->m_hasMask )

     {
     {

-        for (long j = 0; j < height; j++)
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )

         {
         {

-            data += width*3;
-            target_data = data-3;
-            for (long i = 0; i < width; i++)
-            {
-                memcpy( target_data, source_data, 3 );
-                source_data += 3;
-                target_data -= 3;
-            }
+            image.SetAlpha() ;
+            target_alpha = image.GetAlpha() ;

         }
     }
         }
     }

-    else
+
+    long old_height = M_IMGDATA->m_height,
+         old_width  = M_IMGDATA->m_width;
+    long x_delta = (old_width<<16) / width;
+    long y_delta = (old_height<<16) / height;
+
+    unsigned char* dest_pixel = target_data;
+
+    long y = 0;
+    for ( long j = 0; j < height; j++ )

     {
     {

-        for (long i = 0; i < height; i++)
+        const unsigned char* src_line = &source_data[(y>>16)*old_width*3];
+        const unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;
+
+        long x = 0;
+        for ( long i = 0; i < width; i++ )

         {
         {

-            target_data = data + 3*width*(height-1-i);
-            memcpy( target_data, source_data, (size_t)3*width );
-            source_data += 3*width;
+            const unsigned char* src_pixel = &src_line[(x>>16)*3];
+            const unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;
+            dest_pixel[0] = src_pixel[0];
+            dest_pixel[1] = src_pixel[1];
+            dest_pixel[2] = src_pixel[2];
+            dest_pixel += 3;
+            if ( source_alpha )
+                *(target_alpha++) = *src_alpha_pixel ;
+            x += x_delta;

         }
         }

+
+        y += y_delta;

     }
 
     return image;
 }
 
     }
 
     return image;
 }
 

-wxImage wxImage::GetSubImage( const wxRect &rect ) const
+wxImage wxImage::ResampleBox(int width, int height) const

 {
 {

-    wxImage image;
+    // This function implements a simple pre-blur/box averaging method for
+    // downsampling that gives reasonably smooth results To scale the image
+    // down we will need to gather a grid of pixels of the size of the scale
+    // factor in each direction and then do an averaging of the pixels.

 
 

-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+    wxImage ret_image(width, height, false);

 
 

-    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
-                 image, wxT("invalid subimage size") );
+    const double scale_factor_x = double(M_IMGDATA->m_width) / width;
+    const double scale_factor_y = double(M_IMGDATA->m_height) / height;

 
 

-    int subwidth=rect.GetWidth();
-    const int subheight=rect.GetHeight();
+    const int scale_factor_x_2 = (int)(scale_factor_x / 2);
+    const int scale_factor_y_2 = (int)(scale_factor_y / 2);

 
 

-    image.Create( subwidth, subheight );
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* dst_alpha = NULL;

 
 

-    char unsigned *subdata = image.GetData(), *data=GetData();
+    if ( src_alpha )
+    {
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();
+    }

 
 

-    wxCHECK_MSG( subdata, image, wxT("unable to create image") );
+    int averaged_pixels, src_pixel_index;
+    double sum_r, sum_g, sum_b, sum_a;

 
 

-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    for ( int y = 0; y < height; y++ )         // Destination image - Y direction
+    {
+        // Source pixel in the Y direction
+        int src_y = (int)(y * scale_factor_y);

 
 

-    const int subleft=3*rect.GetLeft();
-    const int width=3*GetWidth();
-    subwidth*=3;
+        for ( int x = 0; x < width; x++ )      // Destination image - X direction
+        {
+            // Source pixel in the X direction
+            int src_x = (int)(x * scale_factor_x);

 
 

-    data+=rect.GetTop()*width+subleft;
+            // Box of pixels to average
+            averaged_pixels = 0;
+            sum_r = sum_g = sum_b = sum_a = 0.0;

 
 

-    for (long j = 0; j < subheight; ++j)
-    {
-        memcpy( subdata, data, subwidth);
-        subdata+=subwidth;
-        data+=width;
+            for ( int j = int(src_y - scale_factor_y/2.0 + 1), k = j;
+                  j <= int(src_y + scale_factor_y_2) || j < k + 2;
+                  j++ )
+            {
+                // We don't care to average pixels that don't exist (edges)
+                if ( j < 0 || j > M_IMGDATA->m_height - 1 )
+                    continue;
+
+                for ( int i = int(src_x - scale_factor_x/2.0 + 1), e = i;
+                      i <= src_x + scale_factor_x_2 || i < e + 2;
+                      i++ )
+                {
+                    // Don't average edge pixels
+                    if ( i < 0 || i > M_IMGDATA->m_width - 1 )
+                        continue;
+
+                    // Calculate the actual index in our source pixels
+                    src_pixel_index = j * M_IMGDATA->m_width + i;
+
+                    sum_r += src_data[src_pixel_index * 3 + 0];
+                    sum_g += src_data[src_pixel_index * 3 + 1];
+                    sum_b += src_data[src_pixel_index * 3 + 2];
+                    if ( src_alpha )
+                        sum_a += src_alpha[src_pixel_index];
+
+                    averaged_pixels++;
+                }
+            }
+
+            // Calculate the average from the sum and number of averaged pixels
+            dst_data[0] = (unsigned char)(sum_r / averaged_pixels);
+            dst_data[1] = (unsigned char)(sum_g / averaged_pixels);
+            dst_data[2] = (unsigned char)(sum_b / averaged_pixels);
+            dst_data += 3;
+            if ( src_alpha )
+                *dst_alpha++ = (unsigned char)(sum_a / averaged_pixels);
+        }

     }
 
     }
 

-    return image;
+    return ret_image;

 }
 
 }
 

-void wxImage::Paste( const wxImage &image, int x, int y )
+wxImage wxImage::ResampleBilinear(int width, int height) const

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
-    wxCHECK_RET( image.Ok(), wxT("invalid image") );
-
-    int xx = 0;
-    int yy = 0;
-    int width = image.GetWidth();
-    int height = image.GetHeight();
+    // This function implements a Bilinear algorithm for resampling.
+    wxImage ret_image(width, height, false);
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* dst_alpha = NULL;

 
 

-    if (x < 0)
-    {
-        xx = -x;
-        width += x;
-    }
-    if (y < 0)
+    if ( src_alpha )

     {
     {

-        yy = -y;
-        height += y;
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();

     }
     }

+    double HFactor = double(M_IMGDATA->m_height) / height;
+    double WFactor = double(M_IMGDATA->m_width) / width;

 
 

-    if ((x+xx)+width > M_IMGDATA->m_width)
-        width = M_IMGDATA->m_width - (x+xx);
-    if ((y+yy)+height > M_IMGDATA->m_height)
-        height = M_IMGDATA->m_height - (y+yy);
+    int srcpixymax = M_IMGDATA->m_height - 1;
+    int srcpixxmax = M_IMGDATA->m_width - 1;

 
 

-    if (width < 1) return;
-    if (height < 1) return;
+    double srcpixy, srcpixy1, srcpixy2, dy, dy1;
+    double srcpixx, srcpixx1, srcpixx2, dx, dx1;

 
 

-    if ((!HasMask() && !image.HasMask()) ||
-       ((HasMask() && image.HasMask() &&
-         (GetMaskRed()==image.GetMaskRed()) &&
-         (GetMaskGreen()==image.GetMaskGreen()) &&
-         (GetMaskBlue()==image.GetMaskBlue()))))
-    {
-        width *= 3;
-        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
-        int source_step = image.GetWidth()*3;
+    // initialize alpha values to avoid g++ warnings about possibly
+    // uninitialized variables
+    double r1, g1, b1, a1 = 0;
+    double r2, g2, b2, a2 = 0;

 
 

-        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
-        int target_step = M_IMGDATA->m_width*3;
-        for (int j = 0; j < height; j++)
-        {
-            memcpy( target_data, source_data, width );
-            source_data += source_step;
-            target_data += target_step;
-        }
-        return;
-    }
-    
-    if (!HasMask() && image.HasMask())
+    for ( int dsty = 0; dsty < height; dsty++ )

     {
     {

-        unsigned char r = image.GetMaskRed();
-        unsigned char g = image.GetMaskGreen();
-        unsigned char b = image.GetMaskBlue();
-        
-        width *= 3;
-        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
-        int source_step = image.GetWidth()*3;
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        srcpixy = double(dsty) * HFactor;
+        srcpixy1 = int(srcpixy);
+        srcpixy2 = ( srcpixy1 == srcpixymax ) ? srcpixy1 : srcpixy1 + 1.0;
+        dy = srcpixy - (int)srcpixy;
+        dy1 = 1.0 - dy;

 
 

-        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
-        int target_step = M_IMGDATA->m_width*3;
-        
-        for (int j = 0; j < height; j++)
+
+        for ( int dstx = 0; dstx < width; dstx++ )

         {
         {

-            for (int i = 0; i < width; i+=3)
-            {
-                if ((source_data[i]   != r) && 
-                    (source_data[i+1] != g) && 
-                    (source_data[i+2] != b))
-                {
-                    memcpy( target_data+i, source_data+i, 3 );
-                }
-            } 
-            source_data += source_step;
-            target_data += target_step;
+            // X-axis of pixel to interpolate from
+            srcpixx = double(dstx) * WFactor;
+            srcpixx1 = int(srcpixx);
+            srcpixx2 = ( srcpixx1 == srcpixxmax ) ? srcpixx1 : srcpixx1 + 1.0;
+            dx = srcpixx - (int)srcpixx;
+            dx1 = 1.0 - dx;
+
+            int x_offset1 = srcpixx1 < 0.0 ? 0 : srcpixx1 > srcpixxmax ? srcpixxmax : (int)srcpixx1;
+            int x_offset2 = srcpixx2 < 0.0 ? 0 : srcpixx2 > srcpixxmax ? srcpixxmax : (int)srcpixx2;
+            int y_offset1 = srcpixy1 < 0.0 ? 0 : srcpixy1 > srcpixymax ? srcpixymax : (int)srcpixy1;
+            int y_offset2 = srcpixy2 < 0.0 ? 0 : srcpixy2 > srcpixymax ? srcpixymax : (int)srcpixy2;
+
+            int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1;
+            int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2;
+            int src_pixel_index10 = y_offset2 * M_IMGDATA->m_width + x_offset1;
+            int src_pixel_index11 = y_offset2 * M_IMGDATA->m_width + x_offset2;
+
+            // first line
+            r1 = src_data[src_pixel_index00 * 3 + 0] * dx1 + src_data[src_pixel_index01 * 3 + 0] * dx;
+            g1 = src_data[src_pixel_index00 * 3 + 1] * dx1 + src_data[src_pixel_index01 * 3 + 1] * dx;
+            b1 = src_data[src_pixel_index00 * 3 + 2] * dx1 + src_data[src_pixel_index01 * 3 + 2] * dx;
+            if ( src_alpha )
+                a1 = src_alpha[src_pixel_index00] * dx1 + src_alpha[src_pixel_index01] * dx;
+
+            // second line
+            r2 = src_data[src_pixel_index10 * 3 + 0] * dx1 + src_data[src_pixel_index11 * 3 + 0] * dx;
+            g2 = src_data[src_pixel_index10 * 3 + 1] * dx1 + src_data[src_pixel_index11 * 3 + 1] * dx;
+            b2 = src_data[src_pixel_index10 * 3 + 2] * dx1 + src_data[src_pixel_index11 * 3 + 2] * dx;
+            if ( src_alpha )
+                a2 = src_alpha[src_pixel_index10] * dx1 + src_alpha[src_pixel_index11] * dx;
+
+            // result lines
+
+            dst_data[0] = static_cast<unsigned char>(r1 * dy1 + r2 * dy);
+            dst_data[1] = static_cast<unsigned char>(g1 * dy1 + g2 * dy);
+            dst_data[2] = static_cast<unsigned char>(b1 * dy1 + b2 * dy);
+            dst_data += 3;
+
+            if ( src_alpha )
+                *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy);

         }
     }
         }
     }

+
+    return ret_image;

 }
 
 }
 

-void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
-                       unsigned char r2, unsigned char g2, unsigned char b2 )
+// The following two local functions are for the B-spline weighting of the
+// bicubic sampling algorithm
+static inline double spline_cube(double value)

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
+    return value <= 0.0 ? 0.0 : value * value * value;
+}

 
 

-    char unsigned *data = GetData();
+static inline double spline_weight(double value)
+{
+    return (spline_cube(value + 2) -
+            4 * spline_cube(value + 1) +
+            6 * spline_cube(value) -
+            4 * spline_cube(value - 1)) / 6;
+}

 
 

-    const int w = GetWidth();
-    const int h = GetHeight();
+// This is the bicubic resampling algorithm
+wxImage wxImage::ResampleBicubic(int width, int height) const
+{
+    // This function implements a Bicubic B-Spline algorithm for resampling.
+    // This method is certainly a little slower than wxImage's default pixel
+    // replication method, however for most reasonably sized images not being
+    // upsampled too much on a fairly average CPU this difference is hardly
+    // noticeable and the results are far more pleasing to look at.
+    //
+    // This particular bicubic algorithm does pixel weighting according to a
+    // B-Spline that basically implements a Gaussian bell-like weighting
+    // kernel. Because of this method the results may appear a bit blurry when
+    // upsampling by large factors.  This is basically because a slight
+    // gaussian blur is being performed to get the smooth look of the upsampled
+    // image.
+
+    // Edge pixels: 3-4 possible solutions
+    // - (Wrap/tile) Wrap the image, take the color value from the opposite
+    // side of the image.
+    // - (Mirror)    Duplicate edge pixels, so that pixel at coordinate (2, n),
+    // where n is nonpositive, will have the value of (2, 1).
+    // - (Ignore)    Simply ignore the edge pixels and apply the kernel only to
+    // pixels which do have all neighbours.
+    // - (Clamp)     Choose the nearest pixel along the border. This takes the
+    // border pixels and extends them out to infinity.
+    //
+    // NOTE: below the y_offset and x_offset variables are being set for edge
+    // pixels using the "Mirror" method mentioned above

 
 

-    for (int j = 0; j < h; j++)
-        for (int i = 0; i < w; i++)
+    wxImage ret_image;
+
+    ret_image.Create(width, height, false);
+
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* dst_alpha = NULL;
+
+    if ( src_alpha )
+    {
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();
+    }
+
+    for ( int dsty = 0; dsty < height; dsty++ )
+    {
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        double srcpixy = double(dsty * M_IMGDATA->m_height) / height;
+        double dy = srcpixy - (int)srcpixy;
+
+        for ( int dstx = 0; dstx < width; dstx++ )

         {
         {

-            if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1))
+            // X-axis of pixel to interpolate from
+            double srcpixx = double(dstx * M_IMGDATA->m_width) / width;
+            double dx = srcpixx - (int)srcpixx;
+
+            // Sums for each color channel
+            double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;
+
+            // Here we actually determine the RGBA values for the destination pixel
+            for ( int k = -1; k <= 2; k++ )

             {
             {

-                data[0] = r2;
-                data[1] = g2;
-                data[2] = b2;
+                // Y offset
+                int y_offset = srcpixy + k < 0.0
+                                ? 0
+                                : srcpixy + k >= M_IMGDATA->m_height
+                                       ? M_IMGDATA->m_height - 1
+                                       : (int)(srcpixy + k);
+
+                // Loop across the X axis
+                for ( int i = -1; i <= 2; i++ )
+                {
+                    // X offset
+                    int x_offset = srcpixx + i < 0.0
+                                    ? 0
+                                    : srcpixx + i >= M_IMGDATA->m_width
+                                            ? M_IMGDATA->m_width - 1
+                                            : (int)(srcpixx + i);
+
+                    // Calculate the exact position where the source data
+                    // should be pulled from based on the x_offset and y_offset
+                    int src_pixel_index = y_offset*M_IMGDATA->m_width + x_offset;
+
+                    // Calculate the weight for the specified pixel according
+                    // to the bicubic b-spline kernel we're using for
+                    // interpolation
+                    double
+                        pixel_weight = spline_weight(i - dx)*spline_weight(k - dy);
+
+                    // Create a sum of all velues for each color channel
+                    // adjusted for the pixel's calculated weight
+                    sum_r += src_data[src_pixel_index * 3 + 0] * pixel_weight;
+                    sum_g += src_data[src_pixel_index * 3 + 1] * pixel_weight;
+                    sum_b += src_data[src_pixel_index * 3 + 2] * pixel_weight;
+                    if ( src_alpha )
+                        sum_a += src_alpha[src_pixel_index] * pixel_weight;
+                }

             }
             }

-            data += 3;
+
+            // Put the data into the destination image.  The summed values are
+            // of double data type and are rounded here for accuracy
+            dst_data[0] = (unsigned char)(sum_r + 0.5);
+            dst_data[1] = (unsigned char)(sum_g + 0.5);
+            dst_data[2] = (unsigned char)(sum_b + 0.5);
+            dst_data += 3;
+
+            if ( src_alpha )
+                *dst_alpha++ = (unsigned char)sum_a;

         }
         }

+    }
+
+    return ret_image;

 }
 
 }
 

-void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
+// Blur in the horizontal direction
+wxImage wxImage::BlurHorizontal(int blurRadius) const

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
+    wxImage ret_image(MakeEmptyClone());

 
 

-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
+    wxCHECK( ret_image.IsOk(), ret_image );

 
 

-    wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), wxT("invalid image index") );
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* dst_data = ret_image.GetData();
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_alpha = ret_image.GetAlpha();

 
 

-    long pos = (y * w + x) * 3;
+    // number of pixels we average over
+    const int blurArea = blurRadius*2 + 1;

 
 

-    M_IMGDATA->m_data[ pos   ] = r;
-    M_IMGDATA->m_data[ pos+1 ] = g;
-    M_IMGDATA->m_data[ pos+2 ] = b;
-}
+    // Horizontal blurring algorithm - average all pixels in the specified blur
+    // radius in the X or horizontal direction
+    for ( int y = 0; y < M_IMGDATA->m_height; y++ )
+    {
+        // Variables used in the blurring algorithm
+        long sum_r = 0,
+             sum_g = 0,
+             sum_b = 0,
+             sum_a = 0;

 
 

-unsigned char wxImage::GetRed( int x, int y ) const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+        long pixel_idx;
+        const unsigned char *src;
+        unsigned char *dst;

 
 

-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
+        // Calculate the average of all pixels in the blur radius for the first
+        // pixel of the row
+        for ( int kernel_x = -blurRadius; kernel_x <= blurRadius; kernel_x++ )
+        {
+            // To deal with the pixels at the start of a row so it's not
+            // grabbing GOK values from memory at negative indices of the
+            // image's data or grabbing from the previous row
+            if ( kernel_x < 0 )
+                pixel_idx = y * M_IMGDATA->m_width;
+            else
+                pixel_idx = kernel_x + y * M_IMGDATA->m_width;
+
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+        }

 
 

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
+        dst = dst_data + y * M_IMGDATA->m_width*3;
+        dst[0] = (unsigned char)(sum_r / blurArea);
+        dst[1] = (unsigned char)(sum_g / blurArea);
+        dst[2] = (unsigned char)(sum_b / blurArea);
+        if ( src_alpha )
+            dst_alpha[y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);

 
 

-    long pos = (y * w + x) * 3;
+        // Now average the values of the rest of the pixels by just moving the
+        // blur radius box along the row
+        for ( int x = 1; x < M_IMGDATA->m_width; x++ )
+        {
+            // Take care of edge pixels on the left edge by essentially
+            // duplicating the edge pixel
+            if ( x - blurRadius - 1 < 0 )
+                pixel_idx = y * M_IMGDATA->m_width;
+            else
+                pixel_idx = (x - blurRadius - 1) + y * M_IMGDATA->m_width;
+
+            // Subtract the value of the pixel at the left side of the blur
+            // radius box
+            src = src_data + pixel_idx*3;
+            sum_r -= src[0];
+            sum_g -= src[1];
+            sum_b -= src[2];
+            if ( src_alpha )
+                sum_a -= src_alpha[pixel_idx];
+
+            // Take care of edge pixels on the right edge
+            if ( x + blurRadius > M_IMGDATA->m_width - 1 )
+                pixel_idx = M_IMGDATA->m_width - 1 + y * M_IMGDATA->m_width;
+            else
+                pixel_idx = x + blurRadius + y * M_IMGDATA->m_width;
+
+            // Add the value of the pixel being added to the end of our box
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+
+            // Save off the averaged data
+            dst = dst_data + x*3 + y*M_IMGDATA->m_width*3;
+            dst[0] = (unsigned char)(sum_r / blurArea);
+            dst[1] = (unsigned char)(sum_g / blurArea);
+            dst[2] = (unsigned char)(sum_b / blurArea);
+            if ( src_alpha )
+                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+        }
+    }

 
 

-    return M_IMGDATA->m_data[pos];
+    return ret_image;

 }
 
 }
 

-unsigned char wxImage::GetGreen( int x, int y ) const
+// Blur in the vertical direction
+wxImage wxImage::BlurVertical(int blurRadius) const

 {
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+    wxImage ret_image(MakeEmptyClone());

 
 

-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
+    wxCHECK( ret_image.IsOk(), ret_image );

 
 

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* dst_data = ret_image.GetData();
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_alpha = ret_image.GetAlpha();

 
 

-    long pos = (y * w + x) * 3;
+    // number of pixels we average over
+    const int blurArea = blurRadius*2 + 1;

 
 

-    return M_IMGDATA->m_data[pos+1];
-}
+    // Vertical blurring algorithm - same as horizontal but switched the
+    // opposite direction
+    for ( int x = 0; x < M_IMGDATA->m_width; x++ )
+    {
+        // Variables used in the blurring algorithm
+        long sum_r = 0,
+             sum_g = 0,
+             sum_b = 0,
+             sum_a = 0;

 
 

-unsigned char wxImage::GetBlue( int x, int y ) const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+        long pixel_idx;
+        const unsigned char *src;
+        unsigned char *dst;

 
 

-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
+        // Calculate the average of all pixels in our blur radius box for the
+        // first pixel of the column
+        for ( int kernel_y = -blurRadius; kernel_y <= blurRadius; kernel_y++ )
+        {
+            // To deal with the pixels at the start of a column so it's not
+            // grabbing GOK values from memory at negative indices of the
+            // image's data or grabbing from the previous column
+            if ( kernel_y < 0 )
+                pixel_idx = x;
+            else
+                pixel_idx = x + kernel_y * M_IMGDATA->m_width;
+
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+        }

 
 

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
+        dst = dst_data + x*3;
+        dst[0] = (unsigned char)(sum_r / blurArea);
+        dst[1] = (unsigned char)(sum_g / blurArea);
+        dst[2] = (unsigned char)(sum_b / blurArea);
+        if ( src_alpha )
+            dst_alpha[x] = (unsigned char)(sum_a / blurArea);

 
 

-    long pos = (y * w + x) * 3;
+        // Now average the values of the rest of the pixels by just moving the
+        // box along the column from top to bottom
+        for ( int y = 1; y < M_IMGDATA->m_height; y++ )
+        {
+            // Take care of pixels that would be beyond the top edge by
+            // duplicating the top edge pixel for the column
+            if ( y - blurRadius - 1 < 0 )
+                pixel_idx = x;
+            else
+                pixel_idx = x + (y - blurRadius - 1) * M_IMGDATA->m_width;
+
+            // Subtract the value of the pixel at the top of our blur radius box
+            src = src_data + pixel_idx*3;
+            sum_r -= src[0];
+            sum_g -= src[1];
+            sum_b -= src[2];
+            if ( src_alpha )
+                sum_a -= src_alpha[pixel_idx];
+
+            // Take care of the pixels that would be beyond the bottom edge of
+            // the image similar to the top edge
+            if ( y + blurRadius > M_IMGDATA->m_height - 1 )
+                pixel_idx = x + (M_IMGDATA->m_height - 1) * M_IMGDATA->m_width;
+            else
+                pixel_idx = x + (blurRadius + y) * M_IMGDATA->m_width;
+
+            // Add the value of the pixel being added to the end of our box
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+
+            // Save off the averaged data
+            dst = dst_data + (x + y * M_IMGDATA->m_width) * 3;
+            dst[0] = (unsigned char)(sum_r / blurArea);
+            dst[1] = (unsigned char)(sum_g / blurArea);
+            dst[2] = (unsigned char)(sum_b / blurArea);
+            if ( src_alpha )
+                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+        }
+    }

 
 

-    return M_IMGDATA->m_data[pos+2];
+    return ret_image;

 }
 
 }
 

-bool wxImage::Ok() const
+// The new blur function
+wxImage wxImage::Blur(int blurRadius) const

 {
 {

-    // image of 0 width or height can't be considered ok - at least because it
-    // causes crashes in ConvertToBitmap() if we don't catch it in time
-    wxImageRefData *data = M_IMGDATA;
-    return data && data->m_ok && data->m_width && data->m_height;
-}
+    wxImage ret_image;
+    ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);

 
 

-char unsigned *wxImage::GetData() const
-{
-    wxCHECK_MSG( Ok(), (char unsigned *)NULL, wxT("invalid image") );
+    // Blur the image in each direction
+    ret_image = BlurHorizontal(blurRadius);
+    ret_image = ret_image.BlurVertical(blurRadius);

 
 

-    return M_IMGDATA->m_data;
+    return ret_image;

 }
 
 }
 

-void wxImage::SetData( char unsigned *data )
+wxImage wxImage::Rotate90( bool clockwise ) const

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
+    wxImage image(MakeEmptyClone(Clone_SwapOrientation));

 
 

-    wxImageRefData *newRefData = new wxImageRefData();
+    wxCHECK( image.IsOk(), image );

 
 

-    newRefData->m_width = M_IMGDATA->m_width;
-    newRefData->m_height = M_IMGDATA->m_height;
-    newRefData->m_data = data;
-    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;
-    newRefData->m_hasMask = M_IMGDATA->m_hasMask;
-
-    UnRef();
-
-    m_refData = newRefData;
-}
-
-void wxImage::SetData( char unsigned *data, int new_width, int new_height )
-{
-    wxImageRefData *newRefData = new wxImageRefData();
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;

 
 

-    if (m_refData)
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )

     {
     {

-        newRefData->m_width = new_width;
-        newRefData->m_height = new_height;
-        newRefData->m_data = data;
-        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;
-        newRefData->m_hasMask = M_IMGDATA->m_hasMask;
+        int hot_x = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_X );
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                        clockwise ? hot_x : width - 1 - hot_x);

     }
     }

-    else
+
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )

     {
     {

-        newRefData->m_width = new_width;
-        newRefData->m_height = new_height;
-        newRefData->m_data = data;
-        newRefData->m_ok = TRUE;
+        int hot_y = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_Y );
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                        clockwise ? height - 1 - hot_y : hot_y);

     }
 
     }
 

-    UnRef();
+    unsigned char *data = image.GetData();
+    unsigned char *target_data;

 
 

-    m_refData = newRefData;
-}
+    // we rotate the image in 21-pixel (63-byte) wide strips
+    // to make better use of cpu cache - memory transfers
+    // (note: while much better than single-pixel "strips",
+    //  our vertical strips will still generally straddle 64-byte cachelines)
+    for (long ii = 0; ii < width; )
+    {
+        long next_ii = wxMin(ii + 21, width);

 
 

-void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
-{
-    wxCHECK_RET( Ok(), wxT("invalid image") );
+        for (long j = 0; j < height; j++)
+        {
+            const unsigned char *source_data
+                                     = M_IMGDATA->m_data + (j*width + ii)*3;

 
 

-    M_IMGDATA->m_maskRed = r;
-    M_IMGDATA->m_maskGreen = g;
-    M_IMGDATA->m_maskBlue = b;
-    M_IMGDATA->m_hasMask = TRUE;
-}
+            for (long i = ii; i < next_ii; i++)
+            {
+                if ( clockwise )
+                {
+                    target_data = data + ((i + 1)*height - j - 1)*3;
+                }
+                else
+                {
+                    target_data = data + (height*(width - 1 - i) + j)*3;
+                }
+                memcpy( target_data, source_data, 3 );
+                source_data += 3;
+            }
+        }

 
 

-unsigned char wxImage::GetMaskRed() const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+        ii = next_ii;
+    }

 
 

-    return M_IMGDATA->m_maskRed;
-}
+    const unsigned char *source_alpha = M_IMGDATA->m_alpha;

 
 

-unsigned char wxImage::GetMaskGreen() const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
-
-    return M_IMGDATA->m_maskGreen;
-}
+    if ( source_alpha )
+    {
+        unsigned char *alpha_data = image.GetAlpha();
+        unsigned char *target_alpha = 0 ;

 
 

-unsigned char wxImage::GetMaskBlue() const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+        for (long ii = 0; ii < width; )
+        {
+            long next_ii = wxMin(ii + 64, width);

 
 

-    return M_IMGDATA->m_maskBlue;
-}
+            for (long j = 0; j < height; j++)
+            {
+                source_alpha = M_IMGDATA->m_alpha + j*width + ii;

 
 

-void wxImage::SetMask( bool mask )
-{
-    wxCHECK_RET( Ok(), wxT("invalid image") );
+                for (long i = ii; i < next_ii; i++)
+                {
+                    if ( clockwise )
+                    {
+                        target_alpha = alpha_data + (i+1)*height - j - 1;
+                    }
+                    else
+                    {
+                        target_alpha = alpha_data + height*(width - i - 1) + j;
+                    }

 
 

-    M_IMGDATA->m_hasMask = mask;
-}
+                    *target_alpha = *source_alpha++;
+                }
+            }

 
 

-bool wxImage::HasMask() const
-{
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+            ii = next_ii;
+        }
+    }

 
 

-    return M_IMGDATA->m_hasMask;
+    return image;

 }
 
 }
 

-int wxImage::GetWidth() const
+wxImage wxImage::Rotate180() const

 {
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+    wxImage image(MakeEmptyClone());

 
 

-    return M_IMGDATA->m_width;
-}
+    wxCHECK( image.IsOk(), image );

 
 

-int wxImage::GetHeight() const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;

 
 

-    return M_IMGDATA->m_height;
-}
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+    {
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                        width - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X));
+    }

 
 

-// Palette functions
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+    {
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                        height - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y));
+    }

 
 

-bool wxImage::HasPalette() const
-{
-    if (!Ok())
-        return FALSE;
+    unsigned char *data = image.GetData();
+    unsigned char *alpha = image.GetAlpha();
+    const unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data + width * height * 3;

 
 

-    return M_IMGDATA->m_palette.Ok();
-}
+    for (long j = 0; j < height; j++)
+    {
+        for (long i = 0; i < width; i++)
+        {
+            target_data -= 3;
+            memcpy( target_data, source_data, 3 );
+            source_data += 3;
+        }
+    }

 
 

-const wxPalette& wxImage::GetPalette() const
-{
-    wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") );
+    if ( alpha )
+    {
+        const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+        unsigned char *dest_alpha = alpha + width * height;

 
 

-    return M_IMGDATA->m_palette;
+        for (long j = 0; j < height; ++j)
+        {
+            for (long i = 0; i < width; ++i)
+            {
+                *(--dest_alpha) = *(src_alpha++);
+            }
+        }
+    }
+
+    return image;

 }
 
 }
 

-void wxImage::SetPalette(const wxPalette& palette)
+wxImage wxImage::Mirror( bool horizontally ) const

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
+    wxImage image(MakeEmptyClone());

 
 

-    M_IMGDATA->m_palette = palette;
-}
+    wxCHECK( image.IsOk(), image );

 
 

-// Option functions (arbitrary name/value mapping)
-void wxImage::SetOption(const wxString& name, const wxString& value)
-{
-    wxCHECK_RET( Ok(), wxT("invalid image") );
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    unsigned char *data = image.GetData();
+    unsigned char *alpha = image.GetAlpha();
+    const unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data;

 
 

-    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
-    if (idx == wxNOT_FOUND)
+    if (horizontally)

     {
     {

-        M_IMGDATA->m_optionNames.Add(name);
-        M_IMGDATA->m_optionValues.Add(value);
+        for (long j = 0; j < height; j++)
+        {
+            data += width*3;
+            target_data = data-3;
+            for (long i = 0; i < width; i++)
+            {
+                memcpy( target_data, source_data, 3 );
+                source_data += 3;
+                target_data -= 3;
+            }
+        }
+
+        if (alpha != NULL)
+        {
+            // src_alpha starts at the first pixel and increases by 1 after each step
+            // (a step here is the copy of the alpha value of one pixel)
+            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+            // dest_alpha starts just beyond the first line, decreases before each step,
+            // and after each line is finished, increases by 2 widths (skipping the line
+            // just copied and the line that will be copied next)
+            unsigned char *dest_alpha = alpha + width;
+
+            for (long jj = 0; jj < height; ++jj)
+            {
+                for (long i = 0; i < width; ++i) {
+                    *(--dest_alpha) = *(src_alpha++); // copy one pixel
+                }
+                dest_alpha += 2 * width; // advance beyond the end of the next line
+            }
+        }

     }
     else
     {
     }
     else
     {

-        M_IMGDATA->m_optionNames[idx] = name;
-        M_IMGDATA->m_optionValues[idx] = value;
+        for (long i = 0; i < height; i++)
+        {
+            target_data = data + 3*width*(height-1-i);
+            memcpy( target_data, source_data, (size_t)3*width );
+            source_data += 3*width;
+        }
+
+        if ( alpha )
+        {
+            // src_alpha starts at the first pixel and increases by 1 width after each step
+            // (a step here is the copy of the alpha channel of an entire line)
+            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+            // dest_alpha starts just beyond the last line (beyond the whole image)
+            // and decreases by 1 width before each step
+            unsigned char *dest_alpha = alpha + width * height;
+
+            for (long jj = 0; jj < height; ++jj)
+            {
+                dest_alpha -= width;
+                memcpy( dest_alpha, src_alpha, (size_t)width );
+                src_alpha += width;
+            }
+        }

     }
     }

-}

 
 

-void wxImage::SetOption(const wxString& name, int value)
-{
-    wxString valStr;
-    valStr.Printf(wxT("%d"), value);
-    SetOption(name, valStr);
+    return image;

 }
 
 }
 

-wxString wxImage::GetOption(const wxString& name) const
+wxImage wxImage::GetSubImage( const wxRect &rect ) const

 {
 {

-    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
+    wxImage image;

 
 

-    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
-    if (idx == wxNOT_FOUND)
-        return wxEmptyString;
-    else
-        return M_IMGDATA->m_optionValues[idx];
-}
+    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );

 
 

-int wxImage::GetOptionInt(const wxString& name) const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) &&
+                 (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+                 image, wxT("invalid subimage size") );

 
 

-    return wxAtoi(GetOption(name));
-}
+    const int subwidth = rect.GetWidth();
+    const int subheight = rect.GetHeight();

 
 

-bool wxImage::HasOption(const wxString& name) const
-{
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    image.Create( subwidth, subheight, false );

 
 

-    return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
-}
+    const unsigned char *src_data = GetData();
+    const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+    unsigned char *subdata = image.GetData();
+    unsigned char *subalpha = NULL;

 
 

-bool wxImage::LoadFile( const wxString& filename, long type )
-{
-#if wxUSE_STREAMS
-    if (wxFileExists(filename))
-    {
-        wxFileInputStream stream(filename);
-        wxBufferedInputStream bstream( stream );
-        return LoadFile(bstream, type);
+    wxCHECK_MSG( subdata, image, wxT("unable to create image") );
+
+    if ( src_alpha ) {
+        image.SetAlpha();
+        subalpha = image.GetAlpha();
+        wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));

     }
     }

-    else
-    {
-        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );

 
 

-        return FALSE;
+    if (M_IMGDATA->m_hasMask)
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+
+    const int width = GetWidth();
+    const int pixsoff = rect.GetLeft() + width * rect.GetTop();
+
+    src_data += 3 * pixsoff;
+    src_alpha += pixsoff; // won't be used if was NULL, so this is ok
+
+    for (long j = 0; j < subheight; ++j)
+    {
+        memcpy( subdata, src_data, 3 * subwidth );
+        subdata += 3 * subwidth;
+        src_data += 3 * width;
+        if (subalpha != NULL) {
+            memcpy( subalpha, src_alpha, subwidth );
+            subalpha += subwidth;
+            src_alpha += width;
+        }

     }
     }

-#else // !wxUSE_STREAMS
-    return FALSE;
-#endif // wxUSE_STREAMS
+
+    return image;

 }
 
 }
 

-bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
+wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
+                       int r_, int g_, int b_ ) const

 {
 {

-#if wxUSE_STREAMS
-    if (wxFileExists(filename))
+    wxImage image;
+
+    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
+    wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") );
+
+    int width = GetWidth(), height = GetHeight();
+    image.Create(size.GetWidth(), size.GetHeight(), false);
+
+    unsigned char r = (unsigned char)r_;
+    unsigned char g = (unsigned char)g_;
+    unsigned char b = (unsigned char)b_;
+    if ((r_ == -1) && (g_ == -1) && (b_ == -1))

     {
     {

-        wxFileInputStream stream(filename);
-        wxBufferedInputStream bstream( stream );
-        return LoadFile(bstream, mimetype);
+        GetOrFindMaskColour( &r, &g, &b );
+        image.SetMaskColour(r, g, b);

     }
     }

-    else
+
+    image.SetRGB(wxRect(), r, g, b);
+
+    // we have two coordinate systems:
+    // source:     starting at 0,0 of source image
+    // destination starting at 0,0 of destination image
+    // Documentation says:
+    // "The image is pasted into a new image [...] at the position pos relative
+    // to the upper left of the new image." this means the transition rule is:
+    // "dest coord" = "source coord" + pos;
+
+    // calculate the intersection using source coordinates:
+    wxRect srcRect(0, 0, width, height);
+    wxRect dstRect(-pos, size);
+
+    srcRect.Intersect(dstRect);
+
+    if (!srcRect.IsEmpty())

     {
     {

-        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+        // insertion point is needed in destination coordinates.
+        // NB: it is not always "pos"!
+        wxPoint ptInsert = srcRect.GetTopLeft() + pos;

 
 

-        return FALSE;
+        if ((srcRect.GetWidth() == width) && (srcRect.GetHeight() == height))
+            image.Paste(*this, ptInsert.x, ptInsert.y);
+        else
+            image.Paste(GetSubImage(srcRect), ptInsert.x, ptInsert.y);

     }
     }

-#else // !wxUSE_STREAMS
-    return FALSE;
-#endif // wxUSE_STREAMS
+
+    return image;

 }
 
 }
 

-bool wxImage::SaveFile( const wxString& filename, int type )
+void wxImage::Paste( const wxImage &image, int x, int y )

 {
 {

-#if wxUSE_STREAMS
-    wxFileOutputStream stream(filename);
+    wxCHECK_RET( IsOk(), wxT("invalid image") );
+    wxCHECK_RET( image.IsOk(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    int xx = 0;
+    int yy = 0;
+    int width = image.GetWidth();
+    int height = image.GetHeight();

 
 

-    if ( stream.LastError() == wxStream_NOERROR )
+    if (x < 0)

     {
     {

-        wxBufferedOutputStream bstream( stream );
-        return SaveFile(bstream, type);
+        xx = -x;
+        width += x;
+    }
+    if (y < 0)
+    {
+        yy = -y;
+        height += y;

     }
     }

-#endif // wxUSE_STREAMS

 
 

-    return FALSE;
-}
+    if ((x+xx)+width > M_IMGDATA->m_width)
+        width = M_IMGDATA->m_width - (x+xx);
+    if ((y+yy)+height > M_IMGDATA->m_height)
+        height = M_IMGDATA->m_height - (y+yy);

 
 

-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
-{
-#if wxUSE_STREAMS
-    wxFileOutputStream stream(filename);
+    if (width < 1) return;
+    if (height < 1) return;

 
 

-    if ( stream.LastError() == wxStream_NOERROR )
+    // If we can, copy the data using memcpy() as this is the fastest way. But
+    // for this  the image being pasted must have "compatible" mask with this
+    // one meaning that either it must not have one at all or it must use the
+    // same masked colour.
+    if ( !image.HasMask() ||
+        ((HasMask() &&
+         (GetMaskRed()==image.GetMaskRed()) &&
+         (GetMaskGreen()==image.GetMaskGreen()) &&
+         (GetMaskBlue()==image.GetMaskBlue()))) )

     {
     {

-        wxBufferedOutputStream bstream( stream );
-        return SaveFile(bstream, mimetype);
+        const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());
+        int source_step = image.GetWidth()*3;
+
+        unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);
+        int target_step = M_IMGDATA->m_width*3;
+        for (int j = 0; j < height; j++)
+        {
+            memcpy( target_data, source_data, width*3 );
+            source_data += source_step;
+            target_data += target_step;
+        }

     }
     }

-#endif // wxUSE_STREAMS

 
 

-    return FALSE;
-}
+    // Copy over the alpha channel from the original image
+    if ( image.HasAlpha() )
+    {
+        if ( !HasAlpha() )
+            InitAlpha();

 
 

-bool wxImage::CanRead( const wxString &name )
-{
-#if wxUSE_STREAMS
-  wxFileInputStream stream(name);
-  return CanRead(stream);
-#else
-  return FALSE;
-#endif
-}
+        const unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth();
+        int source_step = image.GetWidth();

 
 

-#if wxUSE_STREAMS
+        unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width;

 
 

-bool wxImage::CanRead( wxInputStream &stream )
-{
-  wxList &list=GetHandlers();
+        for (int j = 0; j < height; j++,
+                                    source_data += source_step,
+                                    target_data += target_step)
+        {
+            memcpy( target_data, source_data, width );
+        }
+    }

 
 

-  for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+    if (!HasMask() && image.HasMask())

     {
     {

-      wxImageHandler *handler=(wxImageHandler*)node->GetData();
-      if (handler->CanRead( stream ))
-        return TRUE;
-    }
+        unsigned char r = image.GetMaskRed();
+        unsigned char g = image.GetMaskGreen();
+        unsigned char b = image.GetMaskBlue();

 
 

-  return FALSE;
+        const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());
+        int source_step = image.GetWidth()*3;
+
+        unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);
+        int target_step = M_IMGDATA->m_width*3;
+
+        for (int j = 0; j < height; j++)
+        {
+            for (int i = 0; i < width*3; i+=3)
+            {
+                if ((source_data[i]   != r) ||
+                    (source_data[i+1] != g) ||
+                    (source_data[i+2] != b))
+                {
+                    memcpy( target_data+i, source_data+i, 3 );
+                }
+            }
+            source_data += source_step;
+            target_data += target_step;
+        }
+    }

 }
 
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, long type )
+void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
+                       unsigned char r2, unsigned char g2, unsigned char b2 )

 {
 {

-    UnRef();
+    wxCHECK_RET( IsOk(), wxT("invalid image") );

 
 

-    m_refData = new wxImageRefData;
+    AllocExclusive();

 
 

-    wxImageHandler *handler;
+    unsigned char *data = GetData();

 
 

-    if (type==wxBITMAP_TYPE_ANY)
-    {
-        wxList &list=GetHandlers();
+    const int w = GetWidth();
+    const int h = GetHeight();

 
 

-        for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+    for (int j = 0; j < h; j++)
+        for (int i = 0; i < w; i++)

         {
         {

-             handler=(wxImageHandler*)node->GetData();
-             if (handler->CanRead( stream ))
-                 return handler->LoadFile( this, stream );
-
+            if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1))
+            {
+                data[0] = r2;
+                data[1] = g2;
+                data[2] = b2;
+            }
+            data += 3;

         }
         }

+}

 
 

-        wxLogWarning( _("No handler found for image type.") );
-        return FALSE;
-    }
+wxImage wxImage::ConvertToGreyscale(void) const
+{
+    return ConvertToGreyscale(0.299, 0.587, 0.114);
+}

 
 

-    handler = FindHandler(type);
+wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const
+{
+    wxImage image(MakeEmptyClone());
+
+    wxCHECK( image.IsOk(), image );
+
+    const unsigned char *src = M_IMGDATA->m_data;
+    unsigned char *dest = image.GetData();

 
 

-    if (handler == NULL)
+    const bool hasMask = M_IMGDATA->m_hasMask;
+    const unsigned char maskRed = M_IMGDATA->m_maskRed;
+    const unsigned char maskGreen = M_IMGDATA->m_maskGreen;
+    const unsigned char maskBlue = M_IMGDATA->m_maskBlue;
+
+    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    for ( long i = 0; i < size; i++, src += 3, dest += 3 )

     {
     {

-        wxLogWarning( _("No image handler for type %d defined."), type );
+        memcpy(dest, src, 3);
+        // only modify non-masked pixels
+        if ( !hasMask || src[0] != maskRed || src[1] != maskGreen || src[2] != maskBlue )
+        {
+            wxColour::MakeGrey(dest + 0, dest + 1, dest + 2, weight_r, weight_g, weight_b);
+        }
+    }

 
 

-        return FALSE;
+    // copy the alpha channel, if any
+    if ( image.HasAlpha() )
+    {
+        memcpy( image.GetAlpha(), GetAlpha(), GetWidth() * GetHeight() );

     }
 
     }
 

-    return handler->LoadFile( this, stream );
+    return image;

 }
 
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
+wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const

 {
 {

-    UnRef();
+    wxImage image;

 
 

-    m_refData = new wxImageRefData;
+    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );

 
 

-    wxImageHandler *handler = FindHandlerMime(mimetype);
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
 

-    if (handler == NULL)
+    unsigned char *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_hasMask)

     {
     {

-        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+        if (M_IMGDATA->m_maskRed == r && M_IMGDATA->m_maskGreen == g &&
+                                         M_IMGDATA->m_maskBlue == b)
+            image.SetMaskColour( 255, 255, 255 );
+        else
+            image.SetMaskColour( 0, 0, 0 );
+    }
+
+    long size = M_IMGDATA->m_height * M_IMGDATA->m_width;

 
 

-        return FALSE;
+    unsigned char *srcd = M_IMGDATA->m_data;
+    unsigned char *tard = image.GetData();
+
+    for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
+    {
+        bool on = (srcd[0] == r) && (srcd[1] == g) && (srcd[2] == b);
+        wxColourBase::MakeMono(tard + 0, tard + 1, tard + 2, on);

     }
 
     }
 

-    return handler->LoadFile( this, stream );
+    return image;

 }
 
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, int type )
+wxImage wxImage::ConvertToDisabled(unsigned char brightness) const

 {
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+    wxImage image = *this;

 
 

-    wxImageHandler *handler = FindHandler(type);
+    unsigned char mr = image.GetMaskRed();
+    unsigned char mg = image.GetMaskGreen();
+    unsigned char mb = image.GetMaskBlue();
+
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+    bool has_mask = image.HasMask();

 
 

-    if (handler == NULL)
+    for (int y = height-1; y >= 0; --y)

     {
     {

-        wxLogWarning( _("No image handler for type %d defined."), type );
+        for (int x = width-1; x >= 0; --x)
+        {
+            unsigned char* data = image.GetData() + (y*(width*3))+(x*3);
+            unsigned char* r = data;
+            unsigned char* g = data+1;
+            unsigned char* b = data+2;

 
 

-        return FALSE;
-    }
+            if (has_mask && (*r == mr) && (*g == mg) && (*b == mb))
+                continue;

 
 

-    return handler->SaveFile( this, stream );
+            wxColour::MakeDisabled(r, g, b, brightness);
+        }
+    }
+    return image;

 }
 
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
+int wxImage::GetWidth() const

 {
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
-
-    wxImageHandler *handler = FindHandlerMime(mimetype);
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );

 
 

-    if (handler == NULL)
-    {
-        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+    return M_IMGDATA->m_width;
+}

 
 

-        return FALSE;
-    }
+int wxImage::GetHeight() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );

 
 

-    return handler->SaveFile( this, stream );
+    return M_IMGDATA->m_height;

 }
 }

-#endif // wxUSE_STREAMS

 
 

-void wxImage::AddHandler( wxImageHandler *handler )
+wxBitmapType wxImage::GetType() const

 {
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
+    wxCHECK_MSG( IsOk(), wxBITMAP_TYPE_INVALID, wxT("invalid image") );

 
 

-    sm_handlers.Append( handler );
+    return M_IMGDATA->m_type;

 }
 
 }
 

-void wxImage::InsertHandler( wxImageHandler *handler )
+void wxImage::SetType(wxBitmapType type)

 {
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
+    wxCHECK_RET( IsOk(), "must create the image before setting its type");

 
 

-    sm_handlers.Insert( handler );
+    // type can be wxBITMAP_TYPE_INVALID to reset the image type to default
+    wxASSERT_MSG( type != wxBITMAP_TYPE_MAX, "invalid bitmap type" );
+
+    M_IMGDATA->m_type = type;

 }
 
 }
 

-bool wxImage::RemoveHandler( const wxString& name )
+long wxImage::XYToIndex(int x, int y) const

 {
 {

-    wxImageHandler *handler = FindHandler(name);
-    if (handler)
+    if ( IsOk() &&
+            x >= 0 && y >= 0 &&
+                x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )

     {
     {

-        sm_handlers.DeleteObject(handler);
-        return TRUE;
+        return y*M_IMGDATA->m_width + x;

     }
     }

-    else
-        return FALSE;
+
+    return -1;

 }
 
 }
 

-wxImageHandler *wxImage::FindHandler( const wxString& name )
+void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )

 {
 {

-    wxNode *node = sm_handlers.First();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler*)node->Data();
-        if (handler->GetName().Cmp(name) == 0) return handler;
+    long pos = XYToIndex(x, y);
+    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );

 
 

-        node = node->Next();
-    }
-    return (wxImageHandler *)NULL;
+    AllocExclusive();
+
+    pos *= 3;
+
+    M_IMGDATA->m_data[ pos   ] = r;
+    M_IMGDATA->m_data[ pos+1 ] = g;
+    M_IMGDATA->m_data[ pos+2 ] = b;

 }
 
 }
 

-wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
+void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )

 {
 {

-    wxNode *node = sm_handlers.First();
-    while (node)
+    wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    wxRect rect(rect_);
+    wxRect imageRect(0, 0, GetWidth(), GetHeight());
+    if ( rect == wxRect() )

     {
     {

-        wxImageHandler *handler = (wxImageHandler*)node->Data();
-        if ( (handler->GetExtension().Cmp(extension) == 0) &&
-            (bitmapType == -1 || handler->GetType() == bitmapType) )
-            return handler;
-        node = node->Next();
+        rect = imageRect;

     }
     }

-    return (wxImageHandler*)NULL;
-}
-
-wxImageHandler *wxImage::FindHandler( long bitmapType )
-{
-    wxNode *node = sm_handlers.First();
-    while (node)
+    else

     {
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
-        if (handler->GetType() == bitmapType) return handler;
-        node = node->Next();
+        wxCHECK_RET( imageRect.Contains(rect.GetTopLeft()) &&
+                     imageRect.Contains(rect.GetBottomRight()),
+                     wxT("invalid bounding rectangle") );

     }
     }

-    return NULL;
-}

 
 

-wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
-{
-    wxNode *node = sm_handlers.First();
-    while (node)
+    int x1 = rect.GetLeft(),
+        y1 = rect.GetTop(),
+        x2 = rect.GetRight() + 1,
+        y2 = rect.GetBottom() + 1;
+
+    unsigned char *data wxDUMMY_INITIALIZE(NULL);
+    int x, y, width = GetWidth();
+    for (y = y1; y < y2; y++)

     {
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
-        if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
-        node = node->Next();
+        data = M_IMGDATA->m_data + (y*width + x1)*3;
+        for (x = x1; x < x2; x++)
+        {
+            *data++ = r;
+            *data++ = g;
+            *data++ = b;
+        }

     }
     }

-    return NULL;

 }
 
 }
 

-void wxImage::InitStandardHandlers()
+unsigned char wxImage::GetRed( int x, int y ) const

 {
 {

-  AddHandler( new wxBMPHandler );
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    pos *= 3;
+
+    return M_IMGDATA->m_data[pos];

 }
 
 }
 

-void wxImage::CleanUpHandlers()
+unsigned char wxImage::GetGreen( int x, int y ) const

 {
 {

-    wxNode *node = sm_handlers.First();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler *)node->Data();
-        wxNode *next = node->Next();
-        delete handler;
-        delete node;
-        node = next;
-    }
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    pos *= 3;
+
+    return M_IMGDATA->m_data[pos+1];

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxImageHandler
-//-----------------------------------------------------------------------------
+unsigned char wxImage::GetBlue( int x, int y ) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
+    pos *= 3;

 
 

-#if wxUSE_STREAMS
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
+    return M_IMGDATA->m_data[pos+2];
+}
+
+bool wxImage::IsOk() const

 {
 {

-    return FALSE;
+    // image of 0 width or height can't be considered ok - at least because it
+    // causes crashes in ConvertToBitmap() if we don't catch it in time
+    wxImageRefData *data = M_IMGDATA;
+    return data && data->m_ok && data->m_width && data->m_height;

 }
 
 }
 

-bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
+unsigned char *wxImage::GetData() const

 {
 {

-    return FALSE;
+    wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") );
+
+    return M_IMGDATA->m_data;

 }
 
 }
 

-int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
+void wxImage::SetData( unsigned char *data, bool static_data  )

 {
 {

-    return 1;
+    wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+    wxImageRefData *newRefData = new wxImageRefData();
+
+    newRefData->m_width = M_IMGDATA->m_width;
+    newRefData->m_height = M_IMGDATA->m_height;
+    newRefData->m_data = data;
+    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;
+    newRefData->m_hasMask = M_IMGDATA->m_hasMask;
+    newRefData->m_static = static_data;
+
+    UnRef();
+
+    m_refData = newRefData;

 }
 
 }
 

-bool wxImageHandler::CanRead( const wxString& name )
+void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data )

 {
 {

-    if (wxFileExists(name))
+    wxImageRefData *newRefData = new wxImageRefData();
+
+    if (m_refData)
+    {
+        newRefData->m_width = new_width;
+        newRefData->m_height = new_height;
+        newRefData->m_data = data;
+        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;
+        newRefData->m_hasMask = M_IMGDATA->m_hasMask;
+    }
+    else

     {
     {

-        wxFileInputStream stream(name);
-        return CanRead(stream);
+        newRefData->m_width = new_width;
+        newRefData->m_height = new_height;
+        newRefData->m_data = data;
+        newRefData->m_ok = true;

     }
     }

+    newRefData->m_static = static_data;

 
 

-    else {
-        wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
+    UnRef();

 
 

-        return FALSE;
-    }
-//    return FALSE;
+    m_refData = newRefData;

 }
 
 }
 

-#endif // wxUSE_STREAMS
+// ----------------------------------------------------------------------------
+// alpha channel support
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// MSW conversion routines
-//-----------------------------------------------------------------------------
+void wxImage::SetAlpha(int x, int y, unsigned char alpha)
+{
+    wxCHECK_RET( HasAlpha(), wxT("no alpha channel") );
+
+    long pos = XYToIndex(x, y);
+    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );

 
 

-#ifdef __WXMSW__
+    AllocExclusive();
+
+    M_IMGDATA->m_alpha[pos] = alpha;
+}

 
 

-wxBitmap wxImage::ConvertToBitmap() const
+unsigned char wxImage::GetAlpha(int x, int y) const

 {
 {

-    if ( !Ok() )
-        return wxNullBitmap;
+    wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") );

 
 

-    // sizeLimit is the MS upper limit for the DIB size
-#ifdef  WIN32
-    int sizeLimit = 1024*768*3;
-#else
-    int sizeLimit = 0x7fff ;
-#endif
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );

 
 

-    // width and height of the device-dependent bitmap
-    int width = GetWidth();
-    int bmpHeight = GetHeight();
-
-    // calc the number of bytes per scanline and padding
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary = bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-    // calc the number of DIBs and heights of DIBs
-    int numDIB = 1;
-    int hRemain = 0;
-    int height = sizeLimit/bytePerLine;
-    if( height >= bmpHeight )
-        height = bmpHeight;
-    else
-    {
-        numDIB =  bmpHeight / height;
-        hRemain = bmpHeight % height;
-        if( hRemain >0 )  numDIB++;
-    }
-
-    // set bitmap parameters
-    wxBitmap bitmap;
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-    bitmap.SetWidth( width );
-    bitmap.SetHeight( bmpHeight );
-    bitmap.SetDepth( wxDisplayDepth() );
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
-    wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = (DWORD)width;
-    lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-    //   the general formula for biSizeImage:
-    //      ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate memory for DIB") );
-        free( lpDIBh );
-        return bitmap;
-    }
-
-    // create and set the device-dependent bitmap
-    HDC hdc = ::GetDC(NULL);
-    HDC memdc = ::CreateCompatibleDC( hdc );
-    HBITMAP hbitmap;
-    hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
-    ::SelectObject( memdc, hbitmap);
-
-    HPALETTE hOldPalette = 0;
-    if (GetPalette().Ok())
-    {
-        hOldPalette = ::SelectPalette(memdc, (HPALETTE) GetPalette().GetHPALETTE(), FALSE);
-        ::RealizePalette(memdc);
-    }
-
-    // copy image data into DIB data and then into DDB (in a loop)
+    return M_IMGDATA->m_alpha[pos];
+}
+
+bool
+wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b)
+{
+    SetAlpha(NULL);
+
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;
+
+    unsigned char *alpha = GetAlpha();

     unsigned char *data = GetData();
     unsigned char *data = GetData();

-    int i, j, n;
-    int origin = 0;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits;

 
 

-    for( n=0; n<numDIB; n++ )
+    for ( int y = 0; y < h; y++ )

     {
     {

-        if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
+        for ( int x = 0; x < w; x++ )

         {
         {

-            // redefine height and size of the (possibly) last smaller DIB
-            // memory is not reallocated
-            height = hRemain;
-            lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-            lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+            *alpha++ = *data;
+            *data++ = r;
+            *data++ = g;
+            *data++ = b;

         }
         }

-        ptbits = lpBits;
+    }

 
 

-        for( j=0; j<height; j++ )
-        {
-            for( i=0; i<width; i++ )
-            {
-                *(ptbits++) = *(ptdata+2);
-                *(ptbits++) = *(ptdata+1);
-                *(ptbits++) = *(ptdata  );
-                ptdata += 3;
-            }
-            for( i=0; i< padding; i++ )   *(ptbits++) = 0;
-        }
-        ::StretchDIBits( memdc, 0, origin, width, height,\
-            0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-        origin += height;
-        // if numDIB = 1,  lines below can also be used
-        //    hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
-        // The above line is equivalent to the following two lines.
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
-        // or the following lines
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    HDC memdc = ::CreateCompatibleDC( hdc );
-        //    ::SelectObject( memdc, hbitmap);
-        //    ::SetDIBitsToDevice( memdc, 0, 0, width, height,
-        //            0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
-        //    ::SelectObject( memdc, 0 );
-        //    ::DeleteDC( memdc );
-    }
-    bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
-
-    if (hOldPalette)
-        SelectPalette(memdc, hOldPalette, FALSE);
-
-    // similarly, created an mono-bitmap for the possible mask
-    if( HasMask() )
-    {
-        hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
-        HGDIOBJ hbmpOld = ::SelectObject( memdc, hbitmap);
-        if( numDIB == 1 )   height = bmpHeight;
-        else                height = sizeLimit/bytePerLine;
-        lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-        lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        origin = 0;
-        unsigned char r = GetMaskRed();
-        unsigned char g = GetMaskGreen();
-        unsigned char b = GetMaskBlue();
-        unsigned char zero = 0, one = 255;
-        ptdata = data;
-        for( n=0; n<numDIB; n++ )
-        {
-            if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
-            {
-                // redefine height and size of the (possibly) last smaller DIB
-                // memory is not reallocated
-                height = hRemain;
-                lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-                lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-            }
-            ptbits = lpBits;
-            for( int j=0; j<height; j++ )
-            {
-                for(i=0; i<width; i++ )
-                {
-                    // was causing a code gen bug in cw : if( ( cr !=r) || (cg!=g) || (cb!=b) )
-                    unsigned char cr = (*(ptdata++)) ;
-                    unsigned char cg = (*(ptdata++)) ;
-                    unsigned char cb = (*(ptdata++)) ;
+    return true;
+}

 
 

-                    if( ( cr !=r) || (cg!=g) || (cb!=b) )
-                    {
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                    }
-                    else
-                    {
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                    }
-                }
-                for( i=0; i< padding; i++ )   *(ptbits++) = zero;
-            }
-            ::StretchDIBits( memdc, 0, origin, width, height,\
-                0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-            origin += height;
-        }
-        // create a wxMask object
-        wxMask *mask = new wxMask();
-        mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
-        bitmap.SetMask( mask );
-        // It will be deleted when the wxBitmap object is deleted (as of 01/1999)
-        /* The following can also be used but is slow to run
-        wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue());
-        wxMask *mask = new wxMask( bitmap, colour );
-        bitmap.SetMask( mask );
-        */
+void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+    AllocExclusive();

 
 

-        ::SelectObject( memdc, hbmpOld );
+    if ( !alpha )
+    {
+        alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);

     }
 
     }
 

-    // free allocated resources
-    ::DeleteDC( memdc );
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
+    if( !M_IMGDATA->m_staticAlpha )
+        free(M_IMGDATA->m_alpha);
+
+    M_IMGDATA->m_alpha = alpha;
+    M_IMGDATA->m_staticAlpha = static_data;
+}

 
 

-#if WXWIN_COMPATIBILITY_2
-    // check the wxBitmap object
-    bitmap.GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
+unsigned char *wxImage::GetAlpha() const
+{
+    wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") );

 
 

-    return bitmap;
+    return M_IMGDATA->m_alpha;

 }
 
 }
 

-wxImage::wxImage( const wxBitmap &bitmap )
+void wxImage::InitAlpha()

 {
 {

-    // check the bitmap
-    if( !bitmap.Ok() )
+    wxCHECK_RET( !HasAlpha(), wxT("image already has an alpha channel") );
+
+    // initialize memory for alpha channel
+    SetAlpha();
+
+    unsigned char *alpha = M_IMGDATA->m_alpha;
+    const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height;
+
+    if ( HasMask() )

     {
     {

-        wxFAIL_MSG( wxT("invalid bitmap") );
-        return;
-    }
+        // use the mask to initialize the alpha channel.
+        const unsigned char * const alphaEnd = alpha + lenAlpha;

 
 

-    // create an wxImage object
-    int width = bitmap.GetWidth();
-    int height = bitmap.GetHeight();
-    Create( width, height );
-    unsigned char *data = GetData();
-    if( !data )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for image") );
-        return;
-    }
-
-    // calc the number of bytes per scanline and padding in the DIB
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary =  bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );
-        return;
-    }
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB") );
-        free( data );
-        free( lpDIBh );
-        return;
-    }
-
-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hbitmap;
-    hbitmap = (HBITMAP) bitmap.GetHBITMAP();
-    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
-    {
-        for( j=0; j<width; j++ )
-        {
-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
-        }
-        ptbits += padding;
-    }
-
-    // similarly, set data according to the possible mask bitmap
-    if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        HDC memdc = ::CreateCompatibleDC( hdc );
-        ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
-        ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
-        ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-        ::DeleteDC( memdc );
-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
+        const unsigned char mr = M_IMGDATA->m_maskRed;
+        const unsigned char mg = M_IMGDATA->m_maskGreen;
+        const unsigned char mb = M_IMGDATA->m_maskBlue;
+        for ( unsigned char *src = M_IMGDATA->m_data;
+              alpha < alphaEnd;
+              src += 3, alpha++ )

         {
         {

-            for( j=0; j<width; j++ )
-            {
-                if( *ptbits != 0 )
-                    ptdata += 3;
-                else
-                {
-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
-                }
-                ptbits += 3;
-            }
-            ptbits += padding;
+            *alpha = (src[0] == mr && src[1] == mg && src[2] == mb)
+                            ? wxIMAGE_ALPHA_TRANSPARENT
+                            : wxIMAGE_ALPHA_OPAQUE;

         }
         }

-        SetMaskColour( r, g, b );
-        SetMask( TRUE );
+
+        M_IMGDATA->m_hasMask = false;

     }
     }

-    else
+    else // no mask

     {
     {

-        SetMask( FALSE );
+        // make the image fully opaque
+        memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha);

     }
     }

-    // free allocated resources
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);

 }
 
 }
 

-#endif
+void wxImage::ClearAlpha()
+{
+    wxCHECK_RET( HasAlpha(), wxT("image already doesn't have an alpha channel") );

 
 

-#ifdef __WXMAC__
+    if ( !M_IMGDATA->m_staticAlpha )
+        free( M_IMGDATA->m_alpha );
+
+    M_IMGDATA->m_alpha = NULL;
+}

 
 

-#ifdef __UNIX__
-  #include <ApplicationServices/ApplicationServices.h>
-#else
-  #include <PictUtils.h>
-#endif

 
 

-wxBitmap wxImage::ConvertToBitmap() const
+// ----------------------------------------------------------------------------
+// mask support
+// ----------------------------------------------------------------------------
+
+void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )

 {
 {

-    // width and height of the device-dependent bitmap
-    int width = GetWidth();
-    int height = GetHeight();
+    wxCHECK_RET( IsOk(), wxT("invalid image") );

 
 

-    // Create picture
+    AllocExclusive();
+
+    M_IMGDATA->m_maskRed = r;
+    M_IMGDATA->m_maskGreen = g;
+    M_IMGDATA->m_maskBlue = b;
+    M_IMGDATA->m_hasMask = true;
+}

 
 

-    wxBitmap bitmap;
+bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
+{
+    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );

 
 

-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-    
-    bitmap.Create( width , height , wxDisplayDepth() ) ;
-    wxBitmap maskBitmap( width, height, 1);
-    
-    CGrafPtr origPort ;
-    GDHandle origDevice ;
+    if (M_IMGDATA->m_hasMask)
+    {
+        if (r) *r = M_IMGDATA->m_maskRed;
+        if (g) *g = M_IMGDATA->m_maskGreen;
+        if (b) *b = M_IMGDATA->m_maskBlue;
+        return true;
+    }
+    else
+    {
+        FindFirstUnusedColour(r, g, b);
+        return false;
+    }
+}

 
 

-    LockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) );
-    LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
+unsigned char wxImage::GetMaskRed() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );

 
 

-    GetGWorld( &origPort , &origDevice ) ;
-    SetGWorld( bitmap.GetHBITMAP() , NULL ) ;
-    
-    // Render image
-    wxColour rgb, maskcolor(GetMaskRed(), GetMaskGreen(), GetMaskBlue());
-    RGBColor color;
-    RGBColor white = { 0xffff, 0xffff, 0xffff };
-    RGBColor black = { 0     , 0     , 0      };
+    return M_IMGDATA->m_maskRed;
+}

 
 

-    register unsigned char* data = GetData();
+unsigned char wxImage::GetMaskGreen() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );

 
 

-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            rgb.Set(data[index++], data[index++], data[index++]);
-            color = rgb.GetPixel();
-            SetCPixel( x , y , &color ) ;
-            if (HasMask())
-            {
-                SetGWorld(maskBitmap.GetHBITMAP(), NULL);
-                if (rgb == maskcolor) {
-                    SetCPixel(x,y, &white);
-                }
-                else {
-                    SetCPixel(x,y, &black);
-                }
-                SetGWorld(bitmap.GetHBITMAP(), NULL);
-            }
-        }
-    }  // for height
+    return M_IMGDATA->m_maskGreen;
+}

 
 

-    // Create mask
-    if ( HasMask() ) {
-        wxMask *mask = new wxMask( maskBitmap );
-    }
-    
-    UnlockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) );
-    UnlockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
-    SetGWorld( origPort, origDevice );
+unsigned char wxImage::GetMaskBlue() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );

 
 

-    return bitmap;
+    return M_IMGDATA->m_maskBlue;

 }
 
 }
 

-wxImage::wxImage( const wxBitmap &bitmap )
+void wxImage::SetMask( bool mask )

 {
 {

-    // check the bitmap
-    wxCHECK_RET( bitmap.Ok(), wxT("Invalid bitmap") );
+    wxCHECK_RET( IsOk(), wxT("invalid image") );

 
 

-    // create an wxImage object
-    int width = bitmap.GetWidth();
-    int height = bitmap.GetHeight();
-    Create( width, height );
+    AllocExclusive();

 
 

-    unsigned char *data = GetData();
+    M_IMGDATA->m_hasMask = mask;
+}

 
 

-    wxCHECK_RET( data, wxT("Could not allocate data for image") );
+bool wxImage::HasMask() const
+{
+    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );

 
 

-    WXHBITMAP origPort;
-    GDHandle  origDevice;
-    int      index;
-    RGBColor color;
-    // background color set to RGB(16,16,16) in consistent with wxGTK
-    unsigned char mask_r=16, mask_g=16, mask_b=16;
-    SInt16   r,g,b;
-    wxMask  *mask = bitmap.GetMask();
+    return M_IMGDATA->m_hasMask;
+}

 
 

-    GetGWorld( &origPort, &origDevice );
-    LockPixels(GetGWorldPixMap(bitmap.GetHBITMAP()));
-    SetGWorld( bitmap.GetHBITMAP(), NULL);
+bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") );

 
 

-    // Copy data into image
-    index = 0;
-    for (int yy = 0; yy < height; yy++)
+    // check mask
+    if ( M_IMGDATA->m_hasMask )

     {
     {

-        for (int xx = 0; xx < width; xx++)
+        const unsigned char *p = M_IMGDATA->m_data + 3*pos;
+        if ( p[0] == M_IMGDATA->m_maskRed &&
+                p[1] == M_IMGDATA->m_maskGreen &&
+                    p[2] == M_IMGDATA->m_maskBlue )

         {
         {

-            GetCPixel(xx,yy, &color);
-            r = ((color.red ) >> 8);
-            g = ((color.green ) >> 8);
-            b = ((color.blue ) >> 8);
-            data[index    ] = r;
-            data[index + 1] = g;
-            data[index + 2] = b;
-            if (mask)
-            {
-                if (mask->PointMasked(xx,yy))
-                {
-                    data[index    ] = mask_r;
-                    data[index + 1] = mask_g;
-                    data[index + 2] = mask_b;
-                }
-            }
-            index += 3;
+            return true;

         }
     }
         }
     }

-    if (mask)
+
+    // then check alpha
+    if ( M_IMGDATA->m_alpha )

     {
     {

-        SetMaskColour( mask_r, mask_g, mask_b );
-        SetMask( true );
+        if ( M_IMGDATA->m_alpha[pos] < threshold )
+        {
+            // transparent enough
+            return true;
+        }

     }
 
     }
 

-    // Free resources
-    UnlockPixels(GetGWorldPixMap(bitmap.GetHBITMAP()));
-    SetGWorld(origPort, origDevice);
+    // not transparent
+    return false;

 }
 
 }
 

-#endif
-
-//-----------------------------------------------------------------------------
-// GTK conversion routines
-//-----------------------------------------------------------------------------
-
-#ifdef __WXGTK__
+bool wxImage::SetMaskFromImage(const wxImage& mask,
+                               unsigned char mr, unsigned char mg, unsigned char mb)
+{
+    // 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;
+    }

 
 

-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
+    // find unused colour
+    unsigned char r,g,b ;
+    if (!FindFirstUnusedColour(&r, &g, &b))
+    {
+        wxLogError( _("No unused colour in image being masked.") );
+        return false ;
+    }

 
 

-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
-#endif
+    AllocExclusive();

 
 

-extern GtkWidget *wxRootWindow;
+    unsigned char *imgdata = GetData();
+    unsigned char *maskdata = mask.GetData();

 
 

-wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue )
-{
-    wxBitmap bitmap;
+    const int w = GetWidth();
+    const int h = GetHeight();

 
 

-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
+    for (int j = 0; j < h; j++)
+    {
+        for (int i = 0; i < w; i++)
+        {
+            if ((maskdata[0] == mr) && (maskdata[1]  == mg) && (maskdata[2] == mb))
+            {
+                imgdata[0] = r;
+                imgdata[1] = g;
+                imgdata[2] = b;
+            }
+            imgdata  += 3;
+            maskdata += 3;
+        }
+    }

 
 

-    int width = GetWidth();
-    int height = GetHeight();
+    SetMaskColour(r, g, b);
+    SetMask(true);

 
 

-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
+    return true;
+}

 
 

-    bitmap.SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) );
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
+{
+    if ( !HasAlpha() )
+        return false;

 
 

-    bitmap.SetDepth( 1 );
+    unsigned char mr, mg, mb;
+    if ( !FindFirstUnusedColour(&mr, &mg, &mb) )
+    {
+        wxLogError( _("No unused colour in image being masked.") );
+        return false;
+    }

 
 

-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-    wxASSERT( visual );
+    return ConvertAlphaToMask(mr, mg, mb, threshold);
+}

 
 

-    // Create picture image
+bool wxImage::ConvertAlphaToMask(unsigned char mr,
+                                 unsigned char mg,
+                                 unsigned char mb,
+                                 unsigned char threshold)
+{
+    if ( !HasAlpha() )
+        return false;

 
 

-    unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+    AllocExclusive();

 
 

-    GdkImage *data_image =
-        gdk_image_new_bitmap( visual, data_data, width, height );
+    SetMask(true);
+    SetMaskColour(mr, mg, mb);

 
 

-    // Create mask image
+    unsigned char *imgdata = GetData();
+    unsigned char *alphadata = GetAlpha();

 
 

-    GdkImage *mask_image = (GdkImage*) NULL;
+    int w = GetWidth();
+    int h = GetHeight();

 
 

-    if (HasMask())
+    for (int y = 0; y < h; y++)

     {
     {

-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+        for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
+        {
+            if (*alphadata < threshold)
+            {
+                imgdata[0] = mr;
+                imgdata[1] = mg;
+                imgdata[2] = mb;
+            }
+        }
+    }

 
 

-        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+    if ( !M_IMGDATA->m_staticAlpha )
+        free(M_IMGDATA->m_alpha);

 
 

-        wxMask *mask = new wxMask();
-        mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+    M_IMGDATA->m_alpha = NULL;
+    M_IMGDATA->m_staticAlpha = false;

 
 

-        bitmap.SetMask( mask );
-    }
+    return true;
+}

 
 

-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
+// ----------------------------------------------------------------------------
+// Palette functions
+// ----------------------------------------------------------------------------

 
 

-    unsigned char* data = GetData();
+#if wxUSE_PALETTE

 
 

-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            if (HasMask())
-            {
-                if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                    gdk_image_put_pixel( mask_image, x, y, 1 );
-                else
-                    gdk_image_put_pixel( mask_image, x, y, 0 );
-            }
+bool wxImage::HasPalette() const
+{
+    if (!IsOk())
+        return false;

 
 

-            if ((r == red) && (b == blue) && (g == green))
-                gdk_image_put_pixel( data_image, x, y, 1 );
-            else
-                gdk_image_put_pixel( data_image, x, y, 0 );
+    return M_IMGDATA->m_palette.IsOk();
+}

 
 

-        } // for
-    }  // for
+const wxPalette& wxImage::GetPalette() const
+{
+    wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") );

 
 

-    // Blit picture
+    return M_IMGDATA->m_palette;
+}

 
 

-    GdkGC *data_gc = gdk_gc_new( bitmap.GetBitmap() );
+void wxImage::SetPalette(const wxPalette& palette)
+{
+    wxCHECK_RET( IsOk(), wxT("invalid image") );

 
 

-    gdk_draw_image( bitmap.GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    AllocExclusive();

 
 

-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
+    M_IMGDATA->m_palette = palette;
+}

 
 

-    // Blit mask
+#endif // wxUSE_PALETTE

 
 

-    if (HasMask())
-    {
-        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
+// ----------------------------------------------------------------------------
+// Option functions (arbitrary name/value mapping)
+// ----------------------------------------------------------------------------

 
 

-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+void wxImage::SetOption(const wxString& name, const wxString& value)
+{
+    AllocExclusive();

 
 

-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);
+    if ( idx == wxNOT_FOUND )
+    {
+        M_IMGDATA->m_optionNames.Add(name);
+        M_IMGDATA->m_optionValues.Add(value);
+    }
+    else
+    {
+        M_IMGDATA->m_optionNames[idx] = name;
+        M_IMGDATA->m_optionValues[idx] = value;

     }
     }

+}

 
 

-    return bitmap;
+void wxImage::SetOption(const wxString& name, int value)
+{
+    wxString valStr;
+    valStr.Printf(wxT("%d"), value);
+    SetOption(name, valStr);

 }
 
 }
 

+wxString wxImage::GetOption(const wxString& name) const
+{
+    if ( !M_IMGDATA )
+        return wxEmptyString;
+
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);
+    if ( idx == wxNOT_FOUND )
+        return wxEmptyString;
+    else
+        return M_IMGDATA->m_optionValues[idx];
+}

 
 

-wxBitmap wxImage::ConvertToBitmap() const
+int wxImage::GetOptionInt(const wxString& name) const

 {
 {

-    wxBitmap bitmap;
+    return wxAtoi(GetOption(name));
+}

 
 

-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
+bool wxImage::HasOption(const wxString& name) const
+{
+    return M_IMGDATA ? M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND
+                     : false;
+}

 
 

-    int width = GetWidth();
-    int height = GetHeight();
+// ----------------------------------------------------------------------------
+// image I/O
+// ----------------------------------------------------------------------------

 
 

-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
+bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type),
+                        int WXUNUSED_UNLESS_STREAMS(index) )
+{
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(filename);
+    if ( stream.IsOk() )
+    {
+        wxBufferedInputStream bstream( stream );
+        if ( LoadFile(bstream, type, index) )
+            return true;
+    }

 
 

-    bitmap.SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
+    wxLogError(_("Failed to load image from file \"%s\"."), filename);
+#endif // HAS_FILE_STREAMS

 
 

-    // Retrieve depth
+    return false;
+}

 
 

-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-    wxASSERT( visual );
+bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        const wxString& WXUNUSED_UNLESS_STREAMS(mimetype),
+                        int WXUNUSED_UNLESS_STREAMS(index) )
+{
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(filename);
+    if ( stream.IsOk() )
+    {
+        wxBufferedInputStream bstream( stream );
+        if ( LoadFile(bstream, mimetype, index) )
+            return true;
+    }

 
 

-    int bpp = visual->depth;
+    wxLogError(_("Failed to load image from file \"%s\"."), filename);
+#endif // HAS_FILE_STREAMS

 
 

-    bitmap.SetDepth( bpp );
+    return false;
+}

 
 

-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;

 
 

-#if (GTK_MINOR_VERSION > 0)
+bool wxImage::SaveFile( const wxString& filename ) const
+{
+    wxString ext = filename.AfterLast('.').Lower();

 
 

-    if (!HasMask() && (bpp > 8))
+    wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY);
+    if ( !handler)

     {
     {

-        static bool s_hasInitialized = FALSE;
+       wxLogError(_("Can't save image to file '%s': unknown extension."),
+                  filename);
+       return false;
+    }

 
 

-        if (!s_hasInitialized)
-        {
-            gdk_rgb_init();
-            s_hasInitialized = TRUE;
-        }
+    return SaveFile(filename, handler->GetType());
+}

 
 

-        GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() );
+bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const
+{
+#if HAS_FILE_STREAMS
+    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );

 
 

-        gdk_draw_rgb_image( bitmap.GetPixmap(),
-                            gc,
-                            0, 0,
-                            width, height,
-                            GDK_RGB_DITHER_NONE,
-                            GetData(),
-                            width*3 );
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);

 
 

-        gdk_gc_unref( gc );
+    wxImageFileOutputStream stream(filename);

 
 

-        return bitmap;
+    if ( stream.IsOk() )
+    {
+        wxBufferedOutputStream bstream( stream );
+        return SaveFile(bstream, type);

     }
     }

+#endif // HAS_FILE_STREAMS

 
 

-#endif
-
-    // Create picture image
+    return false;
+}

 
 

-    GdkImage *data_image =
-        gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
+bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const
+{
+#if HAS_FILE_STREAMS
+    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );

 
 

-    // Create mask image
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);

 
 

-    GdkImage *mask_image = (GdkImage*) NULL;
+    wxImageFileOutputStream stream(filename);

 
 

-    if (HasMask())
+    if ( stream.IsOk() )

     {
     {

-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+        wxBufferedOutputStream bstream( stream );
+        return SaveFile(bstream, mimetype);
+    }
+#endif // HAS_FILE_STREAMS
+
+    return false;
+}

 
 

-        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) )
+{
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(name);
+    return CanRead(stream);
+#else
+    return false;
+#endif
+}

 
 

-        wxMask *mask = new wxMask();
-        mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
+                            wxBitmapType WXUNUSED_UNLESS_STREAMS(type) )
+{
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(name);
+    if (stream.IsOk())
+        return GetImageCount(stream, type);
+#endif

 
 

-        bitmap.SetMask( mask );
-    }
+  return 0;
+}

 
 

-    // Render
+#if wxUSE_STREAMS

 
 

-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
+bool wxImage::CanRead( wxInputStream &stream )
+{
+    const wxList& list = GetHandlers();

 
 

-    if (bpp >= 24)
+    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )

     {
     {

-        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
-        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
+        wxImageHandler *handler=(wxImageHandler*)node->GetData();
+        if (handler->CanRead( stream ))
+            return true;

     }
 
     }
 

-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
+    return false;
+}

 
 

-    unsigned char* data = GetData();
+int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
+{
+    wxImageHandler *handler;

 
 

-    int index = 0;
-    for (int y = 0; y < height; y++)
+    if ( type == wxBITMAP_TYPE_ANY )

     {
     {

-        for (int x = 0; x < width; x++)
+        const wxList& list = GetHandlers();
+
+        for ( wxList::compatibility_iterator node = list.GetFirst();
+              node;
+              node = node->GetNext() )

         {
         {

-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            if (HasMask())
-            {
-                if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                    gdk_image_put_pixel( mask_image, x, y, 1 );
-                else
-                    gdk_image_put_pixel( mask_image, x, y, 0 );
-            }
+             handler = (wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) )
+             {
+                 const int count = handler->GetImageCount(stream);
+                 if ( count >= 0 )
+                     return count;
+             }

 
 

-            switch (bpp)
-            {
-            case 8:
-                {
-                    int pixel = -1;
-                    if (wxTheApp->m_colorCube)
-                    {
-                        pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                    }
-                    else
-                    {
-                        GdkColormap *cmap = gtk_widget_get_default_colormap();
-                        GdkColor *colors = cmap->colors;
-                        int max = 3 * (65536);
+        }

 
 

-                        for (int i = 0; i < cmap->size; i++)
-                        {
-                            int rdiff = (r << 8) - colors[i].red;
-                            int gdiff = (g << 8) - colors[i].green;
-                            int bdiff = (b << 8) - colors[i].blue;
-                            int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                            if (sum < max) { pixel = i; max = sum; }
-                        }
-                    }
+        wxLogWarning(_("No handler found for image type."));
+        return 0;
+    }

 
 

-                    gdk_image_put_pixel( data_image, x, y, pixel );
+    handler = FindHandler(type);

 
 

-                    break;
-                }
-            case 15:
-                {
-                    guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 16:
-                {
-                    guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 32:
-            case 24:
-                {
-                    guint32 pixel = 0;
-                    switch (b_o)
-                    {
-                    case RGB: pixel = (r << 16) | (g << 8) | b; break;
-                    case RBG: pixel = (r << 16) | (b << 8) | g; break;
-                    case BRG: pixel = (b << 16) | (r << 8) | g; break;
-                    case BGR: pixel = (b << 16) | (g << 8) | r; break;
-                    case GRB: pixel = (g << 16) | (r << 8) | b; break;
-                    case GBR: pixel = (g << 16) | (b << 8) | r; break;
-                    }
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-                }
-            default: break;
-            }
-        } // for
-    }  // for
+    if ( !handler )
+    {
+        wxLogWarning(_("No image handler for type %d defined."), type);
+        return false;
+    }

 
 

-    // Blit picture
+    if ( handler->CanRead(stream) )
+    {
+        return handler->GetImageCount(stream);
+    }
+    else
+    {
+        wxLogError(_("Image file is not of type %d."), type);
+        return 0;
+    }
+}

 
 

-    GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() );
+bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
+{
+    // save the options values which can be clobbered by the handler (e.g. many
+    // of them call Destroy() before trying to load the file)
+    const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
+                   maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);

 
 

-    gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    // Preserve the original stream position if possible to rewind back to it
+    // if we failed to load the file -- maybe the next handler that we try can
+    // succeed after us then.
+    wxFileOffset posOld = wxInvalidOffset;
+    if ( stream.IsSeekable() )
+        posOld = stream.TellI();

 
 

-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
+    if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
+    {
+        if ( posOld != wxInvalidOffset )
+            stream.SeekI(posOld);

 
 

-    // Blit mask
+        return false;
+    }

 
 

-    if (HasMask())
+    // rescale the image to the specified size if needed
+    if ( maxWidth || maxHeight )

     {
     {

-        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
+        const unsigned widthOrig = GetWidth(),
+                       heightOrig = GetHeight();

 
 

-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+        // this uses the same (trivial) algorithm as the JPEG handler
+        unsigned width = widthOrig,
+                 height = heightOrig;
+        while ( (maxWidth && width > maxWidth) ||
+                    (maxHeight && height > maxHeight) )
+        {
+            width /= 2;
+            height /= 2;
+        }

 
 

-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
+        if ( width != widthOrig || height != heightOrig )
+            Rescale(width, height, wxIMAGE_QUALITY_HIGH);

     }
 
     }
 

-    return bitmap;
+    // Set this after Rescale, which currently does not preserve it
+    M_IMGDATA->m_type = handler.GetType();
+
+    return true;

 }
 
 }
 

-wxImage::wxImage( const wxBitmap &bitmap )
+bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )

 {
 {

-    wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
+    AllocExclusive();

 
 

-    GdkImage *gdk_image = (GdkImage*) NULL;
-    if (bitmap.GetPixmap())
-    {
-        gdk_image = gdk_image_get( bitmap.GetPixmap(),
-            0, 0,
-            bitmap.GetWidth(), bitmap.GetHeight() );
-    } else
-    if (bitmap.GetBitmap())
-    {
-        gdk_image = gdk_image_get( bitmap.GetBitmap(),
-            0, 0,
-            bitmap.GetWidth(), bitmap.GetHeight() );
-    } else
+    wxImageHandler *handler;
+
+    if ( type == wxBITMAP_TYPE_ANY )

     {
     {

-        wxFAIL_MSG( wxT("Ill-formed bitmap") );
-    }
+        if ( !stream.IsSeekable() )
+        {
+            // The error message about image data format being unknown below
+            // would be misleading in this case as we are not even going to try
+            // any handlers because CanRead() never does anything for not
+            // seekable stream, so try to be more precise here.
+            wxLogError(_("Can't automatically determine the image format "
+                         "for non-seekable input."));
+            return false;
+        }
+
+        const wxList& list = GetHandlers();
+        for ( wxList::compatibility_iterator node = list.GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+             handler = (wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) )
+                 return true;
+        }

 
 

-    wxCHECK_RET( gdk_image, wxT("couldn't create image") );
-    
-    Create( bitmap.GetWidth(), bitmap.GetHeight() );
-    char unsigned *data = GetData();
+        wxLogWarning( _("Unknown image data format.") );

 
 

-    if (!data)
-    {
-        gdk_image_destroy( gdk_image );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return;
+        return false;

     }
     }

+    //else: have specific type

 
 

-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (bitmap.GetMask())
+    handler = FindHandler(type);
+    if ( !handler )

     {
     {

-        gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
-            0, 0,
-            bitmap.GetWidth(), bitmap.GetHeight() );
-
-        SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
+        wxLogWarning( _("No image handler for type %d defined."), type );
+        return false;

     }
 
     }
 

-    int bpp = -1;
-    int red_shift_right = 0;
-    int green_shift_right = 0;
-    int blue_shift_right = 0;
-    int red_shift_left = 0;
-    int green_shift_left = 0;
-    int blue_shift_left = 0;
-    bool use_shift = FALSE;
-
-    if (bitmap.GetPixmap())
+    if ( stream.IsSeekable() && !handler->CanRead(stream) )

     {
     {

-        GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+        wxLogError(_("This is not a %s."), handler->GetName());
+        return false;
+    }

 
 

-        if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window );
-        bpp = visual->depth;
-        if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
-        red_shift_right = visual->red_shift;
-        red_shift_left = 8-visual->red_prec;
-        green_shift_right = visual->green_shift;
-        green_shift_left = 8-visual->green_prec;
-        blue_shift_right = visual->blue_shift;
-        blue_shift_left = 8-visual->blue_prec;
+    return DoLoad(*handler, stream, index);
+}

 
 

-        use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
-    }
-    if (bitmap.GetBitmap())
-    {
-        bpp = 1;
-    }
+bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
+{
+    UnRef();

 
 

+    m_refData = new wxImageRefData;

 
 

-    GdkColormap *cmap = gtk_widget_get_default_colormap();
+    wxImageHandler *handler = FindHandlerMime(mimetype);

 
 

-    long pos = 0;
-    for (int j = 0; j < bitmap.GetHeight(); j++)
+    if ( !handler )

     {
     {

-        for (int i = 0; i < bitmap.GetWidth(); i++)
-        {
-            wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
-                if (bpp == 1)
-                {
-                    if (pixel == 0)
-                        {
-                    data[pos]   = 0;
-                    data[pos+1] = 0;
-                    data[pos+2] = 0;
-                        }
-                        else
-                        {
-                    data[pos]   = 255;
-                    data[pos+1] = 255;
-                    data[pos+2] = 255;
-                        }
-            }
-            else if (use_shift)
-            {
-                data[pos] =   (pixel >> red_shift_right)   << red_shift_left;
-                data[pos+1] = (pixel >> green_shift_right) << green_shift_left;
-                data[pos+2] = (pixel >> blue_shift_right)  << blue_shift_left;
-                }
-            else if (cmap->colors)
-            {
-                data[pos] =   cmap->colors[pixel].red   >> 8;
-                data[pos+1] = cmap->colors[pixel].green >> 8;
-                data[pos+2] = cmap->colors[pixel].blue  >> 8;
-            }
-            else
-            {
-                wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") );
-            }
-
-            if (gdk_image_mask)
-            {
-                int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-                if (mask_pixel == 0)
-                {
-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
-                }
-            }
+        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+        return false;
+    }

 
 

-            pos += 3;
-        }
+    if ( stream.IsSeekable() && !handler->CanRead(stream) )
+    {
+        wxLogError(_("Image is not of type %s."), mimetype);
+        return false;

     }
 
     }
 

-    gdk_image_destroy( gdk_image );
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+    return DoLoad(*handler, stream, index);

 }
 
 }
 

-#endif
-
-//-----------------------------------------------------------------------------
-// Motif conversion routines
-//-----------------------------------------------------------------------------
+bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
+{
+    wxImage * const self = const_cast<wxImage *>(this);
+    if ( !handler.SaveFile(self, stream) )
+        return false;

 
 

-#ifdef __WXMOTIF__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
-#include "wx/utils.h"
-#include <math.h>
+    M_IMGDATA->m_type = handler.GetType();
+    return true;
+}

 
 

-/*
+bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
+{
+    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );

 
 

-Date: Wed, 05 Jan 2000 11:45:40 +0100
-From: Frits Boel <boel@niob.knaw.nl>
-To: julian.smart@ukonline.co.uk
-Subject: Patch for Motif ConvertToBitmap
+    wxImageHandler *handler = FindHandler(type);
+    if ( !handler )
+    {
+        wxLogWarning( _("No image handler for type %d defined."), type );
+        return false;
+    }

 
 

-Hi Julian,
+    return DoSave(*handler, stream);
+}

 
 

-I've been working on a wxWin application for image processing. From the
-beginning, I was surprised by the (lack of) speed of ConvertToBitmap,
-till I looked in the source code of image.cpp. I saw that converting a
-wxImage to a bitmap with 8-bit pixels is done with comparing every pixel
-to the 256 colors of the palet. A very time-consuming piece of code!
+bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
+{
+    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );

 
 

-Because I wanted a faster application, I've made a 'patch' for this. In
-short: every pixel of the image is compared to a sorted list with
-colors. If the color is found in the list, the palette entry is
-returned; if the color is not found, the color palette is searched and
-then the palette entry is returned and the color added to the sorted
-list.
+    wxImageHandler *handler = FindHandlerMime(mimetype);
+    if ( !handler )
+    {
+        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+    }

 
 

-Maybe there is another method for this, namely changing the palette
-itself (if the colors are known, as is the case with tiffs with a
-colormap). I did not look at this, maybe someone else did?
+    return DoSave(*handler, stream);
+}

 
 

-The code of the patch is attached, have a look on it, and maybe you will
-ship it with the next release of wxMotif?
+#endif // wxUSE_STREAMS

 
 

-Regards,
+// ----------------------------------------------------------------------------
+// image I/O handlers
+// ----------------------------------------------------------------------------

 
 

-Frits Boel
-Software engineer at Hubrecht Laboratory, The Netherlands.
+void wxImage::AddHandler( wxImageHandler *handler )
+{
+    // Check for an existing handler of the type being added.
+    if (FindHandler( handler->GetType() ) == 0)
+    {
+        sm_handlers.Append( handler );
+    }
+    else
+    {
+        // This is not documented behaviour, merely the simplest 'fix'
+        // for preventing duplicate additions.  If someone ever has
+        // a good reason to add and remove duplicate handlers (and they
+        // may) we should probably refcount the duplicates.
+        //   also an issue in InsertHandler below.

 
 

-*/
+        wxLogDebug( wxT("Adding duplicate image handler for '%s'"),
+                    handler->GetName().c_str() );
+        delete handler;
+    }
+}

 
 

-class wxSearchColor
+void wxImage::InsertHandler( wxImageHandler *handler )

 {
 {

-public:
-  wxSearchColor( void );
-  wxSearchColor( int size, XColor *colors );
-  ~wxSearchColor( void );
+    // Check for an existing handler of the type being added.
+    if (FindHandler( handler->GetType() ) == 0)
+    {
+        sm_handlers.Insert( handler );
+    }
+    else
+    {
+        // see AddHandler for additional comments.
+        wxLogDebug( wxT("Inserting duplicate image handler for '%s'"),
+                    handler->GetName().c_str() );
+        delete handler;
+    }
+}

 
 

-  int SearchColor( int r, int g, int b );
-private:
-  int AddColor( unsigned int value, int pos );
+bool wxImage::RemoveHandler( const wxString& name )
+{
+    wxImageHandler *handler = FindHandler(name);
+    if (handler)
+    {
+        sm_handlers.DeleteObject(handler);
+        delete handler;
+        return true;
+    }
+    else
+        return false;
+}

 
 

-  int          size;
-  XColor       *colors;
-  unsigned int *color;
-  int          *entry;
+wxImageHandler *wxImage::FindHandler( const wxString& name )
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();
+        if (handler->GetName().Cmp(name) == 0) return handler;

 
 

-  int bottom;
-  int top;
-};
+        node = node->GetNext();
+    }
+    return NULL;
+}

 
 

-wxSearchColor::wxSearchColor( void )
+wxImageHandler *wxImage::FindHandler( const wxString& extension, wxBitmapType bitmapType )

 {
 {

-  size   = 0;
-  colors = (XColor*) NULL;
-  color  = (unsigned int *) NULL;
-  entry  = (int*) NULL;
-
-  bottom = 0;
-  top    = 0;
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();
+        if ((bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType))
+        {
+            if (handler->GetExtension() == extension)
+                return handler;
+            if (handler->GetAltExtensions().Index(extension, false) != wxNOT_FOUND)
+                return handler;
+        }
+        node = node->GetNext();
+    }
+    return NULL;

 }
 
 }
 

-wxSearchColor::wxSearchColor( int size_, XColor *colors_ )
+wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType )

 {
 {

-    int i;
-    size   = size_;
-    colors = colors_;
-    color  = new unsigned int[size];
-    entry  = new int         [size];
-
-    for (i = 0; i < size; i++ ) {
-        entry[i] = -1;
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        if (handler->GetType() == bitmapType) return handler;
+        node = node->GetNext();

     }
     }

-
-    bottom = top = ( size >> 1 );
+    return NULL;

 }
 
 }
 

-wxSearchColor::~wxSearchColor( void )
+wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )

 {
 {

-  if ( color ) delete color;
-  if ( entry ) delete entry;
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
+        node = node->GetNext();
+    }
+    return NULL;

 }
 
 }
 

-int wxSearchColor::SearchColor( int r, int g, int b )
+void wxImage::InitStandardHandlers()

 {
 {

-  unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b;
-  int          begin = bottom;
-  int          end   = top;
-  int          middle;
-
-  while ( begin <= end ) {
-
-    middle = ( begin + end ) >> 1;
+#if wxUSE_STREAMS
+    AddHandler(new wxBMPHandler);
+#endif // wxUSE_STREAMS
+}

 
 

-    if ( value == color[middle] ) {
-      return( entry[middle] );
-    } else if ( value < color[middle] ) {
-      end = middle - 1;
-    } else {
-      begin = middle + 1;
+void wxImage::CleanUpHandlers()
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete handler;
+        node = next;

     }
 
     }
 

-  }
-
-  return AddColor( value, middle );
+    sm_handlers.Clear();

 }
 
 }
 

-int wxSearchColor::AddColor( unsigned int value, int pos )
+wxString wxImage::GetImageExtWildcard()

 {
 {

-  int i;
-  int pixel = -1;
-  int max = 3 * (65536);
-  for ( i = 0; i < 256; i++ ) {
-    int rdiff = ((value >> 8) & 0xFF00 ) - colors[i].red;
-    int gdiff = ((value     ) & 0xFF00 ) - colors[i].green;
-    int bdiff = ((value << 8) & 0xFF00 ) - colors[i].blue;
-    int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
-    if (sum < max) { pixel = i; max = sum; }
-  }
-
-  if ( entry[pos] < 0 ) {
-    color[pos] = value;
-    entry[pos] = pixel;
-  } else if ( value < color[pos] ) {
-
-    if ( bottom > 0 ) {
-      for ( i = bottom; i < pos; i++ ) {
-        color[i-1] = color[i];
-        entry[i-1] = entry[i];
-      }
-      bottom--;
-      color[pos-1] = value;
-      entry[pos-1] = pixel;
-    } else if ( top < size-1 ) {
-      for ( i = top; i >= pos; i-- ) {
-        color[i+1] = color[i];
-        entry[i+1] = entry[i];
-      }
-      top++;
-      color[pos] = value;
-      entry[pos] = pixel;
-    }
+    wxString fmts;

 
 

-  } else {
-
-    if ( top < size-1 ) {
-      for ( i = top; i > pos; i-- ) {
-        color[i+1] = color[i];
-        entry[i+1] = entry[i];
-      }
-      top++;
-      color[pos+1] = value;
-      entry[pos+1] = pixel;
-    } else if ( bottom > 0 ) {
-      for ( i = bottom; i < pos; i++ ) {
-        color[i-1] = color[i];
-        entry[i-1] = entry[i];
-      }
-      bottom--;
-      color[pos] = value;
-      entry[pos] = pixel;
+    wxList& Handlers = wxImage::GetHandlers();
+    wxList::compatibility_iterator Node = Handlers.GetFirst();
+    while ( Node )
+    {
+        wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
+        fmts += wxT("*.") + Handler->GetExtension();
+        for (size_t i = 0; i < Handler->GetAltExtensions().size(); i++)
+            fmts += wxT(";*.") + Handler->GetAltExtensions()[i];
+        Node = Node->GetNext();
+        if ( Node ) fmts += wxT(";");

     }
 
     }
 

-  }
-
-  return( pixel );
+    return wxT("(") + fmts + wxT(")|") + fmts;

 }
 
 }
 

-wxBitmap wxImage::ConvertToBitmap() const
+wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)

 {
 {

-    wxBitmap bitmap;
-
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
+    const double red = rgb.red / 255.0,
+                 green = rgb.green / 255.0,
+                 blue = rgb.blue / 255.0;

 
 

-    int width = GetWidth();
-    int height = GetHeight();
+    // find the min and max intensity (and remember which one was it for the
+    // latter)
+    double minimumRGB = red;
+    if ( green < minimumRGB )
+        minimumRGB = green;
+    if ( blue < minimumRGB )
+        minimumRGB = blue;

 
 

-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
-
-    Display *dpy = (Display*) wxGetDisplay();
-    Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
-    int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) );
-
-    // Create image
-
-    XImage *data_image = XCreateImage( dpy, vis, bpp, ZPixmap, 0, 0, width, height, 32, 0 );
-    data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height );
-
-    bitmap.Create( width, height, bpp );
+    enum { RED, GREEN, BLUE } chMax = RED;
+    double maximumRGB = red;
+    if ( green > maximumRGB )
+    {
+        chMax = GREEN;
+        maximumRGB = green;
+    }
+    if ( blue > maximumRGB )
+    {
+        chMax = BLUE;
+        maximumRGB = blue;
+    }

 
 

-    // Create mask
+    const double value = maximumRGB;

 
 

-    XImage *mask_image = (XImage*) NULL;
-    if (HasMask())
+    double hue = 0.0, saturation;
+    const double deltaRGB = maximumRGB - minimumRGB;
+    if ( wxIsNullDouble(deltaRGB) )

     {
     {

-        mask_image = XCreateImage( dpy, vis, 1, ZPixmap, 0, 0, width, height, 32, 0 );
-        mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height );
+        // Gray has no color
+        hue = 0.0;
+        saturation = 0.0;

     }
     }

+    else
+    {
+        switch ( chMax )
+        {
+            case RED:
+                hue = (green - blue) / deltaRGB;
+                break;

 
 

-    // Retrieve depth info
-
-    XVisualInfo vinfo_template;
-    XVisualInfo *vi;
+            case GREEN:
+                hue = 2.0 + (blue - red) / deltaRGB;
+                break;

 
 

-    vinfo_template.visual = vis;
-    vinfo_template.visualid = XVisualIDFromVisual( vis );
-    vinfo_template.depth = bpp;
-    int nitem = 0;
+            case BLUE:
+                hue = 4.0 + (red - green) / deltaRGB;
+                break;

 
 

-    vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
+            default:
+                wxFAIL_MSG(wxT("hue not specified"));
+                break;
+        }

 
 

-    wxCHECK_MSG( vi, wxNullBitmap, wxT("no visual") );
+        hue /= 6.0;

 
 

-    XFree( vi );
+        if ( hue < 0.0 )
+            hue += 1.0;

 
 

-    if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
+        saturation = deltaRGB / maximumRGB;
+    }

 
 

-    // Render
+    return HSVValue(hue, saturation, value);
+}

 
 

-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
+wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv)
+{
+    double red, green, blue;

 
 

-    if (bpp >= 24)
+    if ( wxIsNullDouble(hsv.saturation) )

     {
     {

-        if ((vi->red_mask > vi->green_mask) && (vi->green_mask > vi->blue_mask))      b_o = RGB;
-        else if ((vi->red_mask > vi->blue_mask) && (vi->blue_mask > vi->green_mask))  b_o = RGB;
-        else if ((vi->blue_mask > vi->red_mask) && (vi->red_mask > vi->green_mask))   b_o = BRG;
-        else if ((vi->blue_mask > vi->green_mask) && (vi->green_mask > vi->red_mask)) b_o = BGR;
-        else if ((vi->green_mask > vi->red_mask) && (vi->red_mask > vi->blue_mask))   b_o = GRB;
-        else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask))  b_o = GBR;
+        // Grey
+        red = hsv.value;
+        green = hsv.value;
+        blue = hsv.value;

     }
     }

-
-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
-
-    XColor colors[256];
-    if (bpp == 8)
+    else // not grey

     {
     {

-        Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy );
+        double hue = hsv.hue * 6.0;      // sector 0 to 5
+        int i = (int)floor(hue);
+        double f = hue - i;          // fractional part of h
+        double p = hsv.value * (1.0 - hsv.saturation);

 
 

-        for (int i = 0; i < 256; i++) colors[i].pixel = i;
-        XQueryColors( dpy, cmap, colors, 256 );
+        switch (i)
+        {
+            case 0:
+                red = hsv.value;
+                green = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+                blue = p;
+                break;
+
+            case 1:
+                red = hsv.value * (1.0 - hsv.saturation * f);
+                green = hsv.value;
+                blue = p;
+                break;
+
+            case 2:
+                red = p;
+                green = hsv.value;
+                blue = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+                break;
+
+            case 3:
+                red = p;
+                green = hsv.value * (1.0 - hsv.saturation * f);
+                blue = hsv.value;
+                break;
+
+            case 4:
+                red = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+                green = p;
+                blue = hsv.value;
+                break;
+
+            default:    // case 5:
+                red = hsv.value;
+                green = p;
+                blue = hsv.value * (1.0 - hsv.saturation * f);
+                break;
+        }

     }
 
     }
 

-    wxSearchColor scolor( 256, colors );
-    unsigned char* data = GetData();
+    return RGBValue((unsigned char)(red * 255.0),
+                    (unsigned char)(green * 255.0),
+                    (unsigned char)(blue * 255.0));
+}
+
+/*
+ * Rotates the hue of each pixel of the image. angle is a double in the range
+ * -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
+ */
+void wxImage::RotateHue(double angle)
+{
+    AllocExclusive();

 
 

-    bool hasMask = HasMask();
+    unsigned char *srcBytePtr;
+    unsigned char *dstBytePtr;
+    unsigned long count;
+    wxImage::HSVValue hsv;
+    wxImage::RGBValue rgb;

 
 

-    int index = 0;
-    for (int y = 0; y < height; y++)
+    wxASSERT (angle >= -1.0 && angle <= 1.0);
+    count = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    if ( count > 0 && !wxIsNullDouble(angle) )

     {
     {

-        for (int x = 0; x < width; x++)
+        srcBytePtr = M_IMGDATA->m_data;
+        dstBytePtr = srcBytePtr;
+        do

         {
         {

-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            if (hasMask)
-            {
-              if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                XPutPixel( mask_image, x, y, 0 );
-              else
-                XPutPixel( mask_image, x, y, 1 );
-            }
-
-            switch (bpp)
-            {
-            case 8:
-                {
-#if 0 // Old, slower code
-                    int pixel = -1;
-                    /*
-                    if (wxTheApp->m_colorCube)
-                    {
-                    pixel = wxTheApp->m_colorCube
-                    [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                    }
-                    else
-                    {
-                    */
-                    int max = 3 * (65536);
-                    for (int i = 0; i < 256; i++)
-                    {
-                        int rdiff = (r << 8) - colors[i].red;
-                        int gdiff = (g << 8) - colors[i].green;
-                        int bdiff = (b << 8) - colors[i].blue;
-                        int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
-                        if (sum < max) { pixel = i; max = sum; }
-                    }
-                    /*
-                    }
-                    */
-#endif
-
-                    // And this is all to get the 'right' color...
-                    int pixel = scolor.SearchColor( r, g, b );
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 15:
-                {
-                    int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 16:
-                {
-                    int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 32:
-            case 24:
-                {
-                    int pixel = 0;
-                    switch (b_o)
-                    {
-                    case RGB: pixel = (r << 16) | (g << 8) | b; break;
-                    case RBG: pixel = (r << 16) | (b << 8) | g; break;
-                    case BRG: pixel = (b << 16) | (r << 8) | g; break;
-                    case BGR: pixel = (b << 16) | (g << 8) | r; break;
-                    case GRB: pixel = (g << 16) | (r << 8) | b; break;
-                    case GBR: pixel = (g << 16) | (b << 8) | r; break;
-                    }
-                    XPutPixel( data_image, x, y, pixel );
-                }
-            default: break;
-            }
-        } // for
-    }  // for
+            rgb.red = *srcBytePtr++;
+            rgb.green = *srcBytePtr++;
+            rgb.blue = *srcBytePtr++;
+            hsv = RGBtoHSV(rgb);

 
 

-    // Blit picture
+            hsv.hue = hsv.hue + angle;
+            if (hsv.hue > 1.0)
+                hsv.hue = hsv.hue - 1.0;
+            else if (hsv.hue < 0.0)
+                hsv.hue = hsv.hue + 1.0;

 
 

-    XGCValues gcvalues;
-    gcvalues.foreground = BlackPixel( dpy, DefaultScreen( dpy ) );
-    GC gc = XCreateGC( dpy, RootWindow ( dpy, DefaultScreen(dpy) ), GCForeground, &gcvalues );
-    XPutImage( dpy, (Drawable)bitmap.GetPixmap(), gc, data_image, 0, 0, 0, 0, width, height );
+            rgb = HSVtoRGB(hsv);
+            *dstBytePtr++ = rgb.red;
+            *dstBytePtr++ = rgb.green;
+            *dstBytePtr++ = rgb.blue;
+        } while (--count != 0);
+    }
+}

 
 

-    XDestroyImage( data_image );
-    XFreeGC( dpy, gc );
+//-----------------------------------------------------------------------------
+// wxImageHandler
+//-----------------------------------------------------------------------------

 
 

-    // Blit mask
-    if (HasMask())
-    {
-        wxBitmap maskBitmap(width, height, 1);
+IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)

 
 

-        GC gcMask = XCreateGC( dpy, (Pixmap) maskBitmap.GetPixmap(), (XtGCMask) 0, (XGCValues*)NULL );
-        XPutImage( dpy, (Drawable)maskBitmap.GetPixmap(), gcMask, mask_image, 0, 0, 0, 0, width, height );
+#if wxUSE_STREAMS
+int wxImageHandler::GetImageCount( wxInputStream& stream )
+{
+    // NOTE: this code is the same of wxAnimationDecoder::CanRead and
+    //       wxImageHandler::CallDoCanRead

 
 

-        XDestroyImage( mask_image );
-        XFreeGC( dpy, gcMask );
+    if ( !stream.IsSeekable() )
+        return false;        // can't test unseekable stream

 
 

-        wxMask* mask = new wxMask;
-        mask->SetPixmap(maskBitmap.GetPixmap());
+    wxFileOffset posOld = stream.TellI();
+    int n = DoGetImageCount(stream);

 
 

-        bitmap.SetMask(mask);
+    // restore the old position to be able to test other formats and so on
+    if ( stream.SeekI(posOld) == wxInvalidOffset )
+    {
+        wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!"));

 
 

-        maskBitmap.SetPixmapNull();
+        // reading would fail anyhow as we're not at the right position
+        return false;

     }
 
     }
 

-    return bitmap;
+    return n;

 }
 
 }
 

-wxImage::wxImage( const wxBitmap &bitmap )
+bool wxImageHandler::CanRead( const wxString& name )

 {
 {

-    wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
-
-    Display *dpy = (Display*) wxGetDisplay();
-    Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
-    int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) );
-
-    XImage *ximage = XGetImage( dpy,
-        (Drawable)bitmap.GetPixmap(),
-        0, 0,
-        bitmap.GetWidth(), bitmap.GetHeight(),
-        AllPlanes, ZPixmap );
-
-    wxCHECK_RET( ximage, wxT("couldn't create image") );
-
-    Create( bitmap.GetWidth(), bitmap.GetHeight() );
-    char unsigned *data = GetData();
-
-    if (!data)
+    wxImageFileInputStream stream(name);
+    if ( !stream.IsOk() )

     {
     {

-        XDestroyImage( ximage );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return;
+        wxLogError(_("Failed to check format of image file \"%s\"."), name);
+
+        return false;

     }
 
     }
 

-    /*
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (bitmap.GetMask())
-    {
-    gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
-    0, 0,
-    bitmap.GetWidth(), bitmap.GetHeight() );
+    return CanRead(stream);
+}

 
 

-      SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-      }
-    */
+bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
+{
+    // NOTE: this code is the same of wxAnimationDecoder::CanRead and
+    //       wxImageHandler::GetImageCount

 
 

-    // Retrieve depth info
+    if ( !stream.IsSeekable() )
+        return false;        // can't test unseekable stream

 
 

-    XVisualInfo vinfo_template;
-    XVisualInfo *vi;
+    wxFileOffset posOld = stream.TellI();
+    bool ok = DoCanRead(stream);

 
 

-    vinfo_template.visual = vis;
-    vinfo_template.visualid = XVisualIDFromVisual( vis );
-    vinfo_template.depth = bpp;
-    int nitem = 0;
+    // restore the old position to be able to test other formats and so on
+    if ( stream.SeekI(posOld) == wxInvalidOffset )
+    {
+        wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!"));

 
 

-    vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
+        // reading would fail anyhow as we're not at the right position
+        return false;
+    }

 
 

-    wxCHECK_RET( vi, wxT("no visual") );
+    return ok;
+}

 
 

-    if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
+#endif // wxUSE_STREAMS

 
 

-    XFree( vi );
+/* static */
+wxImageResolution
+wxImageHandler::GetResolutionFromOptions(const wxImage& image, int *x, int *y)
+{
+    wxCHECK_MSG( x && y, wxIMAGE_RESOLUTION_NONE, wxT("NULL pointer") );

 
 

-    XColor colors[256];
-    if (bpp == 8)
+    if ( image.HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+         image.HasOption(wxIMAGE_OPTION_RESOLUTIONY) )

     {
     {

-        Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy );
-
-        for (int i = 0; i < 256; i++) colors[i].pixel = i;
-        XQueryColors( dpy, cmap, colors, 256 );
+        *x = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
+        *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);

     }
     }

-
-    long pos = 0;
-    for (int j = 0; j < bitmap.GetHeight(); j++)
+    else if ( image.HasOption(wxIMAGE_OPTION_RESOLUTION) )

     {
     {

-        for (int i = 0; i < bitmap.GetWidth(); i++)
-        {
-            int pixel = XGetPixel( ximage, i, j );
-            if (bpp <= 8)
-            {
-                data[pos] = colors[pixel].red >> 8;
-                data[pos+1] = colors[pixel].green >> 8;
-                data[pos+2] = colors[pixel].blue >> 8;
-            } else if (bpp == 15)
-            {
-                data[pos] = (pixel >> 7) & 0xf8;
-                data[pos+1] = (pixel >> 2) & 0xf8;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else if (bpp == 16)
-            {
-                data[pos] = (pixel >> 8) & 0xf8;
-                data[pos+1] = (pixel >> 3) & 0xfc;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else
-            {
-                data[pos] = (pixel >> 16) & 0xff;
-                data[pos+1] = (pixel >> 8) & 0xff;
-                data[pos+2] = pixel & 0xff;
-            }
+        *x =
+        *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+    }
+    else // no resolution options specified
+    {
+        *x =
+        *y = 0;

 
 

-            /*
-            if (gdk_image_mask)
-            {
-            int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-            if (mask_pixel == 0)
-            {
-            data[pos] = 16;
-            data[pos+1] = 16;
-            data[pos+2] = 16;
-            }
-            }
-            */
+        return wxIMAGE_RESOLUTION_NONE;
+    }

 
 

-            pos += 3;
-        }
+    // get the resolution unit too
+    int resUnit = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
+    if ( !resUnit )
+    {
+        // this is the default
+        resUnit = wxIMAGE_RESOLUTION_INCHES;

     }
 
     }
 

-    XDestroyImage( ximage );
-    /*
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-    */
+    return (wxImageResolution)resUnit;

 }
 }

-#endif

 
 

-#ifdef __WXPM__
-// OS/2 Presentation manager conversion routings
+// ----------------------------------------------------------------------------
+// image histogram stuff
+// ----------------------------------------------------------------------------

 
 

-wxBitmap wxImage::ConvertToBitmap() const
+bool
+wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
+                                        unsigned char *g,
+                                        unsigned char *b,
+                                        unsigned char r2,
+                                        unsigned char b2,
+                                        unsigned char g2) const

 {
 {

-    if ( !Ok() )
-        return wxNullBitmap;
-    wxBitmap bitmap; // remove
-// TODO:
-/*
-    int sizeLimit = 1024*768*3;
-
-    // width and height of the device-dependent bitmap
-    int width = GetWidth();
-    int bmpHeight = GetHeight();
-
-    // calc the number of bytes per scanline and padding
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary = bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-    // calc the number of DIBs and heights of DIBs
-    int numDIB = 1;
-    int hRemain = 0;
-    int height = sizeLimit/bytePerLine;
-    if( height >= bmpHeight )
-        height = bmpHeight;
-    else
-    {
-        numDIB =  bmpHeight / height;
-        hRemain = bmpHeight % height;
-        if( hRemain >0 )  numDIB++;
-    }
-
-    // set bitmap parameters
-    wxBitmap bitmap;
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-    bitmap.SetWidth( width );
-    bitmap.SetHeight( bmpHeight );
-    bitmap.SetDepth( wxDisplayDepth() );
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = (DWORD)width;
-    lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-    //   the general formula for biSizeImage:
-    //      ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate memory for DIB") );
-        free( lpDIBh );
-        return bitmap;
-    }
-
-    // create and set the device-dependent bitmap
-    HDC hdc = ::GetDC(NULL);
-    HDC memdc = ::CreateCompatibleDC( hdc );
-    HBITMAP hbitmap;
-    hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
-    ::SelectObject( memdc, hbitmap);
-
-    // copy image data into DIB data and then into DDB (in a loop)
-    unsigned char *data = GetData();
-    int i, j, n;
-    int origin = 0;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits;
+    unsigned long key = MakeKey(r2, g2, b2);

 
 

-    for( n=0; n<numDIB; n++ )
+    while ( find(key) != end() )

     {
     {

-        if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
-        {
-            // redefine height and size of the (possibly) last smaller DIB
-            // memory is not reallocated
-            height = hRemain;
-            lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-            lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        }
-        ptbits = lpBits;
-
-        for( j=0; j<height; j++ )
-        {
-            for( i=0; i<width; i++ )
-            {
-                *(ptbits++) = *(ptdata+2);
-                *(ptbits++) = *(ptdata+1);
-                *(ptbits++) = *(ptdata  );
-                ptdata += 3;
-            }
-            for( i=0; i< padding; i++ )   *(ptbits++) = 0;
-        }
-        ::StretchDIBits( memdc, 0, origin, width, height,\
-            0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-        origin += height;
-        // if numDIB = 1,  lines below can also be used
-        //    hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
-        // The above line is equivalent to the following two lines.
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
-        // or the following lines
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    HDC memdc = ::CreateCompatibleDC( hdc );
-        //    ::SelectObject( memdc, hbitmap);
-        //    ::SetDIBitsToDevice( memdc, 0, 0, width, height,
-        //            0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
-        //    ::SelectObject( memdc, 0 );
-        //    ::DeleteDC( memdc );
-    }
-    bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
-
-    // similarly, created an mono-bitmap for the possible mask
-    if( HasMask() )
-    {
-        hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
-        ::SelectObject( memdc, hbitmap);
-        if( numDIB == 1 )   height = bmpHeight;
-        else                height = sizeLimit/bytePerLine;
-        lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-        lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        origin = 0;
-        unsigned char r = GetMaskRed();
-        unsigned char g = GetMaskGreen();
-        unsigned char b = GetMaskBlue();
-        unsigned char zero = 0, one = 255;
-        ptdata = data;
-        for( n=0; n<numDIB; n++ )
+        // color already used
+        r2++;
+        if ( r2 >= 255 )

         {
         {

-            if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
-            {
-                // redefine height and size of the (possibly) last smaller DIB
-                // memory is not reallocated
-                height = hRemain;
-                lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-                lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-            }
-            ptbits = lpBits;
-            for( int j=0; j<height; j++ )
+            r2 = 0;
+            g2++;
+            if ( g2 >= 255 )

             {
             {

-                for(i=0; i<width; i++ )
+                g2 = 0;
+                b2++;
+                if ( b2 >= 255 )

                 {
                 {

-                    if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
-                    {
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                    }
-                    else
-                    {
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                    }
+                    wxLogError(_("No unused colour in image.") );
+                    return false;

                 }
                 }

-                for( i=0; i< padding; i++ )   *(ptbits++) = zero;

             }
             }

-            ::StretchDIBits( memdc, 0, origin, width, height,\
-                0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-            origin += height;

         }
         }

-        // create a wxMask object
-        wxMask *mask = new wxMask();
-        mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
-        bitmap.SetMask( mask );
-    }
-
-    // free allocated resources
-    ::SelectObject( memdc, 0 );
-    ::DeleteDC( memdc );
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
-
-    // check the wxBitmap object
-    if( bitmap.GetHBITMAP() )
-        bitmap.SetOk( TRUE );
-    else
-        bitmap.SetOk( FALSE );
-*/
-    return bitmap;
-}

 
 

-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    // check the bitmap
-    if( !bitmap.Ok() )
-    {
-        wxFAIL_MSG( wxT("invalid bitmap") );
-        return;
+        key = MakeKey(r2, g2, b2);

     }
 
     }
 

-    // create an wxImage object
-    int width = bitmap.GetWidth();
-    int height = bitmap.GetHeight();
-    Create( width, height );
-    unsigned char *data = GetData();
-    if( !data )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for image") );
-        return;
-    }
+    if ( r )
+        *r = r2;
+    if ( g )
+        *g = g2;
+    if ( b )
+        *b = b2;

 
 

-    // calc the number of bytes per scanline and padding in the DIB
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary =  bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-// TODO:
-/*
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );
-        return;
-    }
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB") );
-        free( data );
-        free( lpDIBh );
-        return;
-    }
-
-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hbitmap;
-    hbitmap = (HBITMAP) bitmap.GetHBITMAP();
-    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
-    {
-        for( j=0; j<width; j++ )
-        {
-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
-        }
-        ptbits += padding;
-    }
-
-    // similarly, set data according to the possible mask bitmap
-    if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        HDC memdc = ::CreateCompatibleDC( hdc );
-        ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
-        ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
-        ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-        ::DeleteDC( memdc );
-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
-        {
-            for( j=0; j<width; j++ )
-            {
-                if( *ptbits != 0 )
-                    ptdata += 3;
-                else
-                {
-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
-                }
-                ptbits += 3;
-            }
-            ptbits += padding;
-        }
-        SetMaskColour( r, g, b );
-        SetMask( TRUE );
-    }
-    else
-    {
-        SetMask( FALSE );
-    }
-    // free allocated resources
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
-*/
+    return true;

 }
 
 }
 

-#endif
-
-// A module to allow wxImage initialization/cleanup
-// without calling these functions from app.cpp or from
-// the user's application.
-
-class wxImageModule: public wxModule
+bool
+wxImage::FindFirstUnusedColour(unsigned char *r,
+                               unsigned char *g,
+                               unsigned char *b,
+                               unsigned char r2,
+                               unsigned char b2,
+                               unsigned char g2) const

 {
 {

-DECLARE_DYNAMIC_CLASS(wxImageModule)
-public:
-    wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
-    void OnExit() { wxImage::CleanUpHandlers(); };
-};
+    wxImageHistogram histogram;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+    ComputeHistogram(histogram);
+
+    return histogram.FindFirstUnusedColour(r, g, b, r2, g2, b2);
+}

 
 
 
 

-//-----------------------------------------------------------------------------

 
 // GRG, Dic/99
 // Counts and returns the number of different colours. Optionally stops
 
 // GRG, Dic/99
 // Counts and returns the number of different colours. Optionally stops


@@ -2859,11 +3069,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
 // less, in this case it would be invoked as CountColours(256)). Default
 // value for stopafter is -1 (don't care).
 //
 // less, in this case it would be invoked as CountColours(256)). Default
 // value for stopafter is -1 (don't care).
 //

-unsigned long wxImage::CountColours( unsigned long stopafter )
+unsigned long wxImage::CountColours( unsigned long stopafter ) const

 {
     wxHashTable h;
     wxObject dummy;
 {
     wxHashTable h;
     wxObject dummy;

-    unsigned char r, g, b, *p;
+    unsigned char r, g, b;
+    unsigned char *p;

     unsigned long size, nentries, key;
 
     p = GetData();
     unsigned long size, nentries, key;
 
     p = GetData();


@@ -2875,7 +3086,7 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
         r = *(p++);
         g = *(p++);
         b = *(p++);
         r = *(p++);
         g = *(p++);
         b = *(p++);

-        key = (r << 16) | (g << 8) | b;
+        key = wxImageHistogram::MakeKey(r, g, b);

 
         if (h.Get(key) == NULL)
         {
 
         if (h.Get(key) == NULL)
         {


@@ -2888,42 +3099,26 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 }
 
 
 }
 
 

-// GRG, Dic/99
-// Computes the histogram of the image and fills a hash table, indexed
-// with integer keys built as 0xRRGGBB, containing wxHNode objects. Each
-// wxHNode contains an 'index' (useful to build a palette with the image
-// colours) and a 'value', which is the number of pixels in the image with
-// that colour.
-//
-unsigned long wxImage::ComputeHistogram( wxHashTable &h )
+unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const

 {
 {

-    unsigned char r, g, b, *p;
-    unsigned long size, nentries, key;
-    wxHNode *hnode;
+    unsigned char *p = GetData();
+    unsigned long nentries = 0;

 
 

-    p = GetData();
-    size = GetWidth() * GetHeight();
-    nentries = 0;
+    h.clear();

 
 

-    for (unsigned long j = 0; j < size; j++)
-    {
-        r = *(p++);
-        g = *(p++);
-        b = *(p++);
-        key = (r << 16) | (g << 8) | b;
+    const unsigned long size = GetWidth() * GetHeight();

 
 

-        hnode = (wxHNode *) h.Get(key);
+    unsigned char r, g, b;
+    for ( unsigned long n = 0; n < size; n++ )
+    {
+        r = *p++;
+        g = *p++;
+        b = *p++;

 
 

-        if (hnode)
-            hnode->value++;
-        else
-        {
-            hnode = new wxHNode();
-            hnode->index = nentries++;
-            hnode->value = 1;
+        wxImageHistogramEntry& entry = h[wxImageHistogram::MakeKey(r, g, b)];

 
 

-            h.Put(key, (wxObject *)hnode);
-        }
+        if ( entry.value++ == 0 )
+            entry.index = nentries++;

     }
 
     return nentries;
     }
 
     return nentries;


@@ -2933,18 +3128,7 @@ unsigned long wxImage::ComputeHistogram( wxHashTable &h )
  * Rotation code by Carlos Moreno
  */
 
  * Rotation code by Carlos Moreno
  */
 

-// GRG: I've removed wxRotationPoint - we already have wxRealPoint which
-//      does exactly the same thing. And I also got rid of wxRotationPixel
-//      bacause of potential problems in architectures where alignment
-//      is an issue, so I had to rewrite parts of the code.
-
-static const double gs_Epsilon = 1e-10;
-
-static inline int wxCint (double x)
-{
-    return (x > 0) ? (int) (x + 0.5) : (int) (x - 0.5);
-}
-
+static const double wxROTATE_EPSILON = 1e-10;

 
 // Auxiliary function to rotate a point (x,y) with respect to point p0
 // make it inline and use a straight return to facilitate optimization
 
 // Auxiliary function to rotate a point (x,y) with respect to point p0
 // make it inline and use a straight return to facilitate optimization


@@ -2952,32 +3136,53 @@ static inline int wxCint (double x)
 // repeating the time-consuming calls to these functions -- sin/cos can
 // be computed and stored in the calling function.
 
 // repeating the time-consuming calls to these functions -- sin/cos can
 // be computed and stored in the calling function.
 

-inline wxRealPoint rotated_point (const wxRealPoint & p, double cos_angle, double sin_angle, const wxRealPoint & p0)
+static inline wxRealPoint
+wxRotatePoint(const wxRealPoint& p, double cos_angle, double sin_angle,
+              const wxRealPoint& p0)

 {
 {

-    return wxRealPoint (p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
-                        p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);
+    return wxRealPoint(p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
+                       p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);

 }
 
 }
 

-inline wxRealPoint rotated_point (double x, double y, double cos_angle, double sin_angle, const wxRealPoint & p0)
+static inline wxRealPoint
+wxRotatePoint(double x, double y, double cos_angle, double sin_angle,
+              const wxRealPoint & p0)

 {
 {

-    return rotated_point (wxRealPoint(x,y), cos_angle, sin_angle, p0);
+    return wxRotatePoint (wxRealPoint(x,y), cos_angle, sin_angle, p0);

 }
 
 }
 

-wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool interpolating, wxPoint * offset_after_rotation) const
+wxImage wxImage::Rotate(double angle,
+                        const wxPoint& centre_of_rotation,
+                        bool interpolating,
+                        wxPoint *offset_after_rotation) const

 {
 {

+    // screen coordinates are a mirror image of "real" coordinates
+    angle = -angle;
+
+    const bool has_alpha = HasAlpha();
+
+    const int w = GetWidth();
+    const int h = GetHeight();
+

     int i;
     int i;

-    angle = -angle;     // screen coordinates are a mirror image of "real" coordinates

 
     // Create pointer-based array to accelerate access to wxImage's data
 
     // Create pointer-based array to accelerate access to wxImage's data

-    unsigned char ** data = new unsigned char * [GetHeight()];
-
+    unsigned char ** data = new unsigned char * [h];

     data[0] = GetData();
     data[0] = GetData();

+    for (i = 1; i < h; i++)
+        data[i] = data[i - 1] + (3 * w);

 
 

-    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 * [h];
+        alpha[0] = GetAlpha();
+        for (i = 1; i < h; i++)
+            alpha[i] = alpha[i - 1] + w;
+    }

 
     // precompute coefficients for rotation formula
 
     // precompute coefficients for rotation formula

-    // (sine and cosine of the angle)

     const double cos_angle = cos(angle);
     const double sin_angle = sin(angle);
 
     const double cos_angle = cos(angle);
     const double sin_angle = sin(angle);
 


@@ -2987,32 +3192,35 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
 
     const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
 
 
     const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
 

-    wxRealPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0);
-    wxRealPoint p2 = rotated_point (0, GetHeight(), cos_angle, sin_angle, p0);
-    wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0);
-    wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), cos_angle, sin_angle, p0);
+    wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0);
+    wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0);
+    wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0);
+    wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0);

 
 

-    int x1 = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
-    int y1 = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
-    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)));
+    int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
+    int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
+    int x2a = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
+    int y2a = (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 (x2a - x1a + 1, y2a - y1a + 1, false);
+    // With alpha channel
+    if (has_alpha)
+        rotated.SetAlpha();

 
     if (offset_after_rotation != NULL)
     {
 
     if (offset_after_rotation != NULL)
     {

-        *offset_after_rotation = wxPoint (x1, y1);
+        *offset_after_rotation = wxPoint (x1a, y1a);

     }
 
     }
 

-    // GRG: The rotated (destination) image is always accessed
-    //      sequentially, so there is no need for a pointer-based
-    //      array here (and in fact it would be slower).
-    //
-    unsigned char * dst = rotated.GetData();
+    // the rotated (destination) image is always accessed sequentially via this
+    // pointer, there is no need for pointer-based arrays here
+    unsigned char *dst = rotated.GetData();

 
 

-    // GRG: if the original image has a mask, use its RGB values
-    //      as the blank pixel, else, fall back to default (black).
-    //
+    unsigned char *alpha_dst = has_alpha ? rotated.GetAlpha() : NULL;
+
+    // if the original image has a mask, use its RGB values as the blank pixel,
+    // else, fall back to default (black).

     unsigned char blank_r = 0;
     unsigned char blank_g = 0;
     unsigned char blank_b = 0;
     unsigned char blank_r = 0;
     unsigned char blank_g = 0;
     unsigned char blank_b = 0;


@@ -3029,46 +3237,45 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     // performing an inverse rotation (a rotation of -angle) and getting the
     // pixel at those coordinates
 
     // performing an inverse rotation (a rotation of -angle) and getting the
     // pixel at those coordinates
 

-    // GRG: I've taken the (interpolating) test out of the loops, so that
-    //      it is done only once, instead of repeating it for each pixel.
+    const int rH = rotated.GetHeight();
+    const int rW = rotated.GetWidth();

 
 

-    int x;
+    // do the (interpolating) test outside of the loops, so that it is done
+    // only once, instead of repeating it for each pixel.

     if (interpolating)
     {
     if (interpolating)
     {

-        for (int y = 0; y < rotated.GetHeight(); y++)
+        for (int y = 0; y < rH; y++)

         {
         {

-            for (x = 0; x < rotated.GetWidth(); x++)
+            for (int x = 0; x < rW; x++)

             {
             {

-                wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+                wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);

 
 

-                if (-0.25 < src.x && src.x < GetWidth() - 0.75 &&
-                    -0.25 < src.y && src.y < GetHeight() - 0.75)
+                if (-0.25 < src.x && src.x < w - 0.75 &&
+                    -0.25 < src.y && src.y < h - 0.75)

                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point
                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point

-                        // C.M. 2000-02-17:  when the point is near the border, special care is required.
-

                     int x1, y1, x2, y2;
 
                     int x1, y1, x2, y2;
 

-                    if (0 < src.x && src.x < GetWidth() - 1)
+                    if (0 < src.x && src.x < w - 1)

                     {
                     {

-                        x1 = wxCint(floor(src.x));
-                        x2 = wxCint(ceil(src.x));
+                        x1 = wxRound(floor(src.x));
+                        x2 = wxRound(ceil(src.x));

                     }
                     else    // else means that x is near one of the borders (0 or width-1)
                     {
                     }
                     else    // else means that x is near one of the borders (0 or width-1)
                     {

-                        x1 = x2 = wxCint (src.x);
+                        x1 = x2 = wxRound (src.x);

                     }
 
                     }
 

-                    if (0 < src.y && src.y < GetHeight() - 1)
+                    if (0 < src.y && src.y < h - 1)

                     {
                     {

-                        y1 = wxCint(floor(src.y));
-                        y2 = wxCint(ceil(src.y));
+                        y1 = wxRound(floor(src.y));
+                        y2 = wxRound(ceil(src.y));

                     }
                     else
                     {
                     }
                     else
                     {

-                        y1 = y2 = wxCint (src.y);
+                        y1 = y2 = wxRound (src.y);

                     }
 
                     // get four points and the distances (square of the distance,
                     }
 
                     // get four points and the distances (square of the distance,


@@ -3077,7 +3284,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     // GRG: Do not calculate the points until they are
                     //      really needed -- this way we can calculate
                     //      just one, instead of four, if d1, d2, d3
                     // GRG: Do not calculate the points until they are
                     //      really needed -- this way we can calculate
                     //      just one, instead of four, if d1, d2, d3

-                    //      or d4 are < gs_Epsilon
+                    //      or d4 are < wxROTATE_EPSILON

 
                     const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1);
                     const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1);
 
                     const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1);
                     const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1);


@@ -3090,33 +3297,46 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     // If the point is exactly at one point of the grid of the source
                     // image, then don't interpolate -- just assign the pixel
 
                     // If the point is exactly at one point of the grid of the source
                     // image, then don't interpolate -- just assign the pixel
 

-                    if (d1 < gs_Epsilon)        // d1,d2,d3,d4 are positive -- no need for abs()
+                    // d1,d2,d3,d4 are positive -- no need for abs()
+                    if (d1 < wxROTATE_EPSILON)

                     {
                         unsigned char *p = data[y1] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     {
                         unsigned char *p = data[y1] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y1] + x1);

                     }
                     }

-                    else if (d2 < gs_Epsilon)
+                    else if (d2 < wxROTATE_EPSILON)

                     {
                         unsigned char *p = data[y1] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     {
                         unsigned char *p = data[y1] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y1] + x2);

                     }
                     }

-                    else if (d3 < gs_Epsilon)
+                    else if (d3 < wxROTATE_EPSILON)

                     {
                         unsigned char *p = data[y2] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     {
                         unsigned char *p = data[y2] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y2] + x2);

                     }
                     }

-                    else if (d4 < gs_Epsilon)
+                    else if (d4 < wxROTATE_EPSILON)

                     {
                         unsigned char *p = data[y2] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     {
                         unsigned char *p = data[y2] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

-                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y2] + x1);

                     }
                     else
                     {
                     }
                     else
                     {


@@ -3139,9 +3359,22 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                                w3 * *(v3++) + w4 * *(v4++)) /
                               (w1 + w2 + w3 + w4) );
                         *(dst++) = (unsigned char)
                                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) );
                               (w1 + w2 + w3 + w4) );

+
+                        if (has_alpha)
+                        {
+                            v1 = alpha[y1] + (x1);
+                            v2 = alpha[y1] + (x2);
+                            v3 = alpha[y2] + (x2);
+                            v4 = alpha[y2] + (x1);
+
+                            *(alpha_dst++) = (unsigned char)
+                                ( (w1 * *v1 + w2 * *v2 +
+                                   w3 * *v3 + w4 * *v4) /
+                                  (w1 + w2 + w3 + w4) );
+                        }

                     }
                 }
                 else
                     }
                 }
                 else


@@ -3149,41 +3382,71 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     *(dst++) = blank_r;
                     *(dst++) = blank_g;
                     *(dst++) = blank_b;
                     *(dst++) = blank_r;
                     *(dst++) = blank_g;
                     *(dst++) = blank_b;

+
+                    if (has_alpha)
+                        *(alpha_dst++) = 0;

                 }
             }
         }
     }
                 }
             }
         }
     }

-    else    // not interpolating
+    else // not interpolating

     {
     {

-        for (int y = 0; y < rotated.GetHeight(); y++)
+        for (int y = 0; y < rH; y++)

         {
         {

-            for (x = 0; x < rotated.GetWidth(); x++)
+            for (int x = 0; x < rW; x++)

             {
             {

-                wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+                wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);

 
 

-                const int xs = wxCint (src.x);      // wxCint rounds to the
-                const int ys = wxCint (src.y);      // closest integer
+                const int xs = wxRound (src.x);      // wxRound rounds to the
+                const int ys = wxRound (src.y);      // closest integer

 
 

-                if (0 <= xs && xs < GetWidth() &&
-                    0 <= ys && ys < GetHeight())
+                if (0 <= xs && xs < w && 0 <= ys && ys < h)

                 {
                     unsigned char *p = data[ys] + (3 * xs);
                     *(dst++) = *(p++);
                     *(dst++) = *(p++);
                 {
                     unsigned char *p = data[ys] + (3 * xs);
                     *(dst++) = *(p++);
                     *(dst++) = *(p++);

-                    *(dst++) = *(p++);
+                    *(dst++) = *p;
+
+                    if (has_alpha)
+                        *(alpha_dst++) = *(alpha[ys] + (xs));

                 }
                 else
                 {
                     *(dst++) = blank_r;
                     *(dst++) = blank_g;
                     *(dst++) = blank_b;
                 }
                 else
                 {
                     *(dst++) = blank_r;
                     *(dst++) = blank_g;
                     *(dst++) = blank_b;

+
+                    if (has_alpha)
+                        *(alpha_dst++) = 255;

                 }
             }
         }
     }
 
     delete [] data;
                 }
             }
         }
     }
 
     delete [] data;

+    delete [] alpha;

 
     return rotated;
 }
 
 
     return rotated;
 }
 

+
+
+
+
+// A module to allow wxImage initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxImageModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxImageModule)
+public:
+    wxImageModule() {}
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; }
+    void OnExit() { wxImage::CleanUpHandlers(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+
+
+#endif // wxUSE_IMAGE