Also allow key events for Shift-Tab when wxWANTS_CHARS style is used

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 999f43c5be08f5404eecf54404fc038af622d8f5..a5f3c35f484e78acf5247319c01815ec9d5eb02e 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "image.h"
 #endif
 
 #pragma implementation "image.h"
 #endif
 


@@ -31,6 +31,8 @@
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"

+#include "wx/hash.h"
+#include "wx/utils.h"

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


@@ -49,39 +51,53 @@ class wxImageRefData: public wxObjectRefData
 {
 public:
     wxImageRefData();
 {
 public:
     wxImageRefData();

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

 
     int             m_width;
     int             m_height;
     unsigned char  *m_data;
 
     int             m_width;
     int             m_height;
     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_static;
     bool            m_ok;
     bool            m_static;

+

 #if wxUSE_PALETTE
     wxPalette       m_palette;
 #endif // wxUSE_PALETTE
 #if wxUSE_PALETTE
     wxPalette       m_palette;
 #endif // wxUSE_PALETTE

+

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

+
+    DECLARE_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_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 = false;

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

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

         free( m_data );
         free( m_data );

+
+    free(m_alpha);

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


@@ -98,9 +114,9 @@ wxImage::wxImage()
 {
 }
 
 {
 }
 

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

 {
 {

-    Create( width, height );
+    Create( width, height, clear );

 }
 
 wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
 }
 
 wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )


@@ -108,29 +124,30 @@ 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( const wxString& name, long type )
+wxImage::wxImage( const wxString& name, long type, int index )

 {
 {

-    LoadFile( name, type );
+    LoadFile( name, type, index );

 }
 
 }
 

-wxImage::wxImage( const wxString& name, const wxString& mimetype )
+wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )

 {
 {

-    LoadFile( name, mimetype );
+    LoadFile( name, mimetype, index );

 }
 
 #if wxUSE_STREAMS
 }
 
 #if wxUSE_STREAMS

-wxImage::wxImage( wxInputStream& stream, long type )
+wxImage::wxImage( wxInputStream& stream, long type, int index )

 {
 {

-    LoadFile( stream, type );
+    LoadFile( stream, type, index );

 }
 
 }
 

-wxImage::wxImage( wxInputStream& stream, const wxString& mimetype )
+wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )

 {
 {

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

 }
 #endif // wxUSE_STREAMS
 
 wxImage::wxImage( const wxImage& image )
 }
 #endif // wxUSE_STREAMS
 
 wxImage::wxImage( const wxImage& image )

+    : wxObject()

 {
     Ref(image);
 }
 {
     Ref(image);
 }


@@ -140,45 +157,44 @@ wxImage::wxImage( const wxImage* image )
     if (image) Ref(*image);
 }
 
     if (image) Ref(*image);
 }
 

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

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

