Added Set/GetQuickBestSize

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index cccfe9f1bffd27601e6146e2a38274b1f4c734d9..64f367c5216066cc9f3e6f1aa1420ce3c272b905 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,29 +14,30 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE
 
 #if wxUSE_IMAGE
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/hash.h"
+    #include "wx/utils.h"
+#endif
+

 #include "wx/image.h"
 #include "wx/bitmap.h"
 #include "wx/debug.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"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"

-#include "wx/hash.h"
+#include "wx/math.h"

 
 

-// For memcpy
-#include <string.h>
-#include <math.h>
-
-#ifdef __SALFORDC__
-    #undef FAR
+#if wxUSE_XPM
+    #include "wx/xpmdecod.h"

 #endif
 
 #endif
 

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

 
 //-----------------------------------------------------------------------------
 // wxImage
 
 //-----------------------------------------------------------------------------
 // wxImage


@@ -63,8 +60,13 @@ public:
     unsigned char  *m_alpha;
 
     bool            m_ok;
     unsigned char  *m_alpha;
 
     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;
 #endif // wxUSE_PALETTE
 #if wxUSE_PALETTE
     wxPalette       m_palette;
 #endif // wxUSE_PALETTE


@@ -85,18 +87,19 @@ wxImageRefData::wxImageRefData()
     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;
     m_maskRed = 0;
     m_maskGreen = 0;
     m_maskBlue = 0;

-    m_hasMask = FALSE;
+    m_hasMask = false;

 
 

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

 }
 
 wxImageRefData::~wxImageRefData()
 {
     if ( !m_static )
         free( m_data );
 }
 
 wxImageRefData::~wxImageRefData()
 {
     if ( !m_static )
         free( m_data );

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

 }
 
 wxList wxImage::sm_handlers;
 }
 
 wxList wxImage::sm_handlers;


@@ -109,10 +112,6 @@ wxImage wxNullImage;
 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 

-wxImage::wxImage()
-{
-}
-

 wxImage::wxImage( int width, int height, bool clear )
 {
     Create( width, height, clear );
 wxImage::wxImage( int width, int height, bool clear )
 {
     Create( width, height, clear );


@@ -123,6 +122,11 @@ wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
     Create( width, height, data, static_data );
 }
 
     Create( width, height, data, static_data );
 }
 

+wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
+{
+    Create( width, height, data, alpha, static_data );
+}
+

 wxImage::wxImage( const wxString& name, long type, int index )
 {
     LoadFile( name, type, index );
 wxImage::wxImage( const wxString& name, long type, int index )
 {
     LoadFile( name, type, index );


@@ -145,56 +149,85 @@ wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
 }
 #endif // wxUSE_STREAMS
 
 }
 #endif // wxUSE_STREAMS
 

-wxImage::wxImage( const wxImage& image )
-    : wxObject()
+wxImage::wxImage( const char** xpmData )

 {
 {

-    Ref(image);
+    Create(xpmData);

 }
 
 }
 

-wxImage::wxImage( const wxImage* image )
+wxImage::wxImage( char** xpmData )

 {
 {

-    if (image) Ref(*image);
+    Create((const char**) xpmData);
+}
+
+bool wxImage::Create( const char** xpmData )
+{
+#if wxUSE_XPM
+    UnRef();
+
+    wxXPMDecoder decoder;
+    (*this) = decoder.ReadData(xpmData);
+    return Ok();
+#else
+    return false;
+#endif

 }
 
 }
 

-void wxImage::Create( int width, int height, bool clear )
+bool wxImage::Create( int width, int height, bool clear )

 {
     UnRef();
 
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
 {
     UnRef();
 
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );

-    if (M_IMGDATA->m_data)
-    {
-        if (clear) memset(M_IMGDATA->m_data, 0, width*height*3);
-
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-    }
-    else
+    if (!M_IMGDATA->m_data)

     {
         UnRef();
     {
         UnRef();

+        return false;

     }
     }

+
+    if (clear)
+        memset(M_IMGDATA->m_data, 0, width*height*3);
+
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+
+    return true;

 }
 
 }
 

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

 {
     UnRef();
 
 {
     UnRef();
 

+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+

     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = data;
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = data;

-    if (M_IMGDATA->m_data)
-    {
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-        M_IMGDATA->m_static = static_data;
-    }
-    else
-    {
-        UnRef();
-    }
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;
+}
+
+bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
+{
+    UnRef();
+
+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = data;
+    M_IMGDATA->m_alpha = alpha;
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;

 }
 
 void wxImage::Destroy()
 }
 
 void wxImage::Destroy()


@@ -219,6 +252,20 @@ wxImage wxImage::Copy() const
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 

+    wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
+
+    // also copy the alpha channel
+    if (HasAlpha())
+    {
+        image.SetAlpha();
+        unsigned char* alpha = image.GetAlpha();
+        memcpy( alpha, GetAlpha(), M_IMGDATA->m_width*M_IMGDATA->m_height );
+    }
+
+    // also copy the image options
+    imgData->m_optionNames = M_IMGDATA->m_optionNames;
+    imgData->m_optionValues = M_IMGDATA->m_optionValues;
+

     return image;
 }
 
     return image;
 }
 


@@ -226,7 +273,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 {
     if( xFactor == 1 && yFactor == 1 )
         return Copy() ;
 {
     if( xFactor == 1 && yFactor == 1 )
         return Copy() ;

-        
+

     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );


@@ -237,7 +284,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 
     long old_height = M_IMGDATA->m_height,
          old_width  = M_IMGDATA->m_width;
 
     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( (old_height > 0) && (old_width > 0), image,
                  wxT("invalid old image size") );
 


@@ -254,20 +301,32 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
     unsigned char maskRed = 0;
     unsigned char maskGreen = 0;
     unsigned char maskBlue =0 ;
     unsigned char maskRed = 0;
     unsigned char maskGreen = 0;
     unsigned char maskBlue =0 ;

+
+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data;
+    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 ;
     if (M_IMGDATA->m_hasMask)
     {
         hasMask = true ;
         maskRed = M_IMGDATA->m_maskRed;
         maskGreen = M_IMGDATA->m_maskGreen;
         maskBlue =M_IMGDATA->m_maskBlue ;

-      
+

         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }
         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }

