make sure mac pref files remain visible and named as before

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 2b43ad042cbb9c1b302962eb9653d55b2cae7beb..b41fee58f655546f95f6a5d70e59b1cda7c3ab2c 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -30,10 +30,7 @@
 
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

-
-#if wxUSE_XPM
-    #include "wx/xpmdecod.h"
-#endif
+#include "wx/xpmdecod.h"

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


@@ -42,15 +39,19 @@
 #define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
 
 #if HAS_FILE_STREAMS
 #define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
 
 #if HAS_FILE_STREAMS

-    #if wxUSE_FILE
-        typedef wxFileInputStream wxImageFileInputStream;
-        typedef wxFileOutputStream wxImageFileOutputStream;
-    #elif wxUSE_FFILE
+    #if wxUSE_FFILE

         typedef wxFFileInputStream wxImageFileInputStream;
         typedef wxFFileOutputStream wxImageFileOutputStream;
         typedef wxFFileInputStream wxImageFileInputStream;
         typedef wxFFileOutputStream wxImageFileOutputStream;

+    #elif wxUSE_FILE
+        typedef wxFileInputStream wxImageFileInputStream;
+        typedef wxFileOutputStream wxImageFileOutputStream;

     #endif // wxUSE_FILE/wxUSE_FFILE
 #endif // HAS_FILE_STREAMS
 
     #endif // wxUSE_FILE/wxUSE_FFILE
 #endif // HAS_FILE_STREAMS
 

+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxImage,WXDLLEXPORT)
+#endif
+

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


@@ -63,6 +64,7 @@ public:
 
     int             m_width;
     int             m_height;
 
     int             m_width;
     int             m_height;

+    wxBitmapType    m_type;

     unsigned char  *m_data;
 
     bool            m_hasMask;
     unsigned char  *m_data;
 
     bool            m_hasMask;


@@ -93,6 +95,7 @@ wxImageRefData::wxImageRefData()
 {
     m_width = 0;
     m_height = 0;
 {
     m_width = 0;
     m_height = 0;

+    m_type = wxBITMAP_TYPE_INVALID;

     m_data =
     m_alpha = (unsigned char *) NULL;
 
     m_data =
     m_alpha = (unsigned char *) NULL;
 


@@ -139,7 +142,7 @@ wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alp
     Create( width, height, data, alpha, static_data );
 }
 
     Create( width, height, data, alpha, static_data );
 }
 

-wxImage::wxImage( const wxString& name, long type, int index )
+wxImage::wxImage( const wxString& name, wxBitmapType type, int index )

 {
     LoadFile( name, type, index );
 }
 {
     LoadFile( name, type, index );
 }


@@ -150,7 +153,7 @@ wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )
 }
 
 #if wxUSE_STREAMS
 }
 
 #if wxUSE_STREAMS

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

 {
     LoadFile( stream, type, index );
 }
 {
     LoadFile( stream, type, index );
 }


@@ -161,17 +164,12 @@ wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
 }
 #endif // wxUSE_STREAMS
 
 }
 #endif // wxUSE_STREAMS
 

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

 {
     Create(xpmData);
 }
 
 {
     Create(xpmData);
 }
 

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

 {
 #if wxUSE_XPM
     UnRef();
 {
 #if wxUSE_XPM
     UnRef();


@@ -469,13 +467,7 @@ wxImage wxImage::Scale( int width, int height, int quality ) const
         unsigned char *source_alpha = 0 ;
         unsigned char *target_alpha = 0 ;
 
         unsigned char *source_alpha = 0 ;
         unsigned char *target_alpha = 0 ;
 

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

         {
             source_alpha = M_IMGDATA->m_alpha ;
             if ( source_alpha )
         {
             source_alpha = M_IMGDATA->m_alpha ;
             if ( source_alpha )


@@ -514,6 +506,14 @@ wxImage wxImage::Scale( int width, int height, int quality ) const
         }
     }
 
         }
     }
 

+    // If the original image has a mask, apply the mask to the new image
+    if (M_IMGDATA->m_hasMask)
+    {
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                            M_IMGDATA->m_maskGreen,
+                            M_IMGDATA->m_maskBlue );
+    }
+

     // In case this is a cursor, make sure the hotspot is scaled accordingly:
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
     // In case this is a cursor, make sure the hotspot is scaled accordingly:
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,