-    if (M_IMGDATA->m_data)
-    {
-        for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0;
-
-        M_IMGDATA->m_width = width;
-        M_IMGDATA->m_height = height;
-        M_IMGDATA->m_ok = TRUE;
-    }
-    else
+    if (!M_IMGDATA->m_data)

     {
         UnRef();
     {
         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;

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


@@ -192,88 +208,191 @@ wxImage wxImage::Copy() const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
 

-    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 );
+    image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMask( M_IMGDATA->m_hasMask );

 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 

+    // also copy the image options
+    wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
+    imgData->m_optionNames = M_IMGDATA->m_optionNames;
+    imgData->m_optionValues = M_IMGDATA->m_optionValues;
+

     return image;
 }
 
     return image;
 }
 

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

 {
 {

+    if( xFactor == 1 && yFactor == 1 )
+        return Copy() ;
+        

     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
     // can't scale to/from 0 size
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
     // can't scale to/from 0 size

-    wxCHECK_MSG( (width > 0) && (height > 0), image,
+    wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,

                  wxT("invalid new image size") );
 
     long old_height = M_IMGDATA->m_height,
          old_width  = M_IMGDATA->m_width;
                  wxT("invalid new image size") );
 
     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") );
 

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

+    bool hasMask = false ;
+    unsigned char maskRed = 0;
+    unsigned char maskGreen = 0;
+    unsigned char maskBlue =0 ;

     if (M_IMGDATA->m_hasMask)
     {
     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;
     char unsigned *source_data = M_IMGDATA->m_data;
     char unsigned *target_data = data;

-
-#if 0
-    // This is nonsense, RR.
-
-    // We do (x, y) -> (x, y)*oldSize/newSize but the valid values of x and y
-    // are from 0 to size-1, hence all decrement the sizes
-    long old_old_width = old_width;
-    old_height--;
-    old_width--;
-    height--;
-    width--;
-    for ( long j = 0; j <= height; j++ )
+    
+    for (long y = 0; y < height; y++)

     {
     {

-        // don't crash for images with height == 1
-        long y_offset = height ? (j * old_height / height)* old_old_width : 0;
-
-        for ( long i = 0; i <= width; i++ )
+        for (long x = 0; x < width; x++)

         {
         {

-            long x_offset = width ? (i * old_width) / width : 0;
-
-            memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 );
-            target_data += 3;
+            unsigned long avgRed = 0 ;
+            unsigned long avgGreen = 0;
+            unsigned long avgBlue = 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 )
+                {
+                    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] ;
+                    if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                    {
+                        avgRed += red ;
+                        avgGreen += green ;
+                        avgBlue += blue ;
+                        counter++ ;
+                    }
+                }
+            }
+            if ( counter == 0 )
+            {
+                *(target_data++) = M_IMGDATA->m_maskRed ;
+                *(target_data++) = M_IMGDATA->m_maskGreen ;
+                *(target_data++) = M_IMGDATA->m_maskBlue ;
+            }
+            else
+            {
+                *(target_data++) = (unsigned char)(avgRed / counter);
+                *(target_data++) = (unsigned char)(avgGreen / counter);
+                *(target_data++) = (unsigned char)(avgBlue / counter);
+            }

         }
     }
         }
     }

-#else
-    for (long j = 0; j < height; j++)
+
+    // In case this is a cursor, make sure the hotspot is scalled 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;
+}
+
+wxImage wxImage::Scale( int width, int height ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    // can't scale to/from 0 size
+    wxCHECK_MSG( (width > 0) && (height > 0), image,
+                 wxT("invalid new image size") );
+
+    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") );
+
+    if ( old_width % width == 0 && old_width >= width &&
+        old_height % height == 0 && old_height >= height )

     {
     {

-        long y_offset = (j * old_height / height) * old_width;
+        return ShrinkBy( old_width / width , old_height / height ) ;
+    }
+    image.Create( width, height, false );

 
 

-        for (long i = 0; i < width; i++)
+    unsigned char *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 );
+    }
+
+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data;
+
+    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++ )

         {
         {

-            memcpy( target_data,
-                source_data + 3*(y_offset + ((i * old_width )/ width)),
-                3 );
-            target_data += 3;
+        unsigned char* src_line = &source_data[(y>>16)*old_width*3];
+
+        long x = 0;
+        for ( long i = 0; i < width; i++ )
+        {
+             unsigned char* src_pixel = &src_line[(x>>16)*3];
+             dest_pixel[0] = src_pixel[0];
+             dest_pixel[1] = src_pixel[1];
+             dest_pixel[2] = src_pixel[2];
+             dest_pixel += 3;
+             x += x_delta;

         }
         }

+
+        y += y_delta;

     }
     }

-#endif
+
+    // In case this is a cursor, make sure the hotspot is scalled accordingly:
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+        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;
 }


@@ -284,9 +403,9 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
+    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );

 
 

-    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") );
 