-    char unsigned *source_data = M_IMGDATA->m_data;
-    char unsigned *target_data = data;
-    
+    else
+    {
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )
+        {
+            image.SetAlpha() ;
+            target_alpha = image.GetAlpha() ;
+        }
+    }
+

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


@@ -275,6 +334,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
             unsigned long avgRed = 0 ;
             unsigned long avgGreen = 0;
             unsigned long avgBlue = 0;
             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 )
             unsigned long counter = 0 ;
             // determine average
             for ( int y1 = 0 ; y1 < yFactor ; ++y1 )


@@ -286,11 +346,18 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
                     unsigned char red = pixel[0] ;
                     unsigned char green = pixel[1] ;
                     unsigned char blue = pixel[2] ;
                     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 ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
                     {

-                        avgRed += red ;
-                        avgGreen += green ;
-                        avgBlue += blue ;
+                        if ( alpha > 0 )
+                        {
+                            avgRed += red ;
+                            avgGreen += green ;
+                            avgBlue += blue ;
+                        }
+                        avgAlpha += alpha ;

                         counter++ ;
                     }
                 }
                         counter++ ;
                     }
                 }


@@ -303,14 +370,16 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
             }
             else
             {
             }
             else
             {

-                *(target_data++) = avgRed / counter ;
-                *(target_data++) = avgGreen / counter ;
-                *(target_data++) = avgBlue / counter ;
+                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 scalled accordingly:
+    // 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_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
                 (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);


@@ -347,15 +416,26 @@ wxImage wxImage::Scale( int width, int height ) const
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data;
+    unsigned char *source_alpha = 0 ;
+    unsigned char *target_alpha = 0 ;
+

     if (M_IMGDATA->m_hasMask)
     {
         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }
     if (M_IMGDATA->m_hasMask)
     {
         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }

-
-    unsigned char *source_data = M_IMGDATA->m_data;
-    unsigned char *target_data = data;
+    else
+    {
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )
+        {
+            image.SetAlpha() ;
+            target_alpha = image.GetAlpha() ;
+        }
+    }

 
     long x_delta = (old_width<<16) / width;
     long y_delta = (old_height<<16) / height;
 
     long x_delta = (old_width<<16) / width;
     long y_delta = (old_height<<16) / height;


@@ -366,22 +446,26 @@ wxImage wxImage::Scale( int width, int height ) const
     for ( long j = 0; j < height; j++ )
         {
         unsigned char* src_line = &source_data[(y>>16)*old_width*3];
     for ( long j = 0; j < height; j++ )
         {
         unsigned char* src_line = &source_data[(y>>16)*old_width*3];

+        unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;

 
         long x = 0;
         for ( long i = 0; i < width; i++ )
         {
              unsigned char* src_pixel = &src_line[(x>>16)*3];
 
         long x = 0;
         for ( long i = 0; i < width; i++ )
         {
              unsigned char* src_pixel = &src_line[(x>>16)*3];

+             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;
              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;
     }
 
              x += x_delta;
         }
 
         y += y_delta;
     }
 

-    // In case this is a cursor, make sure the hotspot is scalled accordingly:
+    // 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_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
                 (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);


@@ -404,25 +488,53 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data;
+    unsigned char *alpha_data = 0 ;
+    unsigned char *source_alpha = 0 ;
+    unsigned char *target_alpha = 0 ;
+

     if (M_IMGDATA->m_hasMask)
     if (M_IMGDATA->m_hasMask)

+    {

         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );

+    }
+    else
+    {
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )
+        {
+            image.SetAlpha() ;
+            alpha_data = image.GetAlpha() ;
+        }
+    }

 
     long height = M_IMGDATA->m_height;
     long width  = M_IMGDATA->m_width;
 
 
     long height = M_IMGDATA->m_height;
     long width  = M_IMGDATA->m_width;
 

-    unsigned char *source_data = M_IMGDATA->m_data;
-    unsigned char *target_data;
-

     for (long j = 0; j < height; j++)
     {
         for (long i = 0; i < width; i++)
         {
             if (clockwise)
     for (long j = 0; j < height; j++)
     {
         for (long i = 0; i < width; i++)
         {
             if (clockwise)

+            {

                 target_data = data + (((i+1)*height) - j - 1)*3;
                 target_data = data + (((i+1)*height) - j - 1)*3;

+                if(source_alpha)
+                    target_alpha = alpha_data + (((i+1)*height) - j - 1);
+            }

             else
             else

+            {

                 target_data = data + ((height*(width-1)) + j - (i*height))*3;
                 target_data = data + ((height*(width-1)) + j - (i*height))*3;

+                if(source_alpha)
+                    target_alpha = alpha_data + ((height*(width-1)) + j - (i*height));
+            }

             memcpy( target_data, source_data, 3 );
             source_data += 3;
             memcpy( target_data, source_data, 3 );
             source_data += 3;

+
+            if(source_alpha)
+            {
+                memcpy( target_alpha, source_alpha, 1 );
+                source_alpha += 1;
+            }

         }
     }
 
         }
     }
 


@@ -438,9 +550,16 @@ wxImage wxImage::Mirror( bool horizontally ) const
     image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();
     image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();

+    unsigned char *alpha = NULL;

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

+    if (M_IMGDATA->m_alpha != NULL) {
+        image.SetAlpha();
+        alpha = image.GetAlpha();
+        wxCHECK_MSG( alpha, image, wxT("unable to create alpha channel") );
+    }
+

     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 
     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 


@@ -463,6 +582,25 @@ wxImage wxImage::Mirror( bool horizontally ) const
                 target_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
     {


@@ -472,6 +610,23 @@ wxImage wxImage::Mirror( bool horizontally ) const
             memcpy( target_data, source_data, (size_t)3*width );
             source_data += 3*width;
         }
             memcpy( target_data, source_data, (size_t)3*width );
             source_data += 3*width;
         }

