Changes to the XRC library:

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 5931d63cb168c253cc871c3b70ee8b25ab040109..ee46631c932cde21bfbfb9929b019e0b55533e9e 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -18,6 +18,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_IMAGE
+

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


@@ -30,14 +34,12 @@
 
 // For memcpy
 #include <string.h>
 
 // For memcpy
 #include <string.h>

+#include <math.h>

 
 #ifdef __SALFORDC__
     #undef FAR
 #endif
 
 
 #ifdef __SALFORDC__
     #undef FAR
 #endif
 

-#ifdef __WXMSW__
-    #include "wx/msw/private.h"
-#endif

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


@@ -55,6 +57,12 @@ public:
     bool            m_hasMask;
     unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
     bool            m_ok;
     bool            m_hasMask;
     unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
     bool            m_ok;

+    bool            m_static;
+#if wxUSE_PALETTE
+    wxPalette       m_palette;
+#endif // wxUSE_PALETTE
+    wxArrayString   m_optionNames;
+    wxArrayString   m_optionValues;

 };
 
 wxImageRefData::wxImageRefData()
 };
 
 wxImageRefData::wxImageRefData()


@@ -67,23 +75,24 @@ wxImageRefData::wxImageRefData()
     m_maskGreen = 0;
     m_maskBlue = 0;
     m_hasMask = FALSE;
     m_maskGreen = 0;
     m_maskBlue = 0;
     m_hasMask = FALSE;

+    m_static = FALSE;

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

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

         free( m_data );
 }
 
 wxList wxImage::sm_handlers;
 
         free( m_data );
 }
 
 wxList wxImage::sm_handlers;
 

+wxImage wxNullImage;
+

 //-----------------------------------------------------------------------------
 
 #define M_IMGDATA ((wxImageRefData *)m_refData)
 
 //-----------------------------------------------------------------------------
 
 #define M_IMGDATA ((wxImageRefData *)m_refData)
 

-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)

 
 wxImage::wxImage()
 {
 
 wxImage::wxImage()
 {


@@ -94,6 +103,11 @@ wxImage::wxImage( int width, int height )
     Create( width, height );
 }
 
     Create( width, height );
 }
 

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

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


@@ -128,6 +142,8 @@ wxImage::wxImage( const wxImage* image )
 
 void wxImage::Create( int width, int height )
 {
 
 void wxImage::Create( int width, int height )
 {

+    UnRef();
+

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


@@ -145,18 +161,65 @@ void wxImage::Create( int width, int height )
     }
 }
 
     }
 }
 

+void wxImage::Create( int width, int height, unsigned char* data, bool static_data )
+{
+    UnRef();
+
+    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();
+    }
+}
+

 void wxImage::Destroy()
 {
     UnRef();
 }
 
 void wxImage::Destroy()
 {
     UnRef();
 }
 

+wxImage wxImage::Copy() const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+
+    char unsigned *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_hasMask)
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+
+    memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
+
+    return image;
+}
+

 wxImage wxImage::Scale( int width, int height ) const
 {
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 wxImage wxImage::Scale( int width, int height ) const
 {
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    wxCHECK_MSG( (width > 0) && (height > 0), image, wxT("invalid image size") );
+    // 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") );

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


@@ -165,14 +228,39 @@ wxImage wxImage::Scale( int width, int height ) const
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
     if (M_IMGDATA->m_hasMask)
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
     if (M_IMGDATA->m_hasMask)

-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-
-    long old_height = M_IMGDATA->m_height;
-    long old_width  = M_IMGDATA->m_width;
+    {
+        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++ )
+    {
+        // 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++ )
+        {
+            long x_offset = width ? (i * old_width) / width : 0;
+
+            memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 );
+            target_data += 3;
+        }
+    }
+#else

     for (long j = 0; j < height; j++)
     {
         long y_offset = (j * old_height / height) * old_width;
     for (long j = 0; j < height; j++)
     {
         long y_offset = (j * old_height / height) * old_width;


@@ -185,6 +273,92 @@ wxImage wxImage::Scale( int width, int height ) const
             target_data += 3;
         }
     }
             target_data += 3;
         }
     }

+#endif
+
+    return image;
+}
+
+wxImage wxImage::Rotate90( bool clockwise ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
+
+    char unsigned *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_hasMask)
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    char unsigned *source_data = M_IMGDATA->m_data;
+    char unsigned *target_data;
+
+    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;
+            else
+                target_data = data + ((height*(width-1)) + j - (i*height))*3;
+            memcpy( target_data, source_data, 3 );
+            source_data += 3;
+        }
+    }
+
+    return image;
+}
+
+wxImage wxImage::Mirror( bool horizontally ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+
+    char unsigned *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_hasMask)
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    char unsigned *source_data = M_IMGDATA->m_data;
+    char unsigned *target_data;
+
+    if (horizontally)
+    {
+        for (long j = 0; j < height; j++)
+        {
+            data += width*3;
+            target_data = data-3;
+            for (long i = 0; i < width; i++)
+            {
+                memcpy( target_data, source_data, 3 );
+                source_data += 3;
+                target_data -= 3;
+            }
+        }
+    }
+    else
+    {
+        for (long i = 0; i < height; i++)
+        {
+            target_data = data + 3*width*(height-1-i);
+            memcpy( target_data, source_data, (size_t)3*width );
+            source_data += 3*width;
+        }
+    }

 
     return image;
 }
 
     return image;
 }


@@ -226,6 +400,146 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
     return image;
 }
 
     return image;
 }
 

+void wxImage::Paste( const wxImage &image, int x, int y )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+    wxCHECK_RET( image.Ok(), wxT("invalid image") );
+
+    int xx = 0;
+    int yy = 0;
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    if (x < 0)
+    {
+        xx = -x;
+        width += x;
+    }
+    if (y < 0)
+    {
+        yy = -y;
+        height += y;
+    }
+
+    if ((x+xx)+width > M_IMGDATA->m_width)
+        width = M_IMGDATA->m_width - (x+xx);
+    if ((y+yy)+height > M_IMGDATA->m_height)
+        height = M_IMGDATA->m_height - (y+yy);
+
+    if (width < 1) return;
+    if (height < 1) return;
+
+    if ((!HasMask() && !image.HasMask()) ||
+       ((HasMask() && image.HasMask() &&
+         (GetMaskRed()==image.GetMaskRed()) &&
+         (GetMaskGreen()==image.GetMaskGreen()) &&
+         (GetMaskBlue()==image.GetMaskBlue()))))
+    {
+        width *= 3;
+        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+        int source_step = image.GetWidth()*3;
+
+        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width*3;
+        for (int j = 0; j < height; j++)
+        {
+            memcpy( target_data, source_data, width );
+            source_data += source_step;
+            target_data += target_step;
+        }
+        return;
+    }
+
+    if (!HasMask() && image.HasMask())
+    {
+        unsigned char r = image.GetMaskRed();
+        unsigned char g = image.GetMaskGreen();
+        unsigned char b = image.GetMaskBlue();
+
+        width *= 3;
+        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+        int source_step = image.GetWidth()*3;
+
+        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width*3;
+
+        for (int j = 0; j < height; j++)
+        {
+            for (int i = 0; i < width; i+=3)
+            {
+                if ((source_data[i]   != r) &&
+                    (source_data[i+1] != g) &&
+                    (source_data[i+2] != b))
+                {
+                    memcpy( target_data+i, source_data+i, 3 );
+                }
+            }
+            source_data += source_step;
+            target_data += target_step;
+        }
+    }
+}
+
+void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
+                       unsigned char r2, unsigned char g2, unsigned char b2 )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    char unsigned *data = GetData();
+
+    const int w = GetWidth();
+    const int h = GetHeight();
+
+    for (int j = 0; j < h; j++)
+        for (int i = 0; i < w; i++)
+        {
+            if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1))
+            {
+                data[0] = r2;
+                data[1] = g2;
+                data[2] = b2;
+            }
+            data += 3;
+        }
+}
+
+wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+
+    char unsigned *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_hasMask)
+    {
+        if (M_IMGDATA->m_maskRed == r && M_IMGDATA->m_maskGreen == g &&
+                                         M_IMGDATA->m_maskBlue == b)
+            image.SetMaskColour( 255, 255, 255 );
+        else
+            image.SetMaskColour( 0, 0, 0 );
+    }
+
+    long size = M_IMGDATA->m_height * M_IMGDATA->m_width;
+
+    char unsigned *srcd = M_IMGDATA->m_data;
+    char unsigned *tard = image.GetData();
+
+    for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
+    {
+        if (srcd[0] == r && srcd[1] == g && srcd[2] == b)
+            tard[0] = tard[1] = tard[2] = 255;
+        else
+            tard[0] = tard[1] = tard[2] = 0;
+    }
+
+    return image;
+}
+

 void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );
 void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
 {
     wxCHECK_RET( Ok(), wxT("invalid image") );


@@ -242,7 +556,7 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c
     M_IMGDATA->m_data[ pos+2 ] = b;
 }
 
     M_IMGDATA->m_data[ pos+2 ] = b;
 }
 

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

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