@@ -296,8 +415,8 @@ wxImage wxImage::Rotate90( bool clockwise ) const
     long height = M_IMGDATA->m_height;
     long width  = M_IMGDATA->m_width;
 
     long height = M_IMGDATA->m_height;
     long width  = M_IMGDATA->m_width;
 

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

 
     for (long j = 0; j < height; j++)
     {
 
     for (long j = 0; j < height; j++)
     {


@@ -321,9 +440,9 @@ wxImage wxImage::Mirror( bool horizontally ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
 

-    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") );
 


@@ -333,8 +452,8 @@ wxImage wxImage::Mirror( bool horizontally ) const
     long height = M_IMGDATA->m_height;
     long width  = M_IMGDATA->m_width;
 
     long height = M_IMGDATA->m_height;
     long width  = M_IMGDATA->m_width;
 

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

 
     if (horizontally)
     {
 
     if (horizontally)
     {


@@ -375,9 +494,9 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
     int subwidth=rect.GetWidth();
     const int subheight=rect.GetHeight();
 
     int subwidth=rect.GetWidth();
     const int subheight=rect.GetHeight();
 

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

 
 

-    char unsigned *subdata = image.GetData(), *data=GetData();
+    unsigned char *subdata = image.GetData(), *data=GetData();

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


@@ -485,7 +604,7 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 

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

 
     const int w = GetWidth();
     const int h = GetHeight();
 
     const int w = GetWidth();
     const int h = GetHeight();


@@ -509,9 +628,9 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );

 
 

-    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") );
 


@@ -526,8 +645,8 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 
     long size = M_IMGDATA->m_height * M_IMGDATA->m_width;
 
 
     long size = M_IMGDATA->m_height * M_IMGDATA->m_width;
 

-    char unsigned *srcd = M_IMGDATA->m_data;
-    char unsigned *tard = image.GetData();
+    unsigned char *srcd = M_IMGDATA->m_data;
+    unsigned char *tard = image.GetData();

 
     for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
     {
 
     for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
     {


@@ -606,14 +725,14 @@ bool wxImage::Ok() const
     return data && data->m_ok && data->m_width && data->m_height;
 }
 
     return data && data->m_ok && data->m_width && data->m_height;
 }
 

-char unsigned *wxImage::GetData() const
+unsigned char *wxImage::GetData() const

 {
 {

-    wxCHECK_MSG( Ok(), (char unsigned *)NULL, wxT("invalid image") );
+    wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") );

 
     return M_IMGDATA->m_data;
 }
 
 
     return M_IMGDATA->m_data;
 }
 

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

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


@@ -622,7 +741,7 @@ void wxImage::SetData( char unsigned *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_maskRed = M_IMGDATA->m_maskRed;
     newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
     newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;


@@ -633,7 +752,7 @@ void wxImage::SetData( char unsigned *data )
     m_refData = newRefData;
 }
 
     m_refData = newRefData;
 }
 

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

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


@@ -642,7 +761,7 @@ void wxImage::SetData( char unsigned *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;


@@ -653,7 +772,7 @@ void wxImage::SetData( char unsigned *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;

     }
 
     UnRef();
     }
 
     UnRef();


@@ -661,6 +780,58 @@ void wxImage::SetData( char unsigned *data, int new_width, int new_height )
     m_refData = newRefData;
 }
 
     m_refData = newRefData;
 }
 

+// ----------------------------------------------------------------------------
+// alpha channel support
+// ----------------------------------------------------------------------------
+
+void wxImage::SetAlpha(int x, int y, unsigned char alpha)
+{
+    wxCHECK_RET( Ok() && HasAlpha(), wxT("invalid image or no alpha channel") );
+
+    int w = M_IMGDATA->m_width,
+        h = M_IMGDATA->m_height;
+
+    wxCHECK_RET( x >=0 && y >= 0 && x < w && y < h, wxT("invalid image index") );
+
+    M_IMGDATA->m_alpha[y*w + x] = alpha;
+}
+
+unsigned char wxImage::GetAlpha(int x, int y)
+{
+    wxCHECK_MSG( Ok() && HasAlpha(), 0, wxT("invalid image or no alpha channel") );
+
+    int w = M_IMGDATA->m_width,
+        h = M_IMGDATA->m_height;
+
+    wxCHECK_MSG( x >=0 && y >= 0 && x < w && y < h, 0, wxT("invalid image index") );
+
+    return M_IMGDATA->m_alpha[y*w + x];
+}
+
+void wxImage::SetAlpha( unsigned char *alpha )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    if ( !alpha )
+    {
+        alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
+    }
+
+    delete [] M_IMGDATA->m_alpha;
+    M_IMGDATA->m_alpha = alpha;
+}
+
+unsigned char *wxImage::GetAlpha() const
+{
+    wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") );
+
+    return M_IMGDATA->m_alpha;
+}
+
+// ----------------------------------------------------------------------------
+// mask support
+// ----------------------------------------------------------------------------
+

 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );


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

-    M_IMGDATA->m_hasMask = TRUE;
+    M_IMGDATA->m_hasMask = true;

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


@@ -701,7 +872,7 @@ 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;
 }


@@ -720,83 +891,35 @@ int wxImage::GetHeight() const
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }
 