+
+        if (alpha != NULL)
+        {
+            // 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;
+            }
+        }

     }
 
     return image;
     }
 
     return image;


@@ -483,32 +638,89 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) &&
+                 (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),

                  image, wxT("invalid subimage size") );
 
                  image, wxT("invalid subimage size") );
 

-    int subwidth=rect.GetWidth();
-    const int subheight=rect.GetHeight();
+    const int subwidth = rect.GetWidth();
+    const int subheight = rect.GetHeight();

 
     image.Create( subwidth, subheight, false );
 
 
     image.Create( subwidth, subheight, false );
 

-    unsigned char *subdata = image.GetData(), *data=GetData();
+    const unsigned char *src_data = GetData();
+    const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+    unsigned char *subdata = image.GetData();
+    unsigned char *subalpha = NULL;

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

+    if (src_alpha != NULL) {
+        image.SetAlpha();
+        subalpha = image.GetAlpha();
+        wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));
+    }
+

     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 
     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 

-    const int subleft=3*rect.GetLeft();
-    const int width=3*GetWidth();
-    subwidth*=3;
+    const int width = GetWidth();
+    const int pixsoff = rect.GetLeft() + width * rect.GetTop();

 
 

-    data+=rect.GetTop()*width+subleft;
+    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)
     {
 
     for (long j = 0; j < subheight; ++j)
     {

-        memcpy( subdata, data, subwidth);
-        subdata+=subwidth;
-        data+=width;
+        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;
+        }
+    }
+
+    return image;
+}
+
+wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
+                       int r_, int g_, int b_ ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), 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))
+    {
+        GetOrFindMaskColour( &r, &g, &b );
+        image.SetMaskColour(r, g, b);
+    }
+
+    image.SetRGB(wxRect(), r, g, b);
+
+    wxRect subRect(pos.x, pos.y, width, height);
+    wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight());
+    if (pos.x < 0)
+        finalRect.width -= pos.x;
+    if (pos.y < 0)
+        finalRect.height -= pos.y;
+
+    subRect.Intersect(finalRect);
+
+    if (!subRect.IsEmpty())
+    {
+        if ((subRect.GetWidth() == width) && (subRect.GetHeight() == height))
+            image.Paste(*this, pos.x, pos.y);
+        else
+            image.Paste(GetSubImage(subRect), pos.x, pos.y);

     }
 
     return image;
     }
 
     return image;


@@ -544,6 +756,7 @@ void wxImage::Paste( const wxImage &image, int x, int y )
     if (height < 1) return;
 
     if ((!HasMask() && !image.HasMask()) ||
     if (height < 1) return;
 
     if ((!HasMask() && !image.HasMask()) ||

+        (HasMask() && !image.HasMask()) ||

        ((HasMask() && image.HasMask() &&
          (GetMaskRed()==image.GetMaskRed()) &&
          (GetMaskGreen()==image.GetMaskGreen()) &&
        ((HasMask() && image.HasMask() &&
          (GetMaskRed()==image.GetMaskRed()) &&
          (GetMaskGreen()==image.GetMaskGreen()) &&


@@ -617,6 +830,46 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
         }
 }
 
         }
 }
 

+wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+    unsigned char *dest = image.GetData();
+
+    wxCHECK_MSG( dest, image, wxT("unable to create image") );
+
+    unsigned char *src = M_IMGDATA->m_data;
+    bool hasMask = M_IMGDATA->m_hasMask;
+    unsigned char maskRed = M_IMGDATA->m_maskRed;
+    unsigned char maskGreen = M_IMGDATA->m_maskGreen;
+    unsigned char maskBlue = M_IMGDATA->m_maskBlue;
+
+    if ( hasMask )
+        image.SetMaskColour(maskRed, maskGreen, maskBlue);
+
+    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    for ( long i = 0; i < size; i++, src += 3, dest += 3 )
+    {
+        // don't modify the mask
+        if ( hasMask && src[0] == maskRed && src[1] == maskGreen && src[2] == maskBlue )
+        {
+            memcpy(dest, src, 3);
+        }
+        else
+        {
+            // calculate the luma
+            double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;
+            dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma);
+        }
+    }
+
+    return image;
+}
+

 wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
 {
     wxImage image;
 wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
 {
     wxImage image;


@@ -654,60 +907,106 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
     return image;
 }
 
     return image;
 }
 

-void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
+int wxImage::GetWidth() const

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_width;
+}

 
 

-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
+int wxImage::GetHeight() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_height;
+}
+
+long wxImage::XYToIndex(int x, int y) const
+{
+    if ( Ok() &&
+            x >= 0 && y >= 0 &&
+                x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )
+    {
+        return y*M_IMGDATA->m_width + x;
+    }
+
+    return -1;
+}

 
 

-    wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), wxT("invalid image index") );
+void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );

 
 

-    long pos = (y * w + x) * 3;
+    pos *= 3;

 
     M_IMGDATA->m_data[ pos   ] = r;
     M_IMGDATA->m_data[ pos+1 ] = g;
     M_IMGDATA->m_data[ pos+2 ] = b;
 }
 
 
     M_IMGDATA->m_data[ pos   ] = r;
     M_IMGDATA->m_data[ pos+1 ] = g;
     M_IMGDATA->m_data[ pos+2 ] = b;
 }
 

-unsigned char wxImage::GetRed( int x, int y ) const
+void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )

 {
 {

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

 
 

-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
+    wxRect rect(rect_);
+    wxRect imageRect(0, 0, GetWidth(), GetHeight());
+    if ( rect == wxRect() )
+    {
+        rect = imageRect;
+    }
+    else
+    {
+        wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) &&
+                     imageRect.Inside(rect.GetBottomRight()),
+                     wxT("invalid bounding rectangle") );
+    }

 
 

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
+    int x1 = rect.GetLeft(),
+        y1 = rect.GetTop(),
+        x2 = rect.GetRight() + 1,
+        y2 = rect.GetBottom() + 1;

 
 