@@ -256,7 +570,7 @@ unsigned char wxImage::GetRed( int x, int y )
     return M_IMGDATA->m_data[pos];
 }
 
     return M_IMGDATA->m_data[pos];
 }
 

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

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


@@ -270,7 +584,7 @@ unsigned char wxImage::GetGreen( int x, int y )
     return M_IMGDATA->m_data[pos+1];
 }
 
     return M_IMGDATA->m_data[pos+1];
 }
 

-unsigned char wxImage::GetBlue( int x, int y )
+unsigned char wxImage::GetBlue( int x, int y ) const

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


@@ -286,7 +600,10 @@ unsigned char wxImage::GetBlue( int x, int y )
 
 bool wxImage::Ok() const
 {
 
 bool wxImage::Ok() const
 {

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

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


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

+void wxImage::SetData( char unsigned *data, int new_width, int new_height )
+{
+    wxImageRefData *newRefData = new wxImageRefData();
+
+    if (m_refData)
+    {
+        newRefData->m_width = new_width;
+        newRefData->m_height = new_height;
+        newRefData->m_data = data;
+        newRefData->m_ok = TRUE;
+        newRefData->m_maskRed = M_IMGDATA->m_maskRed;
+        newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
+        newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
+        newRefData->m_hasMask = M_IMGDATA->m_hasMask;
+    }
+    else
+    {
+        newRefData->m_width = new_width;
+        newRefData->m_height = new_height;
+        newRefData->m_data = data;
+        newRefData->m_ok = TRUE;
+    }
+
+    UnRef();
+
+    m_refData = newRefData;
+}
+

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


@@ -375,74 +720,244 @@ int wxImage::GetHeight() const
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }
 

-bool wxImage::LoadFile( const wxString& filename, long type )
+
+bool wxImage::FindFirstUnusedColour(
+            unsigned char *r, unsigned char *g, unsigned char *b,
+            unsigned char startR, unsigned char startG, unsigned char startB)

 {
 {

-#if wxUSE_STREAMS
-    if (wxFileExists(filename))
-    {
-        wxFileInputStream stream(filename);
-       wxBufferedInputStream bstream( stream );
-        return LoadFile(bstream, type);
-    }
-    else 
-    {
-        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+    wxHashTable hTable;
+    unsigned long key;
+   
+    ComputeHistogram( hTable );
+    
+    unsigned char r2 = startR;
+    unsigned char g2 = startG;
+    unsigned char b2 = startB;
+    
+    key = (r2 << 16) | (g2 << 8) | b2;

 
 

-        return FALSE;
+    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;

     }
     }

-#else // !wxUSE_STREAMS
-    return FALSE;
-#endif // wxUSE_STREAMS
+    
+    if (r) *r = r2;
+    if (g) *g = g2;
+    if (b) *b = b2;
+    
+    return TRUE;

 }
 
 }
 

-bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
+
+bool wxImage::SetMaskFromImage(const wxImage& mask, 
+                               unsigned char mr, unsigned char mg, unsigned char mb)

 {
 {

-#if wxUSE_STREAMS
-    if (wxFileExists(filename))
+    // check that the images are the same size
+    if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )

     {
     {

-        wxFileInputStream stream(filename);
-       wxBufferedInputStream bstream( stream );
-        return LoadFile(bstream, mimetype);
+        wxLogError( _("Image and Mask have different sizes") );            
+        return FALSE;

     }
     }

-    else 
+    
+    // find unused colour
+    unsigned char r,g,b ;
+    if (!FindFirstUnusedColour(&r, &g, &b))

     {
     {

-        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
-
-        return FALSE;
+        wxLogError( _("No Unused Color in image being masked") );            
+        return FALSE ;

     }
     }

-#else // !wxUSE_STREAMS
-    return FALSE;
-#endif // wxUSE_STREAMS
-}
+        
+    char unsigned *imgdata = GetData();
+    char unsigned *maskdata = mask.GetData();

 
 

-bool wxImage::SaveFile( const wxString& filename, int type )
-{
-#if wxUSE_STREAMS
-    wxFileOutputStream stream(filename);
+    const int w = GetWidth();
+    const int h = GetHeight();

 
 

-    if ( stream.LastError() == wxStream_NOERROR )
+    for (int j = 0; j < h; j++)

     {
     {

-       wxBufferedOutputStream bstream( stream );
-        return SaveFile(bstream, type);
+        for (int i = 0; i < w; i++)
+        {
+            if ((maskdata[0] == mr) && (maskdata[1]  == mg) && (maskdata[2] == mb))
+            {
+                imgdata[0] = r;
+                imgdata[1] = g;
+                imgdata[2] = b;
+            }
+            imgdata  += 3;
+            maskdata += 3;
+        }

     }
     }

-    else
-#endif // wxUSE_STREAMS
-        return FALSE;
+
+    SetMaskColour(r, g, b);
+    SetMask(TRUE);
+    
+    return TRUE;

 }
 
 }
 