-
-bool wxImage::GetUnusedColour (  unsigned char * r,  unsigned char * g,  unsigned char * b )
+bool wxImage::SetMaskFromImage(const wxImage& mask,
+                               unsigned char mr, unsigned char mg, unsigned char mb)

 {
 {

-    wxHashTable hTable;
-    unsigned long key;
-   
-    ComputeHistogram( hTable );
-    
-    // start with blackest color and work to lightest
-    // 0,0,0 is quite likely to be a used color
-    unsigned char r2 = 1;
-    unsigned char g2 = 0;
-    unsigned char b2 = 0;
-    
-    key = (r2 << 16) | (g2 << 8) | b2;
-
-    while ( (wxHNode *) hTable.Get(key) )
-    {
-        // color already used
-        r2 ++ ;
-        if ( r2 >= 255 )
-        {
-            r2 = 0;
-            g2 ++ ;
-            if ( g2 >= 255 )
-            {
-                g2 = 0 ;
-                b2 ++ ;
-                if ( b2 >= 255 )
-                {
-                    wxLogError( _("GetUnusedColour:: No Unused Color in image ") );            
-                    return FALSE;                              
-                }
-            }
-        }
-        
-        key = (r2 << 16) | (g2 << 8) | b2;
-    }
-    
-    return TRUE;
-}
-
-
-bool wxImage::ApplyMask ( const wxImage & mask )
-{
-    // what to do if we already have a mask ??
-    if (M_IMGDATA->m_hasMask || mask.HasMask() )
-    {
-        wxLogError( _("Image already masked") );            
-        return FALSE;
-    }
-    

     // 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 ;
     // find unused colour
     unsigned char r,g,b ;

-    if (!GetUnusedColour (&r, &g, &b))
+    if (!FindFirstUnusedColour(&r, &g, &b))

     {
     {

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

     }
     }

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

 
     const int w = GetWidth();
     const int h = GetHeight();
 
     for (int j = 0; j < h; j++)
 
     const int w = GetWidth();
     const int h = GetHeight();
 
     for (int j = 0; j < h; j++)

+    {

         for (int i = 0; i < w; i++)
         {
         for (int i = 0; i < w; i++)
         {

-            if ((maskdata[0] > 128) && (maskdata[1] > 128) && (maskdata[2] > 128 ))
+            if ((maskdata[0] == mr) && (maskdata[1]  == mg) && (maskdata[2] == mb))

             {
                 imgdata[0] = r;
                 imgdata[1] = g;
             {
                 imgdata[0] = r;
                 imgdata[1] = g;


@@ -805,13 +928,12 @@ bool wxImage::ApplyMask ( const wxImage & mask )
             imgdata  += 3;
             maskdata += 3;
         }
             imgdata  += 3;
             maskdata += 3;
         }

+    }

 
 

-    M_IMGDATA->m_maskRed = r;
-    M_IMGDATA->m_maskGreen = g;
-    M_IMGDATA->m_maskBlue = b;
-    M_IMGDATA->m_hasMask = TRUE;
-    
-    return TRUE;
+    SetMaskColour(r, g, b);
+    SetMask(true);
+
+    return true;

 }
 
 #if wxUSE_PALETTE
 }
 
 #if wxUSE_PALETTE


@@ -821,7 +943,7 @@ bool wxImage::ApplyMask ( const wxImage & mask )
 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();
 }


@@ -847,7 +969,7 @@ void wxImage::SetOption(const wxString& name, const wxString& value)
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 
 {
     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);


@@ -871,7 +993,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


@@ -887,79 +1009,101 @@ int wxImage::GetOptionInt(const wxString& name) const
 
 bool wxImage::HasOption(const wxString& name) const
 {
 
 bool wxImage::HasOption(const wxString& name) const
 {

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

 
 

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

 }
 
 }
 

-bool wxImage::LoadFile( const wxString& filename, long type )
+bool wxImage::LoadFile( const wxString& filename, long type, int index )

 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );
 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );

-        return LoadFile(bstream, type);
+        return LoadFile(bstream, type, index);

     }
     else
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     }
     else
     {
         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
 }
 

-bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
+bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int index )

 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );
 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );

-        return LoadFile(bstream, mimetype);
+        return LoadFile(bstream, mimetype, index);

     }
     else
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     }
     else
     {
         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
 }
 