-    long pos = (y * w + x) * 3;
+    unsigned char *data wxDUMMY_INITIALIZE(NULL);
+    int x, y, width = GetWidth();
+    for (y = y1; y < y2; y++)
+    {
+        data = M_IMGDATA->m_data + (y*width + x1)*3;
+        for (x = x1; x < x2; x++)
+        {
+            *data++ = r;
+            *data++ = g;
+            *data++ = b;
+        }
+    }
+}
+
+unsigned char wxImage::GetRed( int x, int y ) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    pos *= 3;

 
     return M_IMGDATA->m_data[pos];
 }
 
 unsigned char wxImage::GetGreen( int x, int y ) const
 {
 
     return M_IMGDATA->m_data[pos];
 }
 
 unsigned char wxImage::GetGreen( int x, int y ) const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
-
-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
-
-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );

 
 

-    long pos = (y * w + x) * 3;
+    pos *= 3;

 
     return M_IMGDATA->m_data[pos+1];
 }
 
 unsigned char wxImage::GetBlue( int x, int y ) const
 {
 
     return M_IMGDATA->m_data[pos+1];
 }
 
 unsigned char wxImage::GetBlue( int x, int y ) const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
-
-    int w = M_IMGDATA->m_width;
-    int h = M_IMGDATA->m_height;
-
-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );

 
 

-    long pos = (y * w + x) * 3;
+    pos *= 3;

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


@@ -727,7 +1026,7 @@ unsigned char *wxImage::GetData() const
     return M_IMGDATA->m_data;
 }
 
     return M_IMGDATA->m_data;
 }
 

-void wxImage::SetData( unsigned char *data )
+void wxImage::SetData( unsigned char *data, bool static_data  )

 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 


@@ -736,18 +1035,19 @@ void wxImage::SetData( unsigned char *data )
     newRefData->m_width = M_IMGDATA->m_width;
     newRefData->m_height = M_IMGDATA->m_height;
     newRefData->m_data = data;
     newRefData->m_width = M_IMGDATA->m_width;
     newRefData->m_height = M_IMGDATA->m_height;
     newRefData->m_data = data;

-    newRefData->m_ok = TRUE;
+    newRefData->m_ok = true;

     newRefData->m_maskRed = M_IMGDATA->m_maskRed;
     newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
     newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
     newRefData->m_hasMask = M_IMGDATA->m_hasMask;
     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;
 }
 
 
     UnRef();
 
     m_refData = newRefData;
 }
 

-void wxImage::SetData( unsigned char *data, int new_width, int new_height )
+void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data )

 {
     wxImageRefData *newRefData = new wxImageRefData();
 
 {
     wxImageRefData *newRefData = new wxImageRefData();
 


@@ -756,7 +1056,7 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;

-        newRefData->m_ok = TRUE;
+        newRefData->m_ok = true;

         newRefData->m_maskRed = M_IMGDATA->m_maskRed;
         newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
         newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
         newRefData->m_maskRed = M_IMGDATA->m_maskRed;
         newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
         newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;


@@ -767,8 +1067,9 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;
         newRefData->m_width = new_width;
         newRefData->m_height = new_height;
         newRefData->m_data = data;

-        newRefData->m_ok = TRUE;
+        newRefData->m_ok = true;

     }
     }

+    newRefData->m_static = static_data;

 
     UnRef();
 
 
     UnRef();
 


@@ -781,29 +1082,50 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height )
 
 void wxImage::SetAlpha(int x, int y, unsigned char alpha)
 {
 
 void wxImage::SetAlpha(int x, int y, unsigned char alpha)
 {

-    wxCHECK_RET( Ok() && HasAlpha(), wxT("invalid image or no alpha channel") );
+    wxCHECK_RET( HasAlpha(), wxT("no alpha channel") );

 
 

-    int w = M_IMGDATA->m_width,
-        h = M_IMGDATA->m_height;
+    long pos = XYToIndex(x, y);
+    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );

 
 

-    wxCHECK_RET( x >=0 && y >= 0 && x < w && y < h, wxT("invalid image index") );
+    M_IMGDATA->m_alpha[pos] = alpha;
+}
+
+unsigned char wxImage::GetAlpha(int x, int y) const
+{
+    wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") );
+
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );

 
 

-    M_IMGDATA->m_alpha[y*w + x] = alpha;
+    return M_IMGDATA->m_alpha[pos];

 }
 
 }
 

-unsigned char wxImage::GetAlpha(int x, int y)
+bool
+wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b)

 {
 {

-    wxCHECK_MSG( Ok() && HasAlpha(), 0, wxT("invalid image or no alpha channel") );
+    SetAlpha(NULL);

 
 

-    int w = M_IMGDATA->m_width,
-        h = M_IMGDATA->m_height;
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;

 
 

-    wxCHECK_MSG( x >=0 && y >= 0 && x < w && y < h, 0, wxT("invalid image index") );
+    unsigned char *alpha = GetAlpha();
+    unsigned char *data = GetData();

 
 

-    return M_IMGDATA->m_alpha[y*w + x];
+    for ( int y = 0; y < h; y++ )
+    {
+        for ( int x = 0; x < w; x++ )
+        {
+            *alpha++ = *data;
+            *data++ = r;
+            *data++ = g;
+            *data++ = b;
+        }
+    }
+
+    return true;

 }
 
 }
 

-void wxImage::SetAlpha( unsigned char *alpha )
+void wxImage::SetAlpha( unsigned char *alpha, bool static_data )

 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 


@@ -812,8 +1134,9 @@ void wxImage::SetAlpha( unsigned char *alpha )
         alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
     }
 
         alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
     }
 

-    delete [] M_IMGDATA->m_alpha;
+    free(M_IMGDATA->m_alpha);

     M_IMGDATA->m_alpha = alpha;
     M_IMGDATA->m_alpha = alpha;

+    M_IMGDATA->m_staticAlpha = static_data;

 }
 
 unsigned char *wxImage::GetAlpha() const
 }
 
 unsigned char *wxImage::GetAlpha() const


@@ -823,6 +1146,42 @@ unsigned char *wxImage::GetAlpha() const
     return M_IMGDATA->m_alpha;
 }
 
     return M_IMGDATA->m_alpha;
 }
 