@@ -540,13 +540,8 @@ wxImage wxImage::ResampleBox(int width, int height) const
     const int scale_factor_x_2 = (int)(scale_factor_x / 2);
     const int scale_factor_y_2 = (int)(scale_factor_y / 2);
 
     const int scale_factor_x_2 = (int)(scale_factor_x / 2);
     const int scale_factor_y_2 = (int)(scale_factor_y / 2);
 

-    // If we want good-looking results we need to pre-blur the image a bit first
-    wxImage src_image(*this);
-    src_image = src_image.BlurHorizontal(scale_factor_x_2);
-    src_image = src_image.BlurVertical(scale_factor_y_2);
-
-    unsigned char* src_data = src_image.GetData();
-    unsigned char* src_alpha = src_image.GetAlpha();
+    unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* src_alpha = M_IMGDATA->m_alpha;

     unsigned char* dst_data = ret_image.GetData();
     unsigned char* dst_alpha = NULL;
 
     unsigned char* dst_data = ret_image.GetData();
     unsigned char* dst_alpha = NULL;
 


@@ -573,24 +568,24 @@ wxImage wxImage::ResampleBox(int width, int height) const
             averaged_pixels = 0;
             sum_r = sum_g = sum_b = sum_a = 0.0;
 
             averaged_pixels = 0;
             sum_r = sum_g = sum_b = sum_a = 0.0;
 