-bool wxImage::SaveFile( const wxString& filename, int type )
+
+
+bool wxImage::SaveFile( const wxString& filename ) const
+{
+    wxString ext = filename.AfterLast('.').Lower();
+
+    wxImageHandler * pHandler = FindHandler(ext, -1);
+    if (pHandler)
+    {
+        SaveFile(filename, pHandler->GetType());
+        return true;
+    }
+
+    wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
+
+    return false;
+}
+
+bool wxImage::SaveFile( const wxString& filename, int type ) const

 {
 #if wxUSE_STREAMS
 {
 #if wxUSE_STREAMS

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

     wxFileOutputStream stream(filename);
 
     wxFileOutputStream stream(filename);
 

-    if ( stream.LastError() == wxStream_NOERROR )
+    if ( stream.IsOk() )

     {
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, type);
     }
 #endif // wxUSE_STREAMS
 
     {
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, type);
     }
 #endif // wxUSE_STREAMS
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const

 {
 #if wxUSE_STREAMS
 {
 #if wxUSE_STREAMS

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

     wxFileOutputStream stream(filename);
 
     wxFileOutputStream stream(filename);
 

-    if ( stream.LastError() == wxStream_NOERROR )
+    if ( stream.IsOk() )

     {
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, mimetype);
     }
 #endif // wxUSE_STREAMS
 
     {
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, mimetype);
     }
 #endif // wxUSE_STREAMS
 

-    return FALSE;
+    return false;

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


@@ -968,27 +1112,77 @@ 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
 }
 

+int wxImage::GetImageCount( const wxString &name, long type )
+{
+#if wxUSE_STREAMS
+  wxFileInputStream stream(name);
+  if (stream.Ok())
+      return GetImageCount(stream, type);
+#endif
+
+  return 0;
+}
+

 #if wxUSE_STREAMS
 
 bool wxImage::CanRead( wxInputStream &stream )
 {
 #if wxUSE_STREAMS
 
 bool wxImage::CanRead( wxInputStream &stream )
 {

-  wxList &list=GetHandlers();
+    const wxList& list = GetHandlers();
+
+    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
+    {
+        wxImageHandler *handler=(wxImageHandler*)node->GetData();
+        if (handler->CanRead( stream ))
+            return true;
+    }
+
+    return false;
+}
+
+int wxImage::GetImageCount( wxInputStream &stream, long type )
+{
+    wxImageHandler *handler;
+
+    if ( type == wxBITMAP_TYPE_ANY )
+    {
+        wxList &list=GetHandlers();
+
+        for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
+        {
+             handler=(wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) )
+                 return handler->GetImageCount(stream);
+
+        }
+
+        wxLogWarning(_("No handler found for image type."));
+        return 0;
+    }

 
 

-  for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+    handler = FindHandler(type);
+
+    if ( !handler )

     {
     {

-      wxImageHandler *handler=(wxImageHandler*)node->GetData();
-      if (handler->CanRead( stream ))
-        return TRUE;
+        wxLogWarning(_("No image handler for type %d defined."), type);
+        return false;

     }
 
     }
 

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

 }
 
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, long type )
+bool wxImage::LoadFile( wxInputStream& stream, long type, int index )

 {
     UnRef();
 
 {
     UnRef();
 


@@ -996,35 +1190,35 @@ bool wxImage::LoadFile( wxInputStream& stream, long type )
 
     wxImageHandler *handler;
 
 
     wxImageHandler *handler;
 

-    if (type==wxBITMAP_TYPE_ANY)
+    if ( type == wxBITMAP_TYPE_ANY )

     {
         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();
         {
              handler=(wxImageHandler*)node->GetData();

-             if (handler->CanRead( stream ))
-                 return handler->LoadFile( this, stream );
+             if ( handler->CanRead(stream) )
+                 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);
 

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

     {
         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 );
+    return handler->LoadFile(this, stream, true/*verbose*/, index);

 }
 
 }
 

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

 {
     UnRef();
 
 {
     UnRef();
 


@@ -1032,63 +1226,84 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 

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

     {
         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 );
+    return handler->LoadFile( this, stream, true/*verbose*/, index );

 }
 
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, int type )
+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 == NULL)
+    if (handler == 0)

     {
         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( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );

 }
 
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
+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 == NULL)
+    if (handler == 0)

     {
         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( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );

 }
 #endif // wxUSE_STREAMS
 
 void wxImage::AddHandler( wxImageHandler *handler )
 {
 }
 #endif // wxUSE_STREAMS
 
 void wxImage::AddHandler( wxImageHandler *handler )
 {

-    // make sure that the memory will be freed at the program end
-    sm_handlers.DeleteContents(TRUE);
-
-    sm_handlers.Append( 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( _T("Adding duplicate image handler for '%s'"),
+                    handler->GetName().c_str() );
+        delete 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);
-
-    sm_handlers.Insert( handler );
+    // 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( _T("Inserting duplicate image handler for '%s'"),
+                    handler->GetName().c_str() );
+        delete handler;
+    }

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