+void wxImage::InitAlpha()
+{
+    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() )
+    {
+        // use the mask to initialize the alpha channel.
+        const unsigned char * const alphaEnd = alpha + lenAlpha;
+
+        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++ )
+        {
+            *alpha = (src[0] == mr && src[1] == mg && src[2] == mb)
+                            ? wxIMAGE_ALPHA_TRANSPARENT
+                            : wxIMAGE_ALPHA_OPAQUE;
+        }
+
+        M_IMGDATA->m_hasMask = false;
+    }
+    else // no mask
+    {
+        // make the image fully opaque
+        memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha);
+    }
+}
+

 // ----------------------------------------------------------------------------
 // mask support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // mask support
 // ----------------------------------------------------------------------------


@@ -834,7 +1193,25 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;
     M_IMGDATA->m_maskBlue = b;
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;
     M_IMGDATA->m_maskBlue = b;

-    M_IMGDATA->m_hasMask = TRUE;
+    M_IMGDATA->m_hasMask = true;
+}
+
+bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    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;
+    }

 }
 
 unsigned char wxImage::GetMaskRed() const
 }
 
 unsigned char wxImage::GetMaskRed() const


@@ -867,23 +1244,40 @@ void wxImage::SetMask( bool mask )
 
 bool wxImage::HasMask() const
 {
 
 bool wxImage::HasMask() const
 {

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

 
     return M_IMGDATA->m_hasMask;
 }
 
 
     return M_IMGDATA->m_hasMask;
 }
 

-int wxImage::GetWidth() const
+bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const

 {
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") );

 
 

-    return M_IMGDATA->m_width;
-}
+    // check mask
+    if ( M_IMGDATA->m_hasMask )
+    {
+        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 )
+        {
+            return true;
+        }
+    }

 
 

-int wxImage::GetHeight() const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+    // then check alpha
+    if ( M_IMGDATA->m_alpha )
+    {
+        if ( M_IMGDATA->m_alpha[pos] < threshold )
+        {
+            // transparent enough
+            return true;
+        }
+    }

 
 

-    return M_IMGDATA->m_height;
+    // not transparent
+    return false;

 }
 
 bool wxImage::SetMaskFromImage(const wxImage& mask,
 }
 
 bool wxImage::SetMaskFromImage(const wxImage& mask,


@@ -892,16 +1286,16 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     // check that the images are the same size
     if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
     {
     // check that the images are the same size
     if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
     {

-        wxLogError( _("Image and Mask have different sizes") );
-        return FALSE;
+        wxLogError( _("Image and mask have different sizes.") );
+        return false;

     }
 
     // find unused colour
     unsigned char r,g,b ;
     if (!FindFirstUnusedColour(&r, &g, &b))
     {
     }
 
     // find unused colour
     unsigned char r,g,b ;
     if (!FindFirstUnusedColour(&r, &g, &b))
     {

-        wxLogError( _("No Unused Color in image being masked") );
-        return FALSE ;
+        wxLogError( _("No unused colour in image being masked.") );
+        return false ;

     }
 
     unsigned char *imgdata = GetData();
     }
 
     unsigned char *imgdata = GetData();


@@ -926,19 +1320,61 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     }
 
     SetMaskColour(r, g, b);
     }
 
     SetMaskColour(r, g, b);

-    SetMask(TRUE);
+    SetMask(true);

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-#if wxUSE_PALETTE
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
+{
+    if (!HasAlpha())
+        return true;

 
 

+    unsigned char mr, mg, mb;
+    if (!FindFirstUnusedColour(&mr, &mg, &mb))
+    {
+        wxLogError( _("No unused colour in image being masked.") );
+        return false;
+    }
+
+    SetMask(true);
+    SetMaskColour(mr, mg, mb);
+
+    unsigned char *imgdata = GetData();
+    unsigned char *alphadata = GetAlpha();
+
+    int w = GetWidth();
+    int h = GetHeight();
+
+    for (int y = 0; y < h; y++)
+    {
+        for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
+        {
+            if (*alphadata < threshold)
+            {
+                imgdata[0] = mr;
+                imgdata[1] = mg;
+                imgdata[2] = mb;
+            }
+        }
+    }
+
+    free(M_IMGDATA->m_alpha);
+    M_IMGDATA->m_alpha = NULL;
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------

 // Palette functions
 // Palette functions

+// ----------------------------------------------------------------------------
+
+#if wxUSE_PALETTE

 
 bool wxImage::HasPalette() const
 {
     if (!Ok())
 
 bool wxImage::HasPalette() const
 {
     if (!Ok())

-        return FALSE;
+        return false;

 
     return M_IMGDATA->m_palette.Ok();
 }
 
     return M_IMGDATA->m_palette.Ok();
 }


@@ -959,12 +1395,15 @@ void wxImage::SetPalette(const wxPalette& palette)
 
 #endif // wxUSE_PALETTE
 
 
 #endif // wxUSE_PALETTE
 

+// ----------------------------------------------------------------------------

 // Option functions (arbitrary name/value mapping)
 // Option functions (arbitrary name/value mapping)

+// ----------------------------------------------------------------------------
+

 void wxImage::SetOption(const wxString& name, const wxString& value)
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
 void wxImage::SetOption(const wxString& name, const wxString& value)
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 

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

     if (idx == wxNOT_FOUND)
     {
         M_IMGDATA->m_optionNames.Add(name);
     if (idx == wxNOT_FOUND)
     {
         M_IMGDATA->m_optionNames.Add(name);


@@ -988,7 +1427,7 @@ wxString wxImage::GetOption(const wxString& name) const
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
 
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
 

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

     if (idx == wxNOT_FOUND)
         return wxEmptyString;
     else
     if (idx == wxNOT_FOUND)
         return wxEmptyString;
     else


@@ -997,18 +1436,20 @@ wxString wxImage::GetOption(const wxString& name) const
 
 int wxImage::GetOptionInt(const wxString& name) const
 {
 
 int wxImage::GetOptionInt(const wxString& name) const
 {

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

     return wxAtoi(GetOption(name));
 }
 
 bool wxImage::HasOption(const wxString& name) const
 {
     return wxAtoi(GetOption(name));
 }
 
 bool wxImage::HasOption(const wxString& name) const
 {

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

 
 

-    return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
+    return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// image I/O
+// ----------------------------------------------------------------------------
+

 bool wxImage::LoadFile( const wxString& filename, long type, int index )
 {
 #if wxUSE_STREAMS
 bool wxImage::LoadFile( const wxString& filename, long type, int index )
 {
 #if wxUSE_STREAMS


@@ -1022,10 +1463,10 @@ bool wxImage::LoadFile( const wxString& filename, long type, int index )
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 

-        return FALSE;
+        return false;

     }
 #else // !wxUSE_STREAMS
     }
 #else // !wxUSE_STREAMS

-    return FALSE;
+    return false;

 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS
 }
 


@@ -1042,10 +1483,10 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 

-        return FALSE;
+        return false;

     }
 #else // !wxUSE_STREAMS
     }
 #else // !wxUSE_STREAMS

-    return FALSE;
+    return false;

 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS
 }
 


@@ -1059,17 +1500,19 @@ bool wxImage::SaveFile( const wxString& filename ) const
     if (pHandler)
     {
         SaveFile(filename, pHandler->GetType());
     if (pHandler)
     {
         SaveFile(filename, pHandler->GetType());

-        return TRUE;
+        return true;

     }
 
     wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
 
     }
 
     wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
 

-    return FALSE;
+    return false;

 }
 
 bool wxImage::SaveFile( const wxString& filename, int type ) const
 {
 #if wxUSE_STREAMS
 }
 
 bool wxImage::SaveFile( const wxString& filename, int type ) const
 {
 #if wxUSE_STREAMS

+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+

     ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
 
     wxFileOutputStream stream(filename);
     ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
 
     wxFileOutputStream stream(filename);


@@ -1081,12 +1524,14 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const
     }
 #endif // wxUSE_STREAMS
 
     }
 #endif // wxUSE_STREAMS
 