-            for ( int j = src_y - scale_factor_y_2 + 1;
+            for ( int j = int(src_y - scale_factor_y/2.0 + 1);

                   j <= int(src_y + scale_factor_y_2);
                   j++ )
             {
                 // We don't care to average pixels that don't exist (edges)
                   j <= int(src_y + scale_factor_y_2);
                   j++ )
             {
                 // We don't care to average pixels that don't exist (edges)

-                if ( j < 0 || j > M_IMGDATA->m_height )
+                if ( j < 0 || j > M_IMGDATA->m_height - 1 )

                     continue;
 
                     continue;
 

-                for ( int i = src_x - scale_factor_x_2 + 1;
+                for ( int i = int(src_x - scale_factor_x/2.0 + 1);

                       i <= src_x + scale_factor_x_2;
                       i++ )
                 {
                     // Don't average edge pixels
                       i <= src_x + scale_factor_x_2;
                       i++ )
                 {
                     // Don't average edge pixels

-                    if ( i < 0 || i > M_IMGDATA->m_width )
+                    if ( i < 0 || i > M_IMGDATA->m_width - 1 )

                         continue;
 
                     // Calculate the actual index in our source pixels
                         continue;
 
                     // Calculate the actual index in our source pixels

-                    src_pixel_index = src_y * M_IMGDATA->m_width + src_x;
+                    src_pixel_index = j * M_IMGDATA->m_width + i;

 
                     sum_r += src_data[src_pixel_index * 3 + 0];
                     sum_g += src_data[src_pixel_index * 3 + 1];
 
                     sum_r += src_data[src_pixel_index * 3 + 0];
                     sum_g += src_data[src_pixel_index * 3 + 1];


@@ -677,13 +672,13 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
     for ( int dsty = 0; dsty < height; dsty++ )
     {
         // We need to calculate the source pixel to interpolate from - Y-axis
     for ( int dsty = 0; dsty < height; dsty++ )
     {
         // We need to calculate the source pixel to interpolate from - Y-axis

-        double srcpixy = dsty * M_IMGDATA->m_height / height;
+        double srcpixy = double(dsty * M_IMGDATA->m_height) / height;

         double dy = srcpixy - (int)srcpixy;
 
         for ( int dstx = 0; dstx < width; dstx++ )
         {
             // X-axis of pixel to interpolate from
         double dy = srcpixy - (int)srcpixy;
 
         for ( int dstx = 0; dstx < width; dstx++ )
         {
             // X-axis of pixel to interpolate from

-            double srcpixx = dstx * M_IMGDATA->m_width / width;
+            double srcpixx = double(dstx * M_IMGDATA->m_width) / width;

             double dx = srcpixx - (int)srcpixx;
 
             // Sums for each color channel
             double dx = srcpixx - (int)srcpixx;
 
             // Sums for each color channel


@@ -745,7 +740,7 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
 }
 
 // Blur in the horizontal direction
 }
 
 // Blur in the horizontal direction

-wxImage wxImage::BlurHorizontal(int blurRadius)
+wxImage wxImage::BlurHorizontal(int blurRadius) const

 {
     wxImage ret_image;
     ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
 {
     wxImage ret_image;
     ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);


@@ -756,20 +751,17 @@ wxImage wxImage::BlurHorizontal(int blurRadius)
     unsigned char* dst_alpha = NULL;
 
     // Check for a mask or alpha
     unsigned char* dst_alpha = NULL;
 
     // Check for a mask or alpha

-    if ( M_IMGDATA->m_hasMask )
+    if ( src_alpha )
+    {
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();
+    }
+    else if ( M_IMGDATA->m_hasMask )

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

-    else
-    {
-        if ( src_alpha )
-        {
-            ret_image.SetAlpha();
-            dst_alpha = ret_image.GetAlpha();
-        }
-    }

 
     // number of pixels we average over
     const int blurArea = blurRadius*2 + 1;
 
     // number of pixels we average over
     const int blurArea = blurRadius*2 + 1;


@@ -850,7 +842,7 @@ wxImage wxImage::BlurHorizontal(int blurRadius)
                 sum_a += src_alpha[pixel_idx];
 
             // Save off the averaged data
                 sum_a += src_alpha[pixel_idx];
 
             // Save off the averaged data

-            dst = dst_data + x*3 + y*M_IMGDATA->m_width;
+            dst = dst_data + x*3 + y*M_IMGDATA->m_width*3;

             dst[0] = (unsigned char)(sum_r / blurArea);
             dst[1] = (unsigned char)(sum_g / blurArea);
             dst[2] = (unsigned char)(sum_b / blurArea);
             dst[0] = (unsigned char)(sum_r / blurArea);
             dst[1] = (unsigned char)(sum_g / blurArea);
             dst[2] = (unsigned char)(sum_b / blurArea);


@@ -863,7 +855,7 @@ wxImage wxImage::BlurHorizontal(int blurRadius)
 }
 
 // Blur in the vertical direction
 }
 
 // Blur in the vertical direction

-wxImage wxImage::BlurVertical(int blurRadius)
+wxImage wxImage::BlurVertical(int blurRadius) const

 {
     wxImage ret_image;
     ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
 {
     wxImage ret_image;
     ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);


@@ -874,20 +866,17 @@ wxImage wxImage::BlurVertical(int blurRadius)
     unsigned char* dst_alpha = NULL;
 
     // Check for a mask or alpha
     unsigned char* dst_alpha = NULL;
 
     // Check for a mask or alpha

-    if ( M_IMGDATA->m_hasMask )
+    if ( src_alpha )
+    {
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();
+    }
+    else if ( M_IMGDATA->m_hasMask )

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

-    else
-    {
-        if ( src_alpha )
-        {
-            ret_image.SetAlpha();
-            dst_alpha = ret_image.GetAlpha();
-        }
-    }

 
     // number of pixels we average over
     const int blurArea = blurRadius*2 + 1;
 
     // number of pixels we average over
     const int blurArea = blurRadius*2 + 1;


@@ -981,7 +970,7 @@ wxImage wxImage::BlurVertical(int blurRadius)
 }
 
 // The new blur function
 }
 
 // The new blur function

-wxImage wxImage::Blur(int blurRadius)
+wxImage wxImage::Blur(int blurRadius) const

 {
     wxImage ret_image;
     ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
 {
     wxImage ret_image;
     ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);


@@ -1296,6 +1285,26 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         return;
     }
 
         return;
     }
 

+    // Copy over the alpha channel from the original image
+    if ( image.HasAlpha() )
+    {
+        if ( !HasAlpha() )
+            InitAlpha();
+
+        unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth();
+        int source_step = image.GetWidth();
+
+        unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width;
+
+        for (int j = 0; j < height; j++,
+                                    source_data += source_step,
+                                    target_data += target_step)
+        {
+            memcpy( target_data, source_data, width );
+        }
+    }
+

     if (!HasMask() && image.HasMask())
     {
         unsigned char r = image.GetMaskRed();
     if (!HasMask() && image.HasMask())
     {
         unsigned char r = image.GetMaskRed();


@@ -1313,8 +1322,8 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         {
             for (int i = 0; i < width; i+=3)
             {
         {
             for (int i = 0; i < width; i+=3)
             {

-                if ((source_data[i]   != r) &&
-                    (source_data[i+1] != g) &&
+                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[i+2] != b))
                 {
                     memcpy( target_data+i, source_data+i, 3 );


@@ -1452,6 +1461,13 @@ int wxImage::GetHeight() const
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }
 

+wxBitmapType wxImage::GetType() const
+{
+    wxCHECK_MSG( IsOk(), wxBITMAP_TYPE_INVALID, wxT("invalid image") );
+
+    return M_IMGDATA->m_type;
+}
+

 long wxImage::XYToIndex(int x, int y) const
 {
     if ( Ok() &&
 long wxImage::XYToIndex(int x, int y) const
 {
     if ( Ok() &&


@@ -1546,7 +1562,7 @@ unsigned char wxImage::GetBlue( int x, int y ) const
     return M_IMGDATA->m_data[pos+2];
 }
 
     return M_IMGDATA->m_data[pos+2];
 }
 

-bool wxImage::Ok() const
+bool wxImage::IsOk() const

 {
     // image of 0 width or height can't be considered ok - at least because it
     // causes crashes in ConvertToBitmap() if we don't catch it in time
 {
     // 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


@@ -1673,7 +1689,9 @@ void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
         alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
     }
 
         alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
     }
 

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

     M_IMGDATA->m_alpha = alpha;
     M_IMGDATA->m_staticAlpha = static_data;
 }
     M_IMGDATA->m_alpha = alpha;
     M_IMGDATA->m_staticAlpha = static_data;
 }


@@ -1906,8 +1924,11 @@ bool wxImage::ConvertAlphaToMask(unsigned char threshold)
         }
     }
 
         }
     }
 

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

     M_IMGDATA->m_alpha = NULL;
     M_IMGDATA->m_alpha = NULL;

+    M_IMGDATA->m_staticAlpha = false;

 
     return true;
 }
 
     return true;
 }


@@ -2002,7 +2023,7 @@ bool wxImage::HasOption(const wxString& name) const
 // ----------------------------------------------------------------------------
 
 bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
 // ----------------------------------------------------------------------------
 
 bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),

-                        long WXUNUSED_UNLESS_STREAMS(type),
+                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type),

                         int WXUNUSED_UNLESS_STREAMS(index) )
 {
 #if HAS_FILE_STREAMS
                         int WXUNUSED_UNLESS_STREAMS(index) )
 {
 #if HAS_FILE_STREAMS


@@ -2046,25 +2067,23 @@ bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
 }
 
 
 }
 
 