@@ -1097,82 +1312,100 @@ 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.First();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler*)node->Data();
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();

         if (handler->GetName().Cmp(name) == 0) return handler;
 
         if (handler->GetName().Cmp(name) == 0) return handler;
 

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    return (wxImageHandler *)NULL;
+    return 0;

 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {

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

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler*)node->Data();
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();

         if ( (handler->GetExtension().Cmp(extension) == 0) &&
             (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;
         if ( (handler->GetExtension().Cmp(extension) == 0) &&
             (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    return (wxImageHandler*)NULL;
+    return 0;

 }
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {
 }
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {

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

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();

         if (handler->GetType() == bitmapType) return handler;
         if (handler->GetType() == bitmapType) return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    return NULL;
+    return 0;

 }
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {
 }
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {

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

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
-        if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
-        node = node->Next();
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
+        node = node->GetNext();

     }
     }

-    return NULL;
+    return 0;

 }
 
 void wxImage::InitStandardHandlers()
 {
 }
 
 void wxImage::InitStandardHandlers()
 {

+#if wxUSE_STREAMS

     AddHandler(new wxBMPHandler);
     AddHandler(new wxBMPHandler);

-#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
-    AddHandler(new wxXPMHandler);
-#endif
+#endif // wxUSE_STREAMS

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

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

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
-        wxNode *next = node->Next();
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        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;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -1184,12 +1417,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) )


@@ -1205,65 +1438,99 @@ bool wxImageHandler::CanRead( const wxString& name )
         return CanRead(stream);
     }
 
         return CanRead(stream);
     }
 

-    else {
-        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;
+    return false;

 }
 
 }
 

-#endif // wxUSE_STREAMS
-
+bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
+{
+    off_t posOld = stream.TellI();
+    if ( posOld == wxInvalidOffset )
+    {
+        // can't test unseekable stream
+        return false;
+    }

 
 

+    bool ok = DoCanRead(stream);

 
 

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

 
 

-#if wxUSE_GUI
+        // reading would fail anyhow as we're not at the right position
+        return false;
+    }

 
 

-#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;
+    return ok;

 }
 }

-#endif

 
 

-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap( *this );
-    return bitmap;
-}
+#endif // wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// image histogram stuff
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-    *this = bitmap.ConvertToImage();
-}
+    unsigned long key = MakeKey(r2, g2, b2);

 
 

-#endif
+    while ( find(key) != end() )
+    {
+        // color already used
+        r2++;
+        if ( r2 >= 255 )
+        {
+            r2 = 0;
+            g2++;
+            if ( g2 >= 255 )
+            {
+                g2 = 0;
+                b2++;
+                if ( b2 >= 255 )
+                {
+                    wxLogError(_("GetUnusedColour:: No Unused Color in image ") );
+                    return false;
+                }
+            }
+        }

 
 

+        key = MakeKey(r2, g2, b2);
+    }

 
 

+    if ( r )
+        *r = r2;
+    if ( g )
+        *g = g2;
+    if ( b )
+        *b = b2;

 
 

-// A module to allow wxImage initialization/cleanup
-// without calling these functions from app.cpp or from
-// the user's application.
+    return true;
+}

 
 

-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


@@ -1272,7 +1539,7 @@ 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;


@@ -1289,7 +1556,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)
         {


@@ -1302,43 +1569,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;
-    unsigned char *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;


@@ -1412,7 +1662,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
     int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
 
     int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
     int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
 

-    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
+    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1, false);

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


@@ -1554,8 +1804,8 @@ 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) );
                     }
                 }


@@ -1585,7 +1835,7 @@ 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;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -1602,4 +1852,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     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
 #endif // wxUSE_IMAGE