-    return FALSE;
+    return false;

 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 {
 #if wxUSE_STREAMS
 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 {
 #if wxUSE_STREAMS

+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+

     ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
 
     wxFileOutputStream stream(filename);
     ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
 
     wxFileOutputStream stream(filename);


@@ -1098,7 +1543,7 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) con
     }
 #endif // wxUSE_STREAMS
 
     }
 #endif // wxUSE_STREAMS
 

-    return FALSE;
+    return false;

 }
 
 bool wxImage::CanRead( const wxString &name )
 }
 
 bool wxImage::CanRead( const wxString &name )


@@ -1107,7 +1552,7 @@ bool wxImage::CanRead( const wxString &name )
   wxFileInputStream stream(name);
   return CanRead(stream);
 #else
   wxFileInputStream stream(name);
   return CanRead(stream);
 #else

-  return FALSE;
+  return false;

 #endif
 }
 
 #endif
 }
 


@@ -1128,14 +1573,14 @@ bool wxImage::CanRead( wxInputStream &stream )
 {
     const wxList& list = GetHandlers();
 
 {
     const wxList& list = GetHandlers();
 

-    for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )

     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))
     {
         wxImageHandler *handler=(wxImageHandler*)node->GetData();
         if (handler->CanRead( stream ))

-            return TRUE;
+            return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 int wxImage::GetImageCount( wxInputStream &stream, long type )
 }
 
 int wxImage::GetImageCount( wxInputStream &stream, long type )


@@ -1146,7 +1591,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     {
         wxList &list=GetHandlers();
 
     {
         wxList &list=GetHandlers();
 

-        for (wxList::Node *node = list.GetFirst(); node; node = node->GetNext())
+        for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )


@@ -1163,7 +1608,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     if ( !handler )
     {
         wxLogWarning(_("No image handler for type %d defined."), type);
     if ( !handler )
     {
         wxLogWarning(_("No image handler for type %d defined."), type);

-        return FALSE;
+        return false;

     }
 
     if ( handler->CanRead(stream) )
     }
 
     if ( handler->CanRead(stream) )


@@ -1189,16 +1634,16 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
     {
         wxList &list=GetHandlers();
 
     {
         wxList &list=GetHandlers();
 

-        for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+        for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )

         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )

-                 return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+                 return handler->LoadFile(this, stream, true/*verbose*/, index);

 
         }
 
         wxLogWarning( _("No handler found for image type.") );
 
         }
 
         wxLogWarning( _("No handler found for image type.") );

-        return FALSE;
+        return false;

     }
 
     handler = FindHandler(type);
     }
 
     handler = FindHandler(type);


@@ -1207,10 +1652,16 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+    if (stream.IsSeekable() && !handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %d."), type);
+        return false;
+    }
+    else
+        return handler->LoadFile(this, stream, true/*verbose*/, index);

 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )


@@ -1225,23 +1676,28 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
+    if (stream.IsSeekable() && !handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
+        return false;
+    }
+    else
+        return handler->LoadFile( this, stream, true/*verbose*/, index );

 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 {
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 {

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

 
     wxImageHandler *handler = FindHandler(type);
 
     wxImageHandler *handler = FindHandler(type);

-
-    if (handler == 0)
+    if ( !handler )

     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
 

-        return FALSE;
+        return false;

     }
 
     return handler->SaveFile( (wxImage*)this, stream );
     }
 
     return handler->SaveFile( (wxImage*)this, stream );


@@ -1249,26 +1705,26 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {

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

 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 
     wxImageHandler *handler = FindHandlerMime(mimetype);

-
-    if (handler == 0)
+    if ( !handler )

     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 

-        return FALSE;
+        return false;

     }
 
     return handler->SaveFile( (wxImage*)this, stream );
 }
 #endif // wxUSE_STREAMS
 
     }
 
     return handler->SaveFile( (wxImage*)this, stream );
 }
 #endif // wxUSE_STREAMS
 