-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
+#if wxUSE_PALETTE
+
+// Palette functions
+
+bool wxImage::HasPalette() const
+{
+    if (!Ok())
+        return FALSE;
+
+    return M_IMGDATA->m_palette.Ok();
+}
+
+const wxPalette& wxImage::GetPalette() const
+{
+    wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") );
+
+    return M_IMGDATA->m_palette;
+}
+
+void wxImage::SetPalette(const wxPalette& palette)
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    M_IMGDATA->m_palette = palette;
+}
+
+#endif // wxUSE_PALETTE
+
+// Option functions (arbitrary name/value mapping)
+void wxImage::SetOption(const wxString& name, const wxString& value)
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+    if (idx == wxNOT_FOUND)
+    {
+        M_IMGDATA->m_optionNames.Add(name);
+        M_IMGDATA->m_optionValues.Add(value);
+    }
+    else
+    {
+        M_IMGDATA->m_optionNames[idx] = name;
+        M_IMGDATA->m_optionValues[idx] = value;
+    }
+}
+
+void wxImage::SetOption(const wxString& name, int value)
+{
+    wxString valStr;
+    valStr.Printf(wxT("%d"), value);
+    SetOption(name, valStr);
+}
+
+wxString wxImage::GetOption(const wxString& name) const
+{
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
+
+    int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+    if (idx == wxNOT_FOUND)
+        return wxEmptyString;
+    else
+        return M_IMGDATA->m_optionValues[idx];
+}
+
+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
+{
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+
+    return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
+}
+
+bool wxImage::LoadFile( const wxString& filename, long type )
+{
+#if wxUSE_STREAMS
+    if (wxFileExists(filename))
+    {
+        wxFileInputStream stream(filename);
+        wxBufferedInputStream bstream( stream );
+        return LoadFile(bstream, type);
+    }
+    else
+    {
+        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
+        return FALSE;
+    }
+#else // !wxUSE_STREAMS
+    return FALSE;
+#endif // wxUSE_STREAMS
+}
+
+bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
+{
+#if wxUSE_STREAMS
+    if (wxFileExists(filename))
+    {
+        wxFileInputStream stream(filename);
+        wxBufferedInputStream bstream( stream );
+        return LoadFile(bstream, mimetype);
+    }
+    else
+    {
+        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
+        return FALSE;
+    }
+#else // !wxUSE_STREAMS
+    return FALSE;
+#endif // wxUSE_STREAMS
+}
+
+bool wxImage::SaveFile( const wxString& filename, int type )
+{
+#if wxUSE_STREAMS
+    wxFileOutputStream stream(filename);
+
+    if ( stream.LastError() == wxStream_NOERROR )
+    {
+        wxBufferedOutputStream bstream( stream );
+        return SaveFile(bstream, type);
+    }
+#endif // wxUSE_STREAMS
+
+    return FALSE;
+}
+
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )

 {
 #if wxUSE_STREAMS
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
     {
 {
 #if wxUSE_STREAMS
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
     {

-       wxBufferedOutputStream bstream( stream );
+        wxBufferedOutputStream bstream( stream );

         return SaveFile(bstream, mimetype);
     }
         return SaveFile(bstream, mimetype);
     }

-    else

 #endif // wxUSE_STREAMS
 #endif // wxUSE_STREAMS

-        return FALSE;
+
+    return FALSE;

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


@@ -465,7 +980,7 @@ bool wxImage::CanRead( wxInputStream &stream )
     {
       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;


@@ -639,7 +1154,10 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 
 void wxImage::InitStandardHandlers()
 {
 
 void wxImage::InitStandardHandlers()
 {

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

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


@@ -659,9 +1177,7 @@ void wxImage::CleanUpHandlers()
 // wxImageHandler
 //-----------------------------------------------------------------------------
 
 // wxImageHandler
 //-----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)

-#endif

 
 #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) )


@@ -697,1607 +1213,391 @@ bool wxImageHandler::CanRead( const wxString& name )
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

+
+

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

-// MSW conversion routines
+// wxBitmap convertion routines

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

-#ifdef __WXMSW__
+#if 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 wxImage::ConvertToBitmap() const
 {

-    if ( !Ok() )
-        return wxNullBitmap;
+    wxBitmap bitmap( *this );
+    return bitmap;
+}
+
+wxImage::wxImage( const wxBitmap &bitmap )
+{
+    *this = bitmap.ConvertToImage();
+}

 
 

-    // sizeLimit is the MS upper limit for the DIB size
-#ifdef  WIN32
-    int sizeLimit = 1024*768*3;
-#else
-    int sizeLimit = 0x7fff ;

 #endif
 
 #endif
 

-    // width and height of the device-dependent bitmap
-    int width = GetWidth();
-    int bmpHeight = GetHeight();

 
 

-    // calc the number of bytes per scanline and padding
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary = bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-    // calc the number of DIBs and heights of DIBs
-    int numDIB = 1;
-    int hRemain = 0;
-    int height = sizeLimit/bytePerLine;
-    if( height >= bmpHeight )
-        height = bmpHeight;
-    else
-    {
-        numDIB =  bmpHeight / height;
-        hRemain = bmpHeight % height;
-        if( hRemain >0 )  numDIB++;
-    }

 
 

-    // set bitmap parameters
-    wxBitmap bitmap;
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-    bitmap.SetWidth( width );
-    bitmap.SetHeight( bmpHeight );
-    bitmap.SetDepth( wxDisplayDepth() );
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = (DWORD)width;
-    lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-    //   the general formula for biSizeImage:
-    //      ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate memory for DIB") );
-        free( lpDIBh );
-        return bitmap;
-    }
+// 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)

 
 

-    // create and set the device-dependent bitmap
-    HDC hdc = ::GetDC(NULL);
-    HDC memdc = ::CreateCompatibleDC( hdc );
-    HBITMAP hbitmap;
-    hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
-    ::SelectObject( memdc, hbitmap);
-
-    // copy image data into DIB data and then into DDB (in a loop)
-    unsigned char *data = GetData();
-    int i, j, n;
-    int origin = 0;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits;
-
-    for( n=0; n<numDIB; n++ )
-    {
-        if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
-        {
-            // redefine height and size of the (possibly) last smaller DIB
-            // memory is not reallocated
-            height = hRemain;
-            lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-            lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        }
-        ptbits = lpBits;

 
 

-        for( j=0; j<height; j++ )
+//-----------------------------------------------------------------------------
+
+// GRG, Dic/99
+// Counts and returns the number of different colours. Optionally stops
+// when it exceeds 'stopafter' different colours. This is useful, for
+// example, to see if the image can be saved as 8-bit (256 colour or
+// 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 )
+{
+    wxHashTable h;
+    wxObject dummy;
+    unsigned char r, g, b;
+    unsigned char *p;
+    unsigned long size, nentries, key;
+
+    p = GetData();
+    size = GetWidth() * GetHeight();
+    nentries = 0;
+
+    for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
+    {
+        r = *(p++);
+        g = *(p++);
+        b = *(p++);
+        key = (r << 16) | (g << 8) | b;
+
+        if (h.Get(key) == NULL)

         {
         {

-            for( i=0; i<width; i++ )
-            {
-                *(ptbits++) = *(ptdata+2);
-                *(ptbits++) = *(ptdata+1);
-                *(ptbits++) = *(ptdata  );
-                ptdata += 3;
-            }
-            for( i=0; i< padding; i++ )   *(ptbits++) = 0;
+            h.Put(key, &dummy);
+            nentries++;

         }
         }

-        ::StretchDIBits( memdc, 0, origin, width, height,\
-            0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-        origin += height;
-        // if numDIB = 1,  lines below can also be used
-        //    hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
-        // The above line is equivalent to the following two lines.
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
-        // or the following lines
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    HDC memdc = ::CreateCompatibleDC( hdc );
-        //    ::SelectObject( memdc, hbitmap);
-        //    ::SetDIBitsToDevice( memdc, 0, 0, width, height,
-        //            0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
-        //    ::SelectObject( memdc, 0 );
-        //    ::DeleteDC( memdc );

     }
     }

-    bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );

 
 

-    // similarly, created an mono-bitmap for the possible mask
-    if( HasMask() )
+    return nentries;
+}
+
+
+// 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 char r, g, b;
+    unsigned char *p;
+    unsigned long size, nentries, key;
+    wxHNode *hnode;
+
+    p = GetData();
+    size = GetWidth() * GetHeight();
+    nentries = 0;
+
+    for (unsigned long j = 0; j < size; j++)

     {
     {

-        hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
-        ::SelectObject( memdc, hbitmap);
-        if( numDIB == 1 )   height = bmpHeight;
-        else                height = sizeLimit/bytePerLine;
-        lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-        lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        origin = 0;
-        unsigned char r = GetMaskRed();
-        unsigned char g = GetMaskGreen();
-        unsigned char b = GetMaskBlue();
-        unsigned char zero = 0, one = 255;
-        ptdata = data;
-        for( n=0; n<numDIB; n++ )
+        r = *(p++);
+        g = *(p++);
+        b = *(p++);
+        key = (r << 16) | (g << 8) | b;
+
+        hnode = (wxHNode *) h.Get(key);
+
+        if (hnode)
+            hnode->value++;
+        else

         {
         {

-            if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
-            {
-                // redefine height and size of the (possibly) last smaller DIB
-                // memory is not reallocated
-                height = hRemain;
-                lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-                lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-            }
-            ptbits = lpBits;
-            for( int j=0; j<height; j++ )
-            {
-                for(i=0; i<width; i++ )
-                {
-                    if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
-                    {
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                    }
-                    else
-                    {
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                    }
-                }
-                for( i=0; i< padding; i++ )   *(ptbits++) = zero;
-            }
-            ::StretchDIBits( memdc, 0, origin, width, height,\
-                0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-            origin += height;
+            hnode = new wxHNode();
+            hnode->index = nentries++;
+            hnode->value = 1;
+
+            h.Put(key, (wxObject *)hnode);

         }
         }

-        // create a wxMask object
-        wxMask *mask = new wxMask();
-        mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
-        bitmap.SetMask( mask );
-        // It will be deleted when the wxBitmap object is deleted (as of 01/1999)
-        /* The following can also be used but is slow to run
-        wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue());
-        wxMask *mask = new wxMask( bitmap, colour );
-        bitmap.SetMask( mask );
-        */

     }
 
     }
 

-    // free allocated resources
-    ::SelectObject( memdc, 0 );
-    ::DeleteDC( memdc );
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
+    return nentries;
+}
+
+/*
+ * Rotation code by Carlos Moreno
+ */

 
 

-#if WXWIN_COMPATIBILITY_2
-    // check the wxBitmap object
-    bitmap.GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
+// GRG: I've removed wxRotationPoint - we already have wxRealPoint which
+//      does exactly the same thing. And I also got rid of wxRotationPixel
+//      bacause of potential problems in architectures where alignment
+//      is an issue, so I had to rewrite parts of the code.

 
 

-    return bitmap;
+static const double gs_Epsilon = 1e-10;
+
+static inline int wxCint (double x)
+{
+    return (x > 0) ? (int) (x + 0.5) : (int) (x - 0.5);

 }
 
 }
 

-wxImage::wxImage( const wxBitmap &bitmap )
+
+// Auxiliary function to rotate a point (x,y) with respect to point p0
+// make it inline and use a straight return to facilitate optimization
+// also, the function receives the sine and cosine of the angle to avoid
+// repeating the time-consuming calls to these functions -- sin/cos can
+// be computed and stored in the calling function.
+
+inline wxRealPoint rotated_point (const wxRealPoint & p, double cos_angle, double sin_angle, const wxRealPoint & p0)

 {
 {

-    // check the bitmap
-    if( !bitmap.Ok() )
-    {
-        wxFAIL_MSG( wxT("invalid bitmap") );
-        return;
-    }
+    return wxRealPoint (p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
+                        p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);
+}

 
 

-    // create an wxImage object
-    int width = bitmap.GetWidth();
-    int height = bitmap.GetHeight();
-    Create( width, height );
-    unsigned char *data = GetData();
-    if( !data )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for image") );
-        return;
-    }
+inline wxRealPoint rotated_point (double x, double y, double cos_angle, double sin_angle, const wxRealPoint & p0)
+{
+    return rotated_point (wxRealPoint(x,y), cos_angle, sin_angle, p0);
+}

 
 

-    // calc the number of bytes per scanline and padding in the DIB
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary =  bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
+wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool interpolating, wxPoint * offset_after_rotation) const
+{
+    int i;
+    angle = -angle;     // screen coordinates are a mirror image of "real" coordinates
+
+    // Create pointer-based array to accelerate access to wxImage's data
+    unsigned char ** data = new unsigned char * [GetHeight()];
+
+    data[0] = GetData();

 
 

-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
+    for (i = 1; i < GetHeight(); i++)
+        data[i] = data[i - 1] + (3 * GetWidth());
+
+    // precompute coefficients for rotation formula
+    // (sine and cosine of the angle)
+    const double cos_angle = cos(angle);
+    const double sin_angle = sin(angle);
+
+    // Create new Image to store the result
+    // First, find rectangle that covers the rotated image;  to do that,
+    // rotate the four corners
+
+    const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
+
+    wxRealPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0);
+    wxRealPoint p2 = rotated_point (0, GetHeight(), cos_angle, sin_angle, p0);
+    wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0);
+    wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), cos_angle, sin_angle, p0);
+
+    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)));
+
+    wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
+
+    if (offset_after_rotation != NULL)

     {
     {

-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );
-        return;
+        *offset_after_rotation = wxPoint (x1, y1);

     }
     }