-

 bool wxImage::SaveFile( const wxString& filename ) const
 {
     wxString ext = filename.AfterLast('.').Lower();
 
 bool wxImage::SaveFile( const wxString& filename ) const
 {
     wxString ext = filename.AfterLast('.').Lower();
 

-    wxImageHandler * pHandler = FindHandler(ext, -1);
-    if (pHandler)
+    wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY);
+    if ( !handler)

     {
     {

-        SaveFile(filename, pHandler->GetType());
-        return true;
+       wxLogError(_("Can't save image to file '%s': unknown extension."),
+                  filename);
+       return false;

     }
 
     }
 

-    wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
-
-    return false;
+    return SaveFile(filename, handler->GetType());

 }
 
 bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
 }
 
 bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),

-                        int WXUNUSED_UNLESS_STREAMS(type) ) const
+                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const

 {
 #if HAS_FILE_STREAMS
     wxCHECK_MSG( Ok(), false, wxT("invalid image") );
 {
 #if HAS_FILE_STREAMS
     wxCHECK_MSG( Ok(), false, wxT("invalid image") );


@@ -2114,7 +2133,7 @@ bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) )
 }
 
 int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
 }
 
 int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),

-                            long WXUNUSED_UNLESS_STREAMS(type) )
+                            wxBitmapType WXUNUSED_UNLESS_STREAMS(type) )

 {
 #if HAS_FILE_STREAMS
     wxImageFileInputStream stream(name);
 {
 #if HAS_FILE_STREAMS
     wxImageFileInputStream stream(name);


@@ -2141,19 +2160,25 @@ bool wxImage::CanRead( wxInputStream &stream )
     return false;
 }
 
     return false;
 }
 

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

 {
     wxImageHandler *handler;
 
     if ( type == wxBITMAP_TYPE_ANY )
     {
 {
     wxImageHandler *handler;
 
     if ( type == wxBITMAP_TYPE_ANY )
     {

-        wxList &list=GetHandlers();
+        const wxList& list = GetHandlers();

 
 

-        for (wxList::compatibility_iterator 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) )
              if ( handler->CanRead(stream) )

-                 return handler->GetImageCount(stream);
+             {
+                 const int count = handler->GetImageCount(stream);
+                 if ( count >= 0 )
+                     return count;
+             }

 
         }
 
 
         }
 


@@ -2180,7 +2205,16 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
     }
 }
 
     }
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
+bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
+{
+    if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
+        return false;
+
+    M_IMGDATA->m_type = handler.GetType();
+    return true;
+}
+
+bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )

 {
     UnRef();
 
 {
     UnRef();
 


@@ -2190,36 +2224,36 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
 
     if ( type == wxBITMAP_TYPE_ANY )
     {
 
     if ( type == wxBITMAP_TYPE_ANY )
     {

-        wxList &list=GetHandlers();
-
-        for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
+        const wxList& list = GetHandlers();
+        for ( wxList::compatibility_iterator node = list.GetFirst();
+              node;
+              node = node->GetNext() )

         {
         {

-             handler=(wxImageHandler*)node->GetData();
-             if ( handler->CanRead(stream) )
-                 return handler->LoadFile(this, stream, true/*verbose*/, index);
-
+             handler = (wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) )
+                 return true;

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

+

         return false;
     }
         return false;
     }

+    //else: have specific type

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

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

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

-

         return false;
     }
 
         return false;
     }
 

-    if (stream.IsSeekable() && !handler->CanRead(stream))
+    if ( stream.IsSeekable() && !handler->CanRead(stream) )

     {
         wxLogError(_("Image file is not of type %ld."), type);
         return false;
     }
     {
         wxLogError(_("Image file is not of type %ld."), type);
         return false;
     }

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

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


@@ -2230,23 +2264,32 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
 

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

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

-

         return false;
     }
 
         return false;
     }
 