+// ----------------------------------------------------------------------------
+// image I/O handlers
+// ----------------------------------------------------------------------------
+

 void wxImage::AddHandler( wxImageHandler *handler )
 {
 void wxImage::AddHandler( wxImageHandler *handler )
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
-

     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {


@@ -1290,9 +1746,6 @@ void wxImage::AddHandler( wxImageHandler *handler )
 
 void wxImage::InsertHandler( wxImageHandler *handler )
 {
 
 void wxImage::InsertHandler( wxImageHandler *handler )
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
-

     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {
     // Check for an existing handler of the type being added.
     if (FindHandler( handler->GetType() ) == 0)
     {


@@ -1313,15 +1766,16 @@ bool wxImage::RemoveHandler( const wxString& name )
     if (handler)
     {
         sm_handlers.DeleteObject(handler);
     if (handler)
     {
         sm_handlers.DeleteObject(handler);

-        return TRUE;
+        delete handler;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();


@@ -1334,7 +1788,7 @@ wxImageHandler *wxImage::FindHandler( const wxString& name )
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();


@@ -1348,7 +1802,7 @@ wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();


@@ -1360,11 +1814,11 @@ wxImageHandler *wxImage::FindHandler( long bitmapType )
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();

-        if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
+        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;

         node = node->GetNext();
     }
     return 0;
         node = node->GetNext();
     }
     return 0;


@@ -1379,17 +1833,205 @@ void wxImage::InitStandardHandlers()
 
 void wxImage::CleanUpHandlers()
 {
 
 void wxImage::CleanUpHandlers()
 {

-    wxNode *node = sm_handlers.GetFirst();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler *)node->GetData();

-        wxNode *next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

-        delete node;

         node = next;
     }
         node = next;
     }

+
+    sm_handlers.Clear();
+}
+
+wxString wxImage::GetImageExtWildcard()
+{
+    wxString fmts;
+
+    wxList& Handlers = wxImage::GetHandlers();
+    wxList::compatibility_iterator Node = Handlers.GetFirst();
+    while ( Node )
+    {
+        wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
+        fmts += wxT("*.") + Handler->GetExtension();
+        Node = Node->GetNext();
+        if ( Node ) fmts += wxT(";");
+    }
+
+    return wxT("(") + fmts + wxT(")|") + fmts;
+}
+
+wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
+{
+    const double red = rgb.red / 255.0,
+                 green = rgb.green / 255.0,
+                 blue = rgb.blue / 255.0;
+
+    // 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;
+
+    enum { RED, GREEN, BLUE } chMax = RED;
+    double maximumRGB = red;
+    if ( green > maximumRGB )
+    {
+        chMax = GREEN;
+        maximumRGB = green;
+    }
+    if ( blue > maximumRGB )
+    {
+        chMax = BLUE;
+        maximumRGB = blue;
+    }
+
+    const double value = maximumRGB;
+
+    double hue = 0.0, saturation;
+    const double deltaRGB = maximumRGB - minimumRGB;
+    if ( wxIsNullDouble(deltaRGB) )
+    {
+        // Gray has no color
+        hue = 0.0;
+        saturation = 0.0;
+    }
+    else
+    {
+        switch ( chMax )
+        {
+            case RED:
+                hue = (green - blue) / deltaRGB;
+                break;
+
+            case GREEN:
+                hue = 2.0 + (blue - red) / deltaRGB;
+                break;
+
+            case BLUE:
+                hue = 4.0 + (red - green) / deltaRGB;
+                break;
+
+            default:
+                wxFAIL_MSG(wxT("hue not specified"));
+                break;
+        }
+
+        hue /= 6.0;
+
+        if ( hue < 0.0 )
+            hue += 1.0;
+
+        saturation = deltaRGB / maximumRGB;
+    }
+
+    return HSVValue(hue, saturation, value);

 }
 
 }
 

+wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv)
+{
+    double red, green, blue;
+
+    if ( wxIsNullDouble(hsv.saturation) )
+    {
+        // Grey
+        red = hsv.value;
+        green = hsv.value;
+        blue = hsv.value;
+    }
+    else // not grey
+    {
+        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);
+
+        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;
+        }
+    }
+
+    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)
+{
+    unsigned char *srcBytePtr;
+    unsigned char *dstBytePtr;
+    unsigned long count;
+    wxImage::HSVValue hsv;
+    wxImage::RGBValue rgb;
+
+    wxASSERT (angle >= -1.0 && angle <= 1.0);
+    count = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    if ( count > 0 && !wxIsNullDouble(angle) )
+    {
+        srcBytePtr = M_IMGDATA->m_data;
+        dstBytePtr = srcBytePtr;
+        do
+        {
+            rgb.red = *srcBytePtr++;
+            rgb.green = *srcBytePtr++;
+            rgb.blue = *srcBytePtr++;
+            hsv = RGBtoHSV(rgb);
+
+            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;
+
+            rgb = HSVtoRGB(hsv);
+            *dstBytePtr++ = rgb.red;
+            *dstBytePtr++ = rgb.green;
+            *dstBytePtr++ = rgb.blue;
+        } while (--count != 0);
+    }
+}

 
 //-----------------------------------------------------------------------------
 // wxImageHandler
 
 //-----------------------------------------------------------------------------
 // wxImageHandler


@@ -1400,12 +2042,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
 #if wxUSE_STREAMS
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
 {
 #if wxUSE_STREAMS
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
 {

-    return FALSE;
+    return false;

 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
 {
 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
 {

-    return FALSE;
+    return false;

 }
 
 int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
 }
 
 int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )


@@ -1423,16 +2065,16 @@ bool wxImageHandler::CanRead( const wxString& name )
 
     wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
 
 
     wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
 

-    return FALSE;
+    return false;

 }
 
 bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 {
 }
 
 bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 {

-    off_t posOld = stream.TellI();
+    wxFileOffset posOld = stream.TellI();

     if ( posOld == wxInvalidOffset )
     {
         // can't test unseekable stream
     if ( posOld == wxInvalidOffset )
     {
         // can't test unseekable stream

-        return FALSE;
+        return false;

     }
 
     bool ok = DoCanRead(stream);
     }
 
     bool ok = DoCanRead(stream);


@@ -1443,7 +2085,7 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
         wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
 
         // reading would fail anyhow as we're not at the right position
         wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
 
         // reading would fail anyhow as we're not at the right position

-        return FALSE;
+        return false;

     }
 
     return ok;
     }
 
     return ok;