-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
+
+    // GRG: The rotated (destination) image is always accessed
+    //      sequentially, so there is no need for a pointer-based
+    //      array here (and in fact it would be slower).
+    //
+    unsigned char * dst = rotated.GetData();
+
+    // GRG: if the original image has a mask, use its RGB values
+    //      as the blank pixel, else, fall back to default (black).
+    //
+    unsigned char blank_r = 0;
+    unsigned char blank_g = 0;
+    unsigned char blank_b = 0;
+
+    if (HasMask())

     {
     {

-        wxFAIL_MSG( wxT("could not allocate data for DIB") );
-        free( data );
-        free( lpDIBh );
-        return;
+        blank_r = GetMaskRed();
+        blank_g = GetMaskGreen();
+        blank_b = GetMaskBlue();
+        rotated.SetMaskColour( blank_r, blank_g, blank_b );

     }
 
     }
 

-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hbitmap;
-    hbitmap = (HBITMAP) bitmap.GetHBITMAP();
-    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
+    // Now, for each point of the rotated image, find where it came from, by
+    // performing an inverse rotation (a rotation of -angle) and getting the
+    // pixel at those coordinates
+
+    // GRG: I've taken the (interpolating) test out of the loops, so that
+    //      it is done only once, instead of repeating it for each pixel.
+
+    int x;
+    if (interpolating)

     {
     {

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

         {
         {

-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
+            for (x = 0; x < rotated.GetWidth(); x++)
+            {
+                wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+
+                if (-0.25 < src.x && src.x < GetWidth() - 0.75 &&
+                    -0.25 < src.y && src.y < GetHeight() - 0.75)
+                {
+                    // interpolate using the 4 enclosing grid-points.  Those
+                    // points can be obtained using floor and ceiling of the
+                    // exact coordinates of the point
+                        // 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)
+                    {
+                        x1 = wxCint(floor(src.x));
+                        x2 = wxCint(ceil(src.x));
+                    }
+                    else    // else means that x is near one of the borders (0 or width-1)
+                    {
+                        x1 = x2 = wxCint (src.x);
+                    }
+
+                    if (0 < src.y && src.y < GetHeight() - 1)
+                    {
+                        y1 = wxCint(floor(src.y));
+                        y2 = wxCint(ceil(src.y));
+                    }
+                    else
+                    {
+                        y1 = y2 = wxCint (src.y);
+                    }
+
+                    // get four points and the distances (square of the distance,
+                    // for efficiency reasons) for the interpolation formula
+
+                    // GRG: Do not calculate the points until they are
+                    //      really needed -- this way we can calculate
+                    //      just one, instead of four, if d1, d2, d3
+                    //      or d4 are < gs_Epsilon
+
+                    const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1);
+                    const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1);
+                    const double d3 = (src.x - x2) * (src.x - x2) + (src.y - y2) * (src.y - y2);
+                    const double d4 = (src.x - x1) * (src.x - x1) + (src.y - y2) * (src.y - y2);
+
+                    // Now interpolate as a weighted average of the four surrounding
+                    // points, where the weights are the distances to each of those points
+
+                    // If the point is exactly at one point of the grid of the source
+                    // image, then don't interpolate -- just assign the pixel
+
+                    if (d1 < gs_Epsilon)        // d1,d2,d3,d4 are positive -- no need for abs()
+                    {
+                        unsigned char *p = data[y1] + (3 * x1);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                    }
+                    else if (d2 < gs_Epsilon)
+                    {
+                        unsigned char *p = data[y1] + (3 * x2);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                    }
+                    else if (d3 < gs_Epsilon)
+                    {
+                        unsigned char *p = data[y2] + (3 * x2);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                    }
+                    else if (d4 < gs_Epsilon)
+                    {
+                        unsigned char *p = data[y2] + (3 * x1);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                    }
+                    else
+                    {
+                        // weights for the weighted average are proportional to the inverse of the distance
+                        unsigned char *v1 = data[y1] + (3 * x1);
+                        unsigned char *v2 = data[y1] + (3 * x2);
+                        unsigned char *v3 = data[y2] + (3 * x2);
+                        unsigned char *v4 = data[y2] + (3 * x1);
+
+                        const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4;
+
+                        // GRG: Unrolled.
+
+                        *(dst++) = (unsigned char)
+                            ( (w1 * *(v1++) + w2 * *(v2++) +
+                               w3 * *(v3++) + w4 * *(v4++)) /
+                              (w1 + w2 + w3 + w4) );
+                        *(dst++) = (unsigned char)
+                            ( (w1 * *(v1++) + w2 * *(v2++) +
+                               w3 * *(v3++) + w4 * *(v4++)) /
+                              (w1 + w2 + w3 + w4) );
+                        *(dst++) = (unsigned char)
+                            ( (w1 * *(v1++) + w2 * *(v2++) +
+                               w3 * *(v3++) + w4 * *(v4++)) /
+                              (w1 + w2 + w3 + w4) );
+                    }
+                }
+                else
+                {
+                    *(dst++) = blank_r;
+                    *(dst++) = blank_g;
+                    *(dst++) = blank_b;
+                }
+            }

         }
         }