-    if (stream.IsSeekable() && !handler->CanRead(stream))
+    if ( stream.IsSeekable() && !handler->CanRead(stream) )

     {
     {

-        wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
+        wxLogError(_("Image file is not of type %s."), mimetype);

         return false;
     }
         return false;
     }

-    else
-        return handler->LoadFile( this, stream, true/*verbose*/, index );
+
+    return DoLoad(*handler, stream, index);
+}
+
+bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
+{
+    wxImage * const self = wx_const_cast(wxImage *, this);
+    if ( !handler.SaveFile(self, stream) )
+        return false;
+
+    M_IMGDATA->m_type = handler.GetType();
+    return true;

 }
 
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
+bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const

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


@@ -2254,11 +2297,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
     if ( !handler )
     {
         wxLogWarning( _("No image handler for type %d defined."), type );
     if ( !handler )
     {
         wxLogWarning( _("No image handler for type %d defined."), type );

-

         return false;
     }
 
         return false;
     }
 

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

 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const


@@ -2269,12 +2311,11 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
     if ( !handler )
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
     if ( !handler )
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );

-
-        return false;

     }
 
     }
 

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

 }
 }

+

 #endif // wxUSE_STREAMS
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_STREAMS
 
 // ----------------------------------------------------------------------------


@@ -2341,24 +2382,26 @@ wxImageHandler *wxImage::FindHandler( const wxString& name )
 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }

-    return 0;
+    return NULL;

 }
 
 }
 

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

 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
         if ( (handler->GetExtension().Cmp(extension) == 0) &&
 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
     {
         wxImageHandler *handler = (wxImageHandler*)node->GetData();
         if ( (handler->GetExtension().Cmp(extension) == 0) &&

-            (bitmapType == -1 || handler->GetType() == bitmapType) )
+             ( (bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType)) )
+        {

             return handler;
             return handler;

+        }

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

-    return 0;
+    return NULL;

 }
 
 }
 

-wxImageHandler *wxImage::FindHandler( long bitmapType )
+wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType )

 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)


@@ -2367,7 +2410,7 @@ wxImageHandler *wxImage::FindHandler( long bitmapType )
         if (handler->GetType() == bitmapType) return handler;
         node = node->GetNext();
     }
         if (handler->GetType() == bitmapType) return handler;
         node = node->GetNext();
     }