@@ -1451,37 +2093,6 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

-
-
-//-----------------------------------------------------------------------------
-// Deprecated wxBitmap conversion routines
-//-----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-
-#ifdef __WXGTK__
-wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
-{
-    wxImage mono = this->ConvertToMono( red, green, blue );
-    wxBitmap bitmap( mono, 1 );
-    return bitmap;
-}
-#endif
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap( *this );
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    *this = bitmap.ConvertToImage();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-
-

 // ----------------------------------------------------------------------------
 // image histogram stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // image histogram stuff
 // ----------------------------------------------------------------------------


@@ -1510,8 +2121,8 @@ wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
                 b2++;
                 if ( b2 >= 255 )
                 {
                 b2++;
                 if ( b2 >= 255 )
                 {

-                    wxLogError(_("GetUnusedColour:: No Unused Color in image ") );
-                    return FALSE;
+                    wxLogError(_("No unused colour in image.") );
+                    return false;

                 }
             }
         }
                 }
             }
         }


@@ -1526,7 +2137,7 @@ wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
     if ( b )
         *b = b2;
 
     if ( b )
         *b = b2;
 

-    return TRUE;
+    return true;

 }
 
 bool
 }
 
 bool


@@ -1647,14 +2258,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     int i;
     angle = -angle;     // screen coordinates are a mirror image of "real" coordinates
 
     int i;
     angle = -angle;     // screen coordinates are a mirror image of "real" coordinates
 

+    bool has_alpha = HasAlpha();
+

     // Create pointer-based array to accelerate access to wxImage's data
     unsigned char ** data = new unsigned char * [GetHeight()];
     // Create pointer-based array to accelerate access to wxImage's data
     unsigned char ** data = new unsigned char * [GetHeight()];

-

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

-

     for (i = 1; i < GetHeight(); i++)
         data[i] = data[i - 1] + (3 * GetWidth());
 
     for (i = 1; i < GetHeight(); i++)
         data[i] = data[i - 1] + (3 * GetWidth());
 

+    // Same for alpha channel
+    unsigned char ** alpha = NULL;
+    if (has_alpha)
+    {
+        alpha = new unsigned char * [GetHeight()];
+        alpha[0] = GetAlpha();
+        for (i = 1; i < GetHeight(); i++)
+            alpha[i] = alpha[i - 1] + GetWidth();
+    }
+

     // precompute coefficients for rotation formula
     // (sine and cosine of the angle)
     const double cos_angle = cos(angle);
     // precompute coefficients for rotation formula
     // (sine and cosine of the angle)
     const double cos_angle = cos(angle);


@@ -1671,16 +2292,20 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0);
     wxRealPoint p4 = rotated_point (GetWidth(), 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);
 

-    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, false);
+    // 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
     }
 
     // GRG: The rotated (destination) image is always accessed


@@ -1689,6 +2314,10 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     //
     unsigned char * dst = rotated.GetData();
 
     //
     unsigned char * dst = rotated.GetData();
 

+    unsigned char * alpha_dst = NULL;
+    if (has_alpha)
+        alpha_dst = rotated.GetAlpha();
+

     // GRG: if the original image has a mask, use its RGB values
     //      as the blank pixel, else, fall back to default (black).
     //
     // GRG: if the original image has a mask, use its RGB values
     //      as the blank pixel, else, fall back to default (black).
     //


@@ -1718,7 +2347,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
         {
             for (x = 0; x < rotated.GetWidth(); x++)
             {
         {
             for (x = 0; x < rotated.GetWidth(); x++)
             {

-                wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+                wxRealPoint src = rotated_point (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 < GetWidth() - 0.75 &&
                     -0.25 < src.y && src.y < GetHeight() - 0.75)


@@ -1726,8 +2355,6 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     // 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;
 
                     if (0 < src.x && src.x < GetWidth() - 1)
                     int x1, y1, x2, y2;
 
                     if (0 < src.x && src.x < GetWidth() - 1)


@@ -1774,28 +2401,40 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                         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)
                     {
                         unsigned char *p = data[y1] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     }
                     else if (d2 < gs_Epsilon)
                     {
                         unsigned char *p = data[y1] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

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

                     }
                     else if (d3 < gs_Epsilon)
                     {
                         unsigned char *p = data[y2] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     }
                     else if (d3 < gs_Epsilon)
                     {
                         unsigned char *p = data[y2] + (3 * x2);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

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

                     }
                     else if (d4 < gs_Epsilon)
                     {
                         unsigned char *p = data[y2] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);
                     }
                     else if (d4 < gs_Epsilon)
                     {
                         unsigned char *p = data[y2] + (3 * x1);
                         *(dst++) = *(p++);
                         *(dst++) = *(p++);

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

                     }
                     else
                     {
                     }
                     else
                     {


@@ -1818,9 +2457,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


@@ -1828,6 +2480,9 @@ 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;

                 }
             }
         }
                 }
             }
         }


@@ -1838,7 +2493,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
         {
             for (x = 0; x < rotated.GetWidth(); x++)
             {
         {
             for (x = 0; x < rotated.GetWidth(); x++)
             {

-                wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+                wxRealPoint src = rotated_point (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 = wxCint (src.x);      // wxCint rounds to the
                 const int ys = wxCint (src.y);      // closest integer


@@ -1849,13 +2504,19 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     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;

                 }
             }
         }
                 }
             }
         }


@@ -1863,6 +2524,9 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
 
     delete [] data;
 
 
     delete [] data;
 

+    if (has_alpha)
+        delete [] alpha;
+

     return rotated;
 }
 
     return rotated;
 }
 


@@ -1879,7 +2543,7 @@ class wxImageModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}

-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; };

     void OnExit() { wxImage::CleanUpHandlers(); };
 };
 
     void OnExit() { wxImage::CleanUpHandlers(); };
 };