-        ptbits += padding;

     }
     }

-
-    // similarly, set data according to the possible mask bitmap
-    if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
+    else    // not interpolating

     {
     {

-        hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        HDC memdc = ::CreateCompatibleDC( hdc );
-        ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
-        ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
-        ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-        ::DeleteDC( memdc );
-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
+        for (int y = 0; y < rotated.GetHeight(); y++)

         {
         {

-            for( j=0; j<width; j++ )
+            for (x = 0; x < rotated.GetWidth(); x++)

             {
             {

-                if( *ptbits != 0 )
-                    ptdata += 3;
+                wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+
+                const int xs = wxCint (src.x);      // wxCint rounds to the
+                const int ys = wxCint (src.y);      // closest integer
+
+                if (0 <= xs && xs < GetWidth() &&
+                    0 <= ys && ys < GetHeight())
+                {
+                    unsigned char *p = data[ys] + (3 * xs);
+                    *(dst++) = *(p++);
+                    *(dst++) = *(p++);
+                    *(dst++) = *(p++);
+                }

                 else
                 {
                 else
                 {

-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
+                    *(dst++) = blank_r;
+                    *(dst++) = blank_g;
+                    *(dst++) = blank_b;

                 }
                 }

-                ptbits += 3;

             }
             }

-            ptbits += padding;

         }
         }

-        SetMaskColour( r, g, b );
-        SetMask( TRUE );
-    }
-    else
-    {
-        SetMask( FALSE );

     }
     }

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

 
 

-#ifdef __WXMAC__
+    delete [] data;

 
 

-#include <PictUtils.h>
+    return rotated;
+}

 
 