-    return 0;
+    return NULL;

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


@@ -2379,7 +2422,7 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
         if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
         node = node->GetNext();
     }
         if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
         node = node->GetNext();
     }

-    return 0;
+    return NULL;

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


@@ -2653,6 +2696,42 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

+/* static */
+wxImageResolution
+wxImageHandler::GetResolutionFromOptions(const wxImage& image, int *x, int *y)
+{
+    wxCHECK_MSG( x && y, wxIMAGE_RESOLUTION_NONE, _T("NULL pointer") );
+
+    if ( image.HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+         image.HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
+    {
+        *x = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
+        *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
+    }
+    else if ( image.HasOption(wxIMAGE_OPTION_RESOLUTION) )
+    {
+        *x =
+        *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+    }
+    else // no resolution options specified
+    {
+        *x =
+        *y = 0;
+
+        return wxIMAGE_RESOLUTION_NONE;
+    }
+
+    // get the resolution unit too
+    int resUnit = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
+    if ( !resUnit )
+    {
+        // this is the default
+        resUnit = wxIMAGE_RESOLUTION_INCHES;
+    }
+
+    return (wxImageResolution)resUnit;
+}
+

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


@@ -2783,18 +2862,7 @@ unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
  * Rotation code by Carlos Moreno
  */
 
  * Rotation code by Carlos Moreno
  */
 

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

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


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

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 
 

-    bool has_alpha = HasAlpha();
+    int i;

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

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

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

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

 
     // Same for alpha channel
     unsigned char ** alpha = NULL;
     if (has_alpha)
     {
 
     // Same for alpha channel
     unsigned char ** alpha = NULL;
     if (has_alpha)
     {

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

         alpha[0] = GetAlpha();
         alpha[0] = GetAlpha();

-        for (i = 1; i < GetHeight(); i++)
-            alpha[i] = alpha[i - 1] + GetWidth();
+        for (i = 1; i < h; i++)
+            alpha[i] = alpha[i - 1] + w;

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

-    // (sine and cosine of the angle)

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


@@ -2847,10 +2926,10 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
 
     const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
 
 
     const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
 

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

 
     int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
     int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
 
     int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
     int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));


@@ -2868,19 +2947,14 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
         *offset_after_rotation = wxPoint (x1a, y1a);
     }
 
         *offset_after_rotation = wxPoint (x1a, y1a);
     }
 

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

 
 

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

 
 

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

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


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

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

 
 

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

     if (interpolating)
     {
     if (interpolating)
     {

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

         {
         {

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

             {
             {

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

 
 

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

                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point
                     int x1, y1, x2, y2;
 
                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point
                     int x1, y1, x2, y2;
 

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

                     {
                     {

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

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

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

                     }
 
                     }
 

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

                     {
                     {

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

                     }
                     else
                     {
                     }
                     else
                     {

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

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


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

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

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


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

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

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


@@ -2966,7 +3042,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                         if (has_alpha)
                             *(alpha_dst++) = *(alpha[y1] + x1);
                     }
                         if (has_alpha)
                             *(alpha_dst++) = *(alpha[y1] + x1);
                     }

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

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


@@ -2976,7 +3052,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                         if (has_alpha)
                             *(alpha_dst++) = *(alpha[y1] + x2);
                     }
                         if (has_alpha)
                             *(alpha_dst++) = *(alpha[y1] + x2);
                     }

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

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


@@ -2986,7 +3062,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                         if (has_alpha)
                             *(alpha_dst++) = *(alpha[y2] + x2);
                     }
                         if (has_alpha)
                             *(alpha_dst++) = *(alpha[y2] + x2);
                     }

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

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


@@ -3047,19 +3123,18 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
             }
         }
     }
             }
         }
     }

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

     {
     {

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

         {
         {

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

             {
             {

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

 
 

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

 
 

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

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


@@ -3083,9 +3158,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     }
 
     delete [] data;
     }
 
     delete [] data;

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

 
     return rotated;
 }
 
     return rotated;
 }


@@ -3103,8 +3176,8 @@ class wxImageModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}

-    bool OnInit() { wxImage::InitStandardHandlers(); return true; };
-    void OnExit() { wxImage::CleanUpHandlers(); };
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; }
+    void OnExit() { wxImage::CleanUpHandlers(); }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)