-extern CTabHandle wxMacCreateColorTable( int numColors ) ;
-extern void wxMacDestroyColorTable( CTabHandle colors ) ;
-extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
-extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ;
-extern void wxMacDestroyGWorld( GWorldPtr gw ) ;
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    // width and height of the device-dependent bitmap
-    int width = GetWidth();
-    int height = GetHeight();
-
-    // Create picture
-    
-    wxBitmap bitmap( width , height , wxDisplayDepth() ) ;
-    
-    // Create mask
-    
-    if (HasMask())
-    {
-       /*
-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-        
-        mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
-        
-        wxMask *mask = new wxMask();
-        mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
-        
-        bitmap.SetMask( mask );
-       */
-    }
-        
-    // Render
-        
-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
-    
-               CGrafPtr        origPort ;
-               GDHandle        origDevice ;
-               
-               GetGWorld( &origPort , &origDevice ) ;
-               SetGWorld( bitmap.GetHBITMAP() , NULL ) ;
-
-    register unsigned char* data = GetData();
-    
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-#if 0
-       unsigned char lastr = 0 ;
-       unsigned char lastg = 0 ;
-       unsigned char lastb = 0 ;
-               RGBColor lastcolor ;
-
-               MoveTo( 0 , y ) ;               
-        for (int x = 0; x < width; x++)
-        {
-               unsigned char r = data[index++];
-               unsigned char g = data[index++];
-               unsigned char b = data[index++];
- 
-                       if ( r != lastr || g != lastg || b != lastb )
-                       {
-                               lastcolor.red = ( lastr  << 8 ) + lastr ;
-                               lastcolor.green = ( lastg << 8 ) + lastg ;
-                               lastcolor.blue = ( lastb << 8 ) + lastb ;
-                               RGBForeColor( &lastcolor ) ;
-                               LineTo( x , y ) ;
-                               lastr = r ;
-                               lastg = g ;
-                               lastb = b ;     
-                       }
-        } // for width
-               lastcolor.red = ( lastr  << 8 ) + lastr ;
-               lastcolor.green = ( lastg << 8 ) + lastg ;
-               lastcolor.blue = ( lastb << 8 ) + lastb ;
-               RGBForeColor( &lastcolor ) ;
-        LineTo( width - 1 , y ) ;
-#else
-        for (int x = 0; x < width; x++)
-        {
-               unsigned char r = data[index++];
-               unsigned char g = data[index++];
-               unsigned char b = data[index++];
-                       RGBColor color ;
-                       color.red = ( r  << 8 ) + r ;
-                       color.green = ( g << 8 ) + g ;
-                       color.blue = ( b << 8 ) + b ;
-                       SetCPixel( x , y , &color ) ;
-               }
-#endif
-    }  // for height
-
-       SetGWorld( origPort , origDevice ) ;
-    
-    return bitmap;
-    
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    // check the bitmap
-    if( !bitmap.Ok() )
-    {
-        wxFAIL_MSG( "invalid bitmap" );
-        return;
-    }
-    
-    // create an wxImage object
-    int width = bitmap.GetWidth();
-    int height = bitmap.GetHeight();
-    Create( width, height ); 
-    /*
-    unsigned char *data = GetData();
-    if( !data )
-    {
-        wxFAIL_MSG( "could not allocate data for image" );
-        return;
-    }
-    
-    // calc the number of bytes per scanline and padding in the DIB
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    div_t lineBoundary = div( bytePerLine, sizeDWORD );
-    int padding = 0;
-    if( lineBoundary.rem > 0 )  
-    {
-        padding = sizeDWORD - lineBoundary.rem;
-        bytePerLine += padding;
-    }
-    
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
-    {
-        wxFAIL_MSG( "could not allocate data for DIB header" );
-        free( data );
-        return;
-    }
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( "could not allocate data for DIB" );
-        free( data );
-        free( lpDIBh );
-        return;
-    }
-    
-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hbitmap;
-    hbitmap = (HBITMAP) bitmap.GetHBITMAP();
-    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-    
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
-    {
-        for( j=0; j<width; j++ )
-        {
-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
-        }
-        ptbits += padding;
-    }  
-    
-    // similarly, set data according to the possible mask bitmap
-    if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        HDC memdc = ::CreateCompatibleDC( hdc );
-        ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
-        ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
-        ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-        ::DeleteDC( memdc ); 
-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;  
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
-        {
-            for( j=0; j<width; j++ )
-            {
-                if( *ptbits != 0 )
-                    ptdata += 3;
-                else
-                {
-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
-                }
-                ptbits += 3;
-            }
-            ptbits += padding;
-        }       
-        SetMaskColour( r, g, b );
-        SetMask( TRUE );
-    }  
-    else
-    {
-        SetMask( FALSE );
-    }  
-    // free allocated resources      
-    ::ReleaseDC(NULL, hdc);   
-    free(lpDIBh);
-    free(lpBits);
-    */
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-// GTK conversion routines
-//-----------------------------------------------------------------------------
-
-#ifdef __WXGTK__
-
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
-#endif
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap;
-
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-
-    int width = GetWidth();
-    int height = GetHeight();
-
-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
-
-    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
-
-     // Retrieve depth
-
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_visual_get_system();
-    int bpp = visual->depth;
-
-    bitmap.SetDepth( bpp );
-
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
-
-#if (GTK_MINOR_VERSION > 0)
-
-    if (!HasMask() && (bpp > 8))
-    {
-        static bool s_hasInitialized = FALSE;
-
-        if (!s_hasInitialized)
-        {
-            gdk_rgb_init();
-            s_hasInitialized = TRUE;
-        }
-
-        GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() );
-
-        gdk_draw_rgb_image( bitmap.GetPixmap(),
-                            gc,
-                            0, 0,
-                            width, height,
-                            GDK_RGB_DITHER_NONE,
-                            GetData(),
-                            width*3 );
-
-        gdk_gc_unref( gc );
-
-        return bitmap;
-    }
-
-#endif
-
-    // Create picture image
-
-    GdkImage *data_image =
-        gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
-
-    // Create mask image
-
-    GdkImage *mask_image = (GdkImage*) NULL;
-
-    if (HasMask())
-    {
-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
-        mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
-
-        wxMask *mask = new wxMask();
-        mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
-
-        bitmap.SetMask( mask );
-    }
-
-    // Render
-
-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
-
-    if (bpp >= 24)
-    {
-        GdkVisual *visual = gdk_visual_get_system();
-        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
-        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
-    }
-
-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
-
-    unsigned char* data = GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            if (HasMask())
-            {
-                if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                    gdk_image_put_pixel( mask_image, x, y, 1 );
-                else
-                    gdk_image_put_pixel( mask_image, x, y, 0 );
-            }
-
-            if (HasMask())
-            {
-                if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                    gdk_image_put_pixel( mask_image, x, y, 1 );
-                else
-                    gdk_image_put_pixel( mask_image, x, y, 0 );
-            }
-
-            switch (bpp)
-            {
-            case 8:
-                {
-                    int pixel = -1;
-                    if (wxTheApp->m_colorCube)
-                    {
-                        pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                    }
-                    else
-                    {
-                        GdkColormap *cmap = gtk_widget_get_default_colormap();
-                        GdkColor *colors = cmap->colors;
-                        int max = 3 * (65536);
-
-                        for (int i = 0; i < cmap->size; i++)
-                        {
-                            int rdiff = (r << 8) - colors[i].red;
-                            int gdiff = (g << 8) - colors[i].green;
-                            int bdiff = (b << 8) - colors[i].blue;
-                            int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                            if (sum < max) { pixel = i; max = sum; }
-                        }
-                    }
-
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-
-                    break;
-                }
-            case 15:
-                {
-                    guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 16:
-                {
-                    guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 32:
-            case 24:
-                {
-                    guint32 pixel = 0;
-                    switch (b_o)
-                    {
-                    case RGB: pixel = (r << 16) | (g << 8) | b; break;
-                    case RBG: pixel = (r << 16) | (b << 8) | g; break;
-                    case BRG: pixel = (b << 16) | (r << 8) | g; break;
-                    case BGR: pixel = (b << 16) | (g << 8) | r; break;
-                    case GRB: pixel = (g << 16) | (r << 8) | b; break;
-                    case GBR: pixel = (g << 16) | (b << 8) | r; break;
-                    }
-                    gdk_image_put_pixel( data_image, x, y, pixel );
-                }
-            default: break;
-            }
-        } // for
-    }  // for
-
-    // Blit picture
-
-    GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() );
-
-    gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
-
-    // Blit mask
-
-    if (HasMask())
-    {
-        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
-
-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
-    }
-
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
-
-    GdkImage *gdk_image = (GdkImage*) NULL;
-    if (bitmap.GetPixmap())
-    {
-        gdk_image = gdk_image_get( bitmap.GetPixmap(),
-            0, 0,
-            bitmap.GetWidth(), bitmap.GetHeight() );
-    } else
-    if (bitmap.GetBitmap())
-    {
-        gdk_image = gdk_image_get( bitmap.GetBitmap(),
-            0, 0,
-            bitmap.GetWidth(), bitmap.GetHeight() );
-    } else
-    {
-        wxFAIL_MSG( wxT("Ill-formed bitmap") );
-    }
-
-    wxCHECK_RET( gdk_image, wxT("couldn't create image") );
-
-    Create( bitmap.GetWidth(), bitmap.GetHeight() );
-    char unsigned *data = GetData();
-
-    if (!data)
-    {
-        gdk_image_destroy( gdk_image );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return;
-    }
-
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (bitmap.GetMask())
-    {
-        gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
-            0, 0,
-            bitmap.GetWidth(), bitmap.GetHeight() );
-
-        SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-    }
-
-    GdkVisual *visual = (GdkVisual*) NULL;
-    if (bitmap.GetPixmap())
-        visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    else
-        visual = gdk_window_get_visual( bitmap.GetBitmap() );
-
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-
-    GdkColormap *cmap = gtk_widget_get_default_colormap();
-
-    long pos = 0;
-    for (int j = 0; j < bitmap.GetHeight(); j++)
-    {
-        for (int i = 0; i < bitmap.GetWidth(); i++)
-        {
-            wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j );
-            if (bpp <= 8)
-            {
-                data[pos] = cmap->colors[pixel].red >> 8;
-                data[pos+1] = cmap->colors[pixel].green >> 8;
-                data[pos+2] = cmap->colors[pixel].blue >> 8;
-            } else if (bpp == 15)
-            {
-#if (wxBYTE_ORDER == wxBIG_ENDIAN)
-                // ?
-#endif
-                data[pos] = (pixel >> 7) & 0xf8;
-                data[pos+1] = (pixel >> 2) & 0xf8;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else if (bpp == 16)
-            {
-#if (wxBYTE_ORDER == wxBIG_ENDIAN)
-                // ?
-#endif
-                data[pos] = (pixel >> 8) & 0xf8;
-                data[pos+1] = (pixel >> 3) & 0xfc;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else
-            {
-#if (wxBYTE_ORDER == wxBIG_ENDIAN)
-                data[pos] = (pixel) & 0xff;            // Red
-                data[pos+1] = (pixel >> 8) & 0xff;     // Green
-                data[pos+2] = (pixel >> 16) & 0xff;    // Blue
-#else
-                data[pos] = (pixel >> 16) & 0xff;
-                data[pos+1] = (pixel >> 8) & 0xff;
-                data[pos+2] = pixel & 0xff;
-#endif
-            }
-
-            if (gdk_image_mask)
-            {
-                int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-                if (mask_pixel == 0)
-                {
-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
-                }
-            }
-
-            pos += 3;
-        }
-    }
-
-    gdk_image_destroy( gdk_image );
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Motif conversion routines
-//-----------------------------------------------------------------------------
-
-#ifdef __WXMOTIF__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
-#include "wx/utils.h"
-#include <math.h>
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap;
-
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-
-    int width = GetWidth();
-    int height = GetHeight();
-
-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
-
-    Display *dpy = (Display*) wxGetDisplay();
-    Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
-    int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) );
-
-    // Create image
-
-    XImage *data_image = XCreateImage( dpy, vis, bpp, ZPixmap, 0, 0, width, height, 32, 0 );
-    data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height );
-
-    bitmap.Create( width, height, bpp );
-
-    /*
-    // Create mask
-
-      GdkImage *mask_image = (GdkImage*) NULL;
-
-        if (HasMask())
-        {
-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
-          mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
-
-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
-
-              bitmap.SetMask( mask );
-              }
-    */
-
-    // Retrieve depth info
-
-    XVisualInfo vinfo_template;
-    XVisualInfo *vi;
-
-    vinfo_template.visual = vis;
-    vinfo_template.visualid = XVisualIDFromVisual( vis );
-    vinfo_template.depth = bpp;
-    int nitem = 0;
-
-    vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
-
-    wxCHECK_MSG( vi, wxNullBitmap, wxT("no visual") );
-
-    XFree( vi );
-
-    if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
-
-    // Render
-
-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
-
-    if (bpp >= 24)
-    {
-        if ((vi->red_mask > vi->green_mask) && (vi->green_mask > vi->blue_mask))      b_o = RGB;
-        else if ((vi->red_mask > vi->blue_mask) && (vi->blue_mask > vi->green_mask))  b_o = RGB;
-        else if ((vi->blue_mask > vi->red_mask) && (vi->red_mask > vi->green_mask))   b_o = BRG;
-        else if ((vi->blue_mask > vi->green_mask) && (vi->green_mask > vi->red_mask)) b_o = BGR;
-        else if ((vi->green_mask > vi->red_mask) && (vi->red_mask > vi->blue_mask))   b_o = GRB;
-        else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask))  b_o = GBR;
-    }
-
-    /*
-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
-    */
-
-    XColor colors[256];
-    if (bpp == 8)
-    {
-        Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy );
-
-        for (int i = 0; i < 256; i++) colors[i].pixel = i;
-        XQueryColors( dpy, cmap, colors, 256 );
-    }
-
-    unsigned char* data = GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            /*
-            if (HasMask())
-            {
-            if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-            gdk_image_put_pixel( mask_image, x, y, 1 );
-            else
-            gdk_image_put_pixel( mask_image, x, y, 0 );
-            }
-            */
-
-            switch (bpp)
-            {
-            case 8:
-                {
-                    int pixel = -1;
-                    /*
-                    if (wxTheApp->m_colorCube)
-                    {
-                    pixel = wxTheApp->m_colorCube
-                    [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                    }
-                    else
-                    {
-                    */
-                    int max = 3 * (65536);
-                    for (int i = 0; i < 256; i++)
-                    {
-                        int rdiff = (r << 8) - colors[i].red;
-                        int gdiff = (g << 8) - colors[i].green;
-                        int bdiff = (b << 8) - colors[i].blue;
-                        int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
-                        if (sum < max) { pixel = i; max = sum; }
-                    }
-                    /*
-                    }
-                    */
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 15:
-                {
-                    int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 16:
-                {
-                    int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                    XPutPixel( data_image, x, y, pixel );
-                    break;
-                }
-            case 32:
-            case 24:
-                {
-                    int pixel = 0;
-                    switch (b_o)
-                    {
-                    case RGB: pixel = (r << 16) | (g << 8) | b; break;
-                    case RBG: pixel = (r << 16) | (b << 8) | g; break;
-                    case BRG: pixel = (b << 16) | (r << 8) | g; break;
-                    case BGR: pixel = (b << 16) | (g << 8) | r; break;
-                    case GRB: pixel = (g << 16) | (r << 8) | b; break;
-                    case GBR: pixel = (g << 16) | (b << 8) | r; break;
-                    }
-                    XPutPixel( data_image, x, y, pixel );
-                }
-            default: break;
-            }
-        } // for
-    }  // for
-
-    // Blit picture
-
-    XGCValues gcvalues;
-    gcvalues.foreground = BlackPixel( dpy, DefaultScreen( dpy ) );
-    GC gc = XCreateGC( dpy, RootWindow ( dpy, DefaultScreen(dpy) ), GCForeground, &gcvalues );
-    XPutImage( dpy, (Drawable)bitmap.GetPixmap(), gc, data_image, 0, 0, 0, 0, width, height );
-
-    XDestroyImage( data_image );
-    XFreeGC( dpy, gc );
-
-    /*
-    // Blit mask
-
-      if (HasMask())
-      {
-      GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
-
-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-          gdk_image_destroy( mask_image );
-          gdk_gc_unref( mask_gc );
-          }
-    */
-
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
-
-    Display *dpy = (Display*) wxGetDisplay();
-    Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
-    int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) );
-
-    XImage *ximage = XGetImage( dpy,
-        (Drawable)bitmap.GetPixmap(),
-        0, 0,
-        bitmap.GetWidth(), bitmap.GetHeight(),
-        AllPlanes, ZPixmap );
-
-    wxCHECK_RET( ximage, wxT("couldn't create image") );
-
-    Create( bitmap.GetWidth(), bitmap.GetHeight() );
-    char unsigned *data = GetData();
-
-    if (!data)
-    {
-        XDestroyImage( ximage );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return;
-    }
-
-    /*
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (bitmap.GetMask())
-    {
-    gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
-    0, 0,
-    bitmap.GetWidth(), bitmap.GetHeight() );
-
-      SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-      }
-    */
-
-    // Retrieve depth info
-
-    XVisualInfo vinfo_template;
-    XVisualInfo *vi;
-
-    vinfo_template.visual = vis;
-    vinfo_template.visualid = XVisualIDFromVisual( vis );
-    vinfo_template.depth = bpp;
-    int nitem = 0;
-
-    vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
-
-    wxCHECK_RET( vi, wxT("no visual") );
-
-    if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
-
-    XFree( vi );
-
-    XColor colors[256];
-    if (bpp == 8)
-    {
-        Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy );
-
-        for (int i = 0; i < 256; i++) colors[i].pixel = i;
-        XQueryColors( dpy, cmap, colors, 256 );
-    }
-
-    long pos = 0;
-    for (int j = 0; j < bitmap.GetHeight(); j++)
-    {
-        for (int i = 0; i < bitmap.GetWidth(); i++)
-        {
-            int pixel = XGetPixel( ximage, i, j );
-            if (bpp <= 8)
-            {
-                data[pos] = colors[pixel].red >> 8;
-                data[pos+1] = colors[pixel].green >> 8;
-                data[pos+2] = colors[pixel].blue >> 8;
-            } else if (bpp == 15)
-            {
-                data[pos] = (pixel >> 7) & 0xf8;
-                data[pos+1] = (pixel >> 2) & 0xf8;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else if (bpp == 16)
-            {
-                data[pos] = (pixel >> 8) & 0xf8;
-                data[pos+1] = (pixel >> 3) & 0xfc;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else
-            {
-                data[pos] = (pixel >> 16) & 0xff;
-                data[pos+1] = (pixel >> 8) & 0xff;
-                data[pos+2] = pixel & 0xff;
-            }
-
-            /*
-            if (gdk_image_mask)
-            {
-            int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-            if (mask_pixel == 0)
-            {
-            data[pos] = 16;
-            data[pos+1] = 16;
-            data[pos+2] = 16;
-            }
-            }
-            */
-
-            pos += 3;
-        }
-    }
-
-    XDestroyImage( ximage );
-    /*
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-    */
-}
-#endif
-
-#ifdef __WXPM__
-// OS/2 Presentation manager conversion routings
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    if ( !Ok() )
-        return wxNullBitmap;
-    wxBitmap bitmap; // remove
-// TODO:
-/*
-    int sizeLimit = 1024*768*3;
-
-    // width and height of the device-dependent bitmap
-    int width = GetWidth();
-    int bmpHeight = GetHeight();
-
-    // calc the number of bytes per scanline and padding
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary = bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-    // calc the number of DIBs and heights of DIBs
-    int numDIB = 1;
-    int hRemain = 0;
-    int height = sizeLimit/bytePerLine;
-    if( height >= bmpHeight )
-        height = bmpHeight;
-    else
-    {
-        numDIB =  bmpHeight / height;
-        hRemain = bmpHeight % height;
-        if( hRemain >0 )  numDIB++;
-    }
-
-    // set bitmap parameters
-    wxBitmap bitmap;
-    wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
-    bitmap.SetWidth( width );
-    bitmap.SetHeight( bmpHeight );
-    bitmap.SetDepth( wxDisplayDepth() );
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = (DWORD)width;
-    lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-    //   the general formula for biSizeImage:
-    //      ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate memory for DIB") );
-        free( lpDIBh );
-        return bitmap;
-    }
-
-    // create and set the device-dependent bitmap
-    HDC hdc = ::GetDC(NULL);
-    HDC memdc = ::CreateCompatibleDC( hdc );
-    HBITMAP hbitmap;
-    hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
-    ::SelectObject( memdc, hbitmap);
-
-    // copy image data into DIB data and then into DDB (in a loop)
-    unsigned char *data = GetData();
-    int i, j, n;
-    int origin = 0;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits;
-
-    for( n=0; n<numDIB; n++ )
-    {
-        if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
-        {
-            // redefine height and size of the (possibly) last smaller DIB
-            // memory is not reallocated
-            height = hRemain;
-            lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-            lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        }
-        ptbits = lpBits;
-
-        for( j=0; j<height; j++ )
-        {
-            for( i=0; i<width; i++ )
-            {
-                *(ptbits++) = *(ptdata+2);
-                *(ptbits++) = *(ptdata+1);
-                *(ptbits++) = *(ptdata  );
-                ptdata += 3;
-            }
-            for( i=0; i< padding; i++ )   *(ptbits++) = 0;
-        }
-        ::StretchDIBits( memdc, 0, origin, width, height,\
-            0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-        origin += height;
-        // if numDIB = 1,  lines below can also be used
-        //    hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
-        // The above line is equivalent to the following two lines.
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
-        // or the following lines
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    HDC memdc = ::CreateCompatibleDC( hdc );
-        //    ::SelectObject( memdc, hbitmap);
-        //    ::SetDIBitsToDevice( memdc, 0, 0, width, height,
-        //            0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
-        //    ::SelectObject( memdc, 0 );
-        //    ::DeleteDC( memdc );
-    }
-    bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
-
-    // similarly, created an mono-bitmap for the possible mask
-    if( HasMask() )
-    {
-        hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
-        ::SelectObject( memdc, hbitmap);
-        if( numDIB == 1 )   height = bmpHeight;
-        else                height = sizeLimit/bytePerLine;
-        lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-        lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        origin = 0;
-        unsigned char r = GetMaskRed();
-        unsigned char g = GetMaskGreen();
-        unsigned char b = GetMaskBlue();
-        unsigned char zero = 0, one = 255;
-        ptdata = data;
-        for( n=0; n<numDIB; n++ )
-        {
-            if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
-            {
-                // redefine height and size of the (possibly) last smaller DIB
-                // memory is not reallocated
-                height = hRemain;
-                lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-                lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-            }
-            ptbits = lpBits;
-            for( int j=0; j<height; j++ )
-            {
-                for(i=0; i<width; i++ )
-                {
-                    if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
-                    {
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                    }
-                    else
-                    {
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                    }
-                }
-                for( i=0; i< padding; i++ )   *(ptbits++) = zero;
-            }
-            ::StretchDIBits( memdc, 0, origin, width, height,\
-                0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-            origin += height;
-        }
-        // create a wxMask object
-        wxMask *mask = new wxMask();
-        mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
-        bitmap.SetMask( mask );
-    }
-
-    // free allocated resources
-    ::SelectObject( memdc, 0 );
-    ::DeleteDC( memdc );
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
-
-    // check the wxBitmap object
-    if( bitmap.GetHBITMAP() )
-        bitmap.SetOk( TRUE );
-    else
-        bitmap.SetOk( FALSE );
-*/
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    // check the bitmap
-    if( !bitmap.Ok() )
-    {
-        wxFAIL_MSG( wxT("invalid bitmap") );
-        return;
-    }
-
-    // create an wxImage object
-    int width = bitmap.GetWidth();
-    int height = bitmap.GetHeight();
-    Create( width, height );
-    unsigned char *data = GetData();
-    if( !data )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for image") );
-        return;
-    }
-
-    // calc the number of bytes per scanline and padding in the DIB
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary =  bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-// TODO:
-/*
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );
-        return;
-    }
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB") );
-        free( data );
-        free( lpDIBh );
-        return;
-    }
-
-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hbitmap;
-    hbitmap = (HBITMAP) bitmap.GetHBITMAP();
-    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
-    {
-        for( j=0; j<width; j++ )
-        {
-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
-        }
-        ptbits += padding;
-    }
-
-    // similarly, set data according to the possible mask bitmap
-    if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        HDC memdc = ::CreateCompatibleDC( hdc );
-        ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
-        ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
-        ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-        ::DeleteDC( memdc );
-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
-        {
-            for( j=0; j<width; j++ )
-            {
-                if( *ptbits != 0 )
-                    ptdata += 3;
-                else
-                {
-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
-                }
-                ptbits += 3;
-            }
-            ptbits += padding;
-        }
-        SetMaskColour( r, g, b );
-        SetMask( TRUE );
-    }
-    else
-    {
-        SetMask( FALSE );
-    }
-    // free allocated resources
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
-*/
-}
-
-#endif
-
-// A module to allow wxImage initialization/cleanup
-// without calling these functions from app.cpp or from
-// the user's application.
-
-class wxImageModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxImageModule)
-public:
-    wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
-    void OnExit() { wxImage::CleanUpHandlers(); };
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+#endif // wxUSE_IMAGE