wxMessageBox off the main thread lost result code.

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 1c527ca0d7ba891a99029acf74d50bfb9595a087..40b0ab0325ad07bb8f8d2a00e32b9e565b56a79f 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/image.cpp
 // Purpose:     wxImage
 // Author:      Robert Roebling
 // Name:        src/common/image.cpp
 // Purpose:     wxImage
 // Author:      Robert Roebling

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,9 +25,9 @@
     #include "wx/module.h"
     #include "wx/palette.h"
     #include "wx/intl.h"
     #include "wx/module.h"
     #include "wx/palette.h"
     #include "wx/intl.h"

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/filefn.h"

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


@@ -140,8 +139,9 @@ bool wxImage::Create(const char* const* xpmData)
 
     wxXPMDecoder decoder;
     (*this) = decoder.ReadData(xpmData);
 
     wxXPMDecoder decoder;
     (*this) = decoder.ReadData(xpmData);

-    return Ok();
+    return IsOk();

 #else
 #else

+    wxUnusedVar(xpmData);

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -252,11 +252,48 @@ wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
     return refData_new;
 }
 
     return refData_new;
 }
 

+// returns a new image with the same dimensions, alpha, and mask as *this
+// if on_its_side is true, width and height are swapped
+wxImage wxImage::MakeEmptyClone(int flags) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( IsOk(), image, wxS("invalid image") );
+
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    if ( flags & Clone_SwapOrientation )
+        wxSwap( width, height );
+
+    if ( !image.Create( width, height, false ) )
+    {
+        wxFAIL_MSG( wxS("unable to create image") );
+        return image;
+    }
+
+    if ( M_IMGDATA->m_alpha )
+    {
+        image.SetAlpha();
+        wxCHECK2_MSG( image.GetAlpha(), return wxImage(),
+                      wxS("unable to create alpha channel") );
+    }
+
+    if ( M_IMGDATA->m_hasMask )
+    {
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                             M_IMGDATA->m_maskGreen,
+                             M_IMGDATA->m_maskBlue );
+    }
+
+    return image;
+}
+

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

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

 
     image.m_refData = CloneRefData(m_refData);
 
 
     image.m_refData = CloneRefData(m_refData);
 


@@ -270,7 +307,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 
     wxImage image;
 
 
     wxImage image;
 

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

 
     // can't scale to/from 0 size
     wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,
 
     // can't scale to/from 0 size
     wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,


@@ -294,11 +331,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
     bool hasMask = false ;
     unsigned char maskRed = 0;
     unsigned char maskGreen = 0;
     bool hasMask = false ;
     unsigned char maskRed = 0;
     unsigned char maskGreen = 0;

-    unsigned char maskBlue =0 ;
+    unsigned char maskBlue = 0 ;

 
 

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

     unsigned char *target_data = data;
     unsigned char *target_data = data;

-    unsigned char *source_alpha = 0 ;
+    const unsigned char *source_alpha = 0 ;

     unsigned char *target_alpha = 0 ;
     if (M_IMGDATA->m_hasMask)
     {
     unsigned char *target_alpha = 0 ;
     if (M_IMGDATA->m_hasMask)
     {


@@ -336,7 +373,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
                 long y_offset = (y * yFactor + y1) * old_width;
                 for ( int x1 = 0 ; x1 < xFactor ; ++x1 )
                 {
                 long y_offset = (y * yFactor + y1) * old_width;
                 for ( int x1 = 0 ; x1 < xFactor ; ++x1 )
                 {

-                    unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;
+                    const unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;

                     unsigned char red = pixel[0] ;
                     unsigned char green = pixel[1] ;
                     unsigned char blue = pixel[2] ;
                     unsigned char red = pixel[0] ;
                     unsigned char green = pixel[1] ;
                     unsigned char blue = pixel[2] ;


@@ -389,7 +426,7 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
 {
     wxImage image;
 
 {
     wxImage image;
 

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

 
     // can't scale to/from 0 size
     wxCHECK_MSG( (width > 0) && (height > 0), image,
 
     // can't scale to/from 0 size
     wxCHECK_MSG( (width > 0) && (height > 0), image,


@@ -405,23 +442,9 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
     if ( old_width == width && old_height == height )
         return *this;
 
     if ( old_width == width && old_height == height )
         return *this;
 

-    // resample the image using either the nearest neighbourhood, bilinear or
-    // bicubic method as specified
+    // Resample the image using the method as specified.

     switch ( quality )
     {
     switch ( quality )
     {

-        case wxIMAGE_QUALITY_BICUBIC:
-        case wxIMAGE_QUALITY_BILINEAR:
-            // both of these algorithms should be used for up-sampling the
-            // image only, when down-sampling always use box averaging for best
-            // results
-            if ( width < old_width && height < old_height )
-                image = ResampleBox(width, height);
-            else if ( quality == wxIMAGE_QUALITY_BILINEAR )
-                image = ResampleBilinear(width, height);
-            else if ( quality == wxIMAGE_QUALITY_BICUBIC )
-                image = ResampleBicubic(width, height);
-            break;
-

         case wxIMAGE_QUALITY_NEAREST:
             if ( old_width % width == 0 && old_width >= width &&
                 old_height % height == 0 && old_height >= height )
         case wxIMAGE_QUALITY_NEAREST:
             if ( old_width % width == 0 && old_width >= width &&
                 old_height % height == 0 && old_height >= height )


@@ -431,6 +454,24 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
 
             image = ResampleNearest(width, height);
             break;
 
             image = ResampleNearest(width, height);
             break;

+
+        case wxIMAGE_QUALITY_BILINEAR:
+            image = ResampleBilinear(width, height);
+            break;
+
+        case wxIMAGE_QUALITY_BICUBIC:
+            image = ResampleBicubic(width, height);
+            break;
+
+        case wxIMAGE_QUALITY_BOX_AVERAGE:
+            image = ResampleBox(width, height);
+            break;
+
+        case wxIMAGE_QUALITY_HIGH:
+            image = width < old_width && height < old_height
+                        ? ResampleBox(width, height)
+                        : ResampleBicubic(width, height);
+            break;

     }
 
     // If the original image has a mask, apply the mask to the new image
     }
 
     // If the original image has a mask, apply the mask to the new image


@@ -461,9 +502,9 @@ wxImage wxImage::ResampleNearest(int width, int height) const
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

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

     unsigned char *target_data = data;
     unsigned char *target_data = data;

-    unsigned char *source_alpha = 0 ;
+    const unsigned char *source_alpha = 0 ;

     unsigned char *target_alpha = 0 ;
 
     if ( !M_IMGDATA->m_hasMask )
     unsigned char *target_alpha = 0 ;
 
     if ( !M_IMGDATA->m_hasMask )


@@ -486,14 +527,14 @@ wxImage wxImage::ResampleNearest(int width, int height) const
     long y = 0;
     for ( long j = 0; j < height; j++ )
     {
     long y = 0;
     for ( long j = 0; j < height; j++ )
     {

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

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

-            unsigned char* src_pixel = &src_line[(x>>16)*3];
-            unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;
+            const unsigned char* src_pixel = &src_line[(x>>16)*3];
+            const unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;

             dest_pixel[0] = src_pixel[0];
             dest_pixel[1] = src_pixel[1];
             dest_pixel[2] = src_pixel[2];
             dest_pixel[0] = src_pixel[0];
             dest_pixel[1] = src_pixel[1];
             dest_pixel[2] = src_pixel[2];


@@ -509,6 +550,42 @@ wxImage wxImage::ResampleNearest(int width, int height) const
     return image;
 }
 
     return image;
 }
 

+namespace
+{
+
+struct BoxPrecalc
+{
+    int boxStart;
+    int boxEnd;
+};
+
+inline int BoxBetween(int value, int low, int high)
+{
+    return wxMax(wxMin(value, high), low);
+}
+
+void ResampleBoxPrecalc(wxVector<BoxPrecalc>& boxes, int oldDim)
+{
+    const int newDim = boxes.size();
+    const double scale_factor_1 = double(oldDim) / newDim;
+    const int scale_factor_2 = (int)(scale_factor_1 / 2);
+
+    for ( int dst = 0; dst < newDim; ++dst )
+    {
+        // Source pixel in the Y direction
+        const int src_p = int(dst * scale_factor_1);
+
+        BoxPrecalc& precalc = boxes[dst];
+        precalc.boxStart = BoxBetween(int(src_p - scale_factor_1/2.0 + 1),
+                                      0, oldDim - 1);
+        precalc.boxEnd = BoxBetween(wxMax(precalc.boxStart + 1,
+                                          int(src_p + scale_factor_2)),
+                                    0, oldDim - 1);
+    }
+}
+
+} // anonymous namespace
+

 wxImage wxImage::ResampleBox(int width, int height) const
 {
     // This function implements a simple pre-blur/box averaging method for
 wxImage wxImage::ResampleBox(int width, int height) const
 {
     // This function implements a simple pre-blur/box averaging method for


@@ -518,14 +595,15 @@ wxImage wxImage::ResampleBox(int width, int height) const
 
     wxImage ret_image(width, height, false);
 
 
     wxImage ret_image(width, height, false);
 

-    const double scale_factor_x = double(M_IMGDATA->m_width) / width;
-    const double scale_factor_y = double(M_IMGDATA->m_height) / height;
+    wxVector<BoxPrecalc> vPrecalcs(height);
+    wxVector<BoxPrecalc> hPrecalcs(width);
+
+    ResampleBoxPrecalc(vPrecalcs, M_IMGDATA->m_height);
+    ResampleBoxPrecalc(hPrecalcs, M_IMGDATA->m_width);

 
 

-    const int scale_factor_x_2 = (int)(scale_factor_x / 2);
-    const int scale_factor_y_2 = (int)(scale_factor_y / 2);

 
 

-    unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;

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


@@ -541,33 +619,21 @@ wxImage wxImage::ResampleBox(int width, int height) const
     for ( int y = 0; y < height; y++ )         // Destination image - Y direction
     {
         // Source pixel in the Y direction
     for ( int y = 0; y < height; y++ )         // Destination image - Y direction
     {
         // Source pixel in the Y direction

-        int src_y = (int)(y * scale_factor_y);
+        const BoxPrecalc& vPrecalc = vPrecalcs[y];

 
         for ( int x = 0; x < width; x++ )      // Destination image - X direction
         {
             // Source pixel in the X direction
 
         for ( int x = 0; x < width; x++ )      // Destination image - X direction
         {
             // Source pixel in the X direction

-            int src_x = (int)(x * scale_factor_x);
+            const BoxPrecalc& hPrecalc = hPrecalcs[x];

 
             // Box of pixels to average
             averaged_pixels = 0;
             sum_r = sum_g = sum_b = sum_a = 0.0;
 
 
             // Box of pixels to average
             averaged_pixels = 0;
             sum_r = sum_g = sum_b = sum_a = 0.0;
 

-            for ( int j = int(src_y - scale_factor_y/2.0 + 1);
-                  j <= int(src_y + scale_factor_y_2);
-                  j++ )
+            for ( int j = vPrecalc.boxStart; j <= vPrecalc.boxEnd; ++j )

             {
             {

-                // We don't care to average pixels that don't exist (edges)
-                if ( j < 0 || j > M_IMGDATA->m_height - 1 )
-                    continue;
-
-                for ( int i = int(src_x - scale_factor_x/2.0 + 1);
-                      i <= src_x + scale_factor_x_2;
-                      i++ )
+                for ( int i = hPrecalc.boxStart; i <= hPrecalc.boxEnd; ++i )

                 {
                 {

-                    // Don't average edge pixels
-                    if ( i < 0 || i > M_IMGDATA->m_width - 1 )
-                        continue;
-

                     // Calculate the actual index in our source pixels
                     src_pixel_index = j * M_IMGDATA->m_width + i;
 
                     // Calculate the actual index in our source pixels
                     src_pixel_index = j * M_IMGDATA->m_width + i;
 


@@ -594,12 +660,55 @@ wxImage wxImage::ResampleBox(int width, int height) const
     return ret_image;
 }
 
     return ret_image;
 }
 

+namespace
+{
+
+struct BilinearPrecalc
+{
+    int offset1;
+    int offset2;
+    double dd;
+    double dd1;
+};
+
+void ResampleBilinearPrecalc(wxVector<BilinearPrecalc>& precalcs, int oldDim)
+{
+    const int newDim = precalcs.size();
+    const double scale_factor = double(oldDim) / newDim;
+    const int srcpixmax = oldDim - 1;
+
+    for ( int dsty = 0; dsty < newDim; dsty++ )
+    {
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        double srcpix = double(dsty) * scale_factor;
+        double srcpix1 = int(srcpix);
+        double srcpix2 = srcpix1 == srcpixmax ? srcpix1 : srcpix1 + 1.0;
+
+        BilinearPrecalc& precalc = precalcs[dsty];
+
+        precalc.dd = srcpix - (int)srcpix;
+        precalc.dd1 = 1.0 - precalc.dd;
+        precalc.offset1 = srcpix1 < 0.0
+                            ? 0
+                            : srcpix1 > srcpixmax
+                                ? srcpixmax
+                                : (int)srcpix1;
+        precalc.offset2 = srcpix2 < 0.0
+                            ? 0
+                            : srcpix2 > srcpixmax
+                                ? srcpixmax
+                                : (int)srcpix2;
+    }
+}
+
+} // anonymous namespace
+

 wxImage wxImage::ResampleBilinear(int width, int height) const
 {
     // This function implements a Bilinear algorithm for resampling.
     wxImage ret_image(width, height, false);
 wxImage wxImage::ResampleBilinear(int width, int height) const
 {
     // This function implements a Bilinear algorithm for resampling.
     wxImage ret_image(width, height, false);

-    unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;

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


@@ -608,69 +717,65 @@ wxImage wxImage::ResampleBilinear(int width, int height) const
         ret_image.SetAlpha();
         dst_alpha = ret_image.GetAlpha();
     }
         ret_image.SetAlpha();
         dst_alpha = ret_image.GetAlpha();
     }

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

 
 

-    int srcpixymax = M_IMGDATA->m_height - 1;
-    int srcpixxmax = M_IMGDATA->m_width - 1;
+    wxVector<BilinearPrecalc> vPrecalcs(height);
+    wxVector<BilinearPrecalc> hPrecalcs(width);
+    ResampleBilinearPrecalc(vPrecalcs, M_IMGDATA->m_height);
+    ResampleBilinearPrecalc(hPrecalcs, M_IMGDATA->m_width);

 
 

-    double srcpixy, srcpixy1, srcpixy2, dy, dy1;
-    double srcpixx, srcpixx1, srcpixx2, dx, dx1;
-    double r1, g1, b1, a1;
-    double r2, g2, b2, a2;
+    // initialize alpha values to avoid g++ warnings about possibly
+    // uninitialized variables
+    double r1, g1, b1, a1 = 0;
+    double r2, g2, b2, a2 = 0;

 
     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

-        srcpixy = double(dsty) * HFactor;
-        srcpixy1 = int(srcpixy);
-        srcpixy2 = ( srcpixy1 == srcpixymax ) ? srcpixy1 : srcpixy1 + 1.0;
-        dy = srcpixy - (int)srcpixy;
-        dy1 = 1.0 - dy;
+        const BilinearPrecalc& vPrecalc = vPrecalcs[dsty];
+        const int y_offset1 = vPrecalc.offset1;
+        const int y_offset2 = vPrecalc.offset2;
+        const double dy = vPrecalc.dd;
+        const double dy1 = vPrecalc.dd1;

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

-            srcpixx = double(dstx) * WFactor;
-            srcpixx1 = int(srcpixx);
-            srcpixx2 = ( srcpixx1 == srcpixxmax ) ? srcpixx1 : srcpixx1 + 1.0;
-            dx = srcpixx - (int)srcpixx;
-            dx1 = 1.0 - dx;
+            const BilinearPrecalc& hPrecalc = hPrecalcs[dstx];

 
 

-            int x_offset1 = srcpixx1 < 0.0 ? 0 : srcpixx1 > srcpixxmax ? srcpixxmax : (int)srcpixx1;
-            int x_offset2 = srcpixx2 < 0.0 ? 0 : srcpixx2 > srcpixxmax ? srcpixxmax : (int)srcpixx2;
-            int y_offset1 = srcpixy1 < 0.0 ? 0 : srcpixy1 > srcpixymax ? srcpixymax : (int)srcpixy1;
-            int y_offset2 = srcpixy2 < 0.0 ? 0 : srcpixy2 > srcpixymax ? srcpixymax : (int)srcpixy2;
+            const int x_offset1 = hPrecalc.offset1;
+            const int x_offset2 = hPrecalc.offset2;
+            const double dx = hPrecalc.dd;
+            const double dx1 = hPrecalc.dd1;

 
             int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1;
             int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2;
             int src_pixel_index10 = y_offset2 * M_IMGDATA->m_width + x_offset1;
             int src_pixel_index11 = y_offset2 * M_IMGDATA->m_width + x_offset2;
 
 
             int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1;
             int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2;
             int src_pixel_index10 = y_offset2 * M_IMGDATA->m_width + x_offset1;
             int src_pixel_index11 = y_offset2 * M_IMGDATA->m_width + x_offset2;
 

-            //first line
+            // first line

             r1 = src_data[src_pixel_index00 * 3 + 0] * dx1 + src_data[src_pixel_index01 * 3 + 0] * dx;
             g1 = src_data[src_pixel_index00 * 3 + 1] * dx1 + src_data[src_pixel_index01 * 3 + 1] * dx;
             b1 = src_data[src_pixel_index00 * 3 + 2] * dx1 + src_data[src_pixel_index01 * 3 + 2] * dx;
             if ( src_alpha )
                 a1 = src_alpha[src_pixel_index00] * dx1 + src_alpha[src_pixel_index01] * dx;
 
             r1 = src_data[src_pixel_index00 * 3 + 0] * dx1 + src_data[src_pixel_index01 * 3 + 0] * dx;
             g1 = src_data[src_pixel_index00 * 3 + 1] * dx1 + src_data[src_pixel_index01 * 3 + 1] * dx;
             b1 = src_data[src_pixel_index00 * 3 + 2] * dx1 + src_data[src_pixel_index01 * 3 + 2] * dx;
             if ( src_alpha )
                 a1 = src_alpha[src_pixel_index00] * dx1 + src_alpha[src_pixel_index01] * dx;
 

-            //second line
+            // second line

             r2 = src_data[src_pixel_index10 * 3 + 0] * dx1 + src_data[src_pixel_index11 * 3 + 0] * dx;
             g2 = src_data[src_pixel_index10 * 3 + 1] * dx1 + src_data[src_pixel_index11 * 3 + 1] * dx;
             b2 = src_data[src_pixel_index10 * 3 + 2] * dx1 + src_data[src_pixel_index11 * 3 + 2] * dx;
             if ( src_alpha )
                 a2 = src_alpha[src_pixel_index10] * dx1 + src_alpha[src_pixel_index11] * dx;
 
             r2 = src_data[src_pixel_index10 * 3 + 0] * dx1 + src_data[src_pixel_index11 * 3 + 0] * dx;
             g2 = src_data[src_pixel_index10 * 3 + 1] * dx1 + src_data[src_pixel_index11 * 3 + 1] * dx;
             b2 = src_data[src_pixel_index10 * 3 + 2] * dx1 + src_data[src_pixel_index11 * 3 + 2] * dx;
             if ( src_alpha )
                 a2 = src_alpha[src_pixel_index10] * dx1 + src_alpha[src_pixel_index11] * dx;
 

-            //result lines
+            // result lines

 
 

-            dst_data[0] = r1 * dy1 + r2 * dy;
-            dst_data[1] = g1 * dy1 + g2 * dy;
-            dst_data[2] = b1 * dy1 + b2 * dy;
+            dst_data[0] = static_cast<unsigned char>(r1 * dy1 + r2 * dy);
+            dst_data[1] = static_cast<unsigned char>(g1 * dy1 + g2 * dy);
+            dst_data[2] = static_cast<unsigned char>(b1 * dy1 + b2 * dy);

             dst_data += 3;
 
             if ( src_alpha )
             dst_data += 3;
 
             if ( src_alpha )

-                *dst_alpha++ = a1 * dy1 + a2 * dy;
+                *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy);

         }
     }
 
         }
     }
 


@@ -692,6 +797,42 @@ static inline double spline_weight(double value)
             4 * spline_cube(value - 1)) / 6;
 }
 
             4 * spline_cube(value - 1)) / 6;
 }
 

+
+namespace
+{
+
+struct BicubicPrecalc
+{
+    double weight[4];
+    int offset[4];
+};
+
+void ResampleBicubicPrecalc(wxVector<BicubicPrecalc> &aWeight, int oldDim)
+{
+    const int newDim = aWeight.size();
+    for ( int dstd = 0; dstd < newDim; dstd++ )
+    {
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        const double srcpixd = static_cast<double>(dstd * oldDim) / newDim;
+        const double dd = srcpixd - static_cast<int>(srcpixd);
+
+        BicubicPrecalc &precalc = aWeight[dstd];
+
+        for ( int k = -1; k <= 2; k++ )
+        {
+            precalc.offset[k + 1] = srcpixd + k < 0.0
+                ? 0
+                : srcpixd + k >= oldDim
+                    ? oldDim - 1
+                    : static_cast<int>(srcpixd + k);
+
+            precalc.weight[k + 1] = spline_weight(k - dd);
+        }
+    }
+}
+
+} // anonymous namespace
+

 // This is the bicubic resampling algorithm
 wxImage wxImage::ResampleBicubic(int width, int height) const
 {
 // This is the bicubic resampling algorithm
 wxImage wxImage::ResampleBicubic(int width, int height) const
 {


@@ -725,8 +866,8 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
 
     ret_image.Create(width, height, false);
 
 
     ret_image.Create(width, height, false);
 

-    unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;

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


@@ -736,17 +877,22 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
         dst_alpha = ret_image.GetAlpha();
     }
 
         dst_alpha = ret_image.GetAlpha();
     }
 

+    // Precalculate weights
+    wxVector<BicubicPrecalc> vPrecalcs(height);
+    wxVector<BicubicPrecalc> hPrecalcs(width);
+
+    ResampleBicubicPrecalc(vPrecalcs, M_IMGDATA->m_height);
+    ResampleBicubicPrecalc(hPrecalcs, M_IMGDATA->m_width);
+

     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 = double(dsty * M_IMGDATA->m_height) / height;
-        double dy = srcpixy - (int)srcpixy;
+        const BicubicPrecalc& vPrecalc = vPrecalcs[dsty];

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

-            double srcpixx = double(dstx * M_IMGDATA->m_width) / width;
-            double dx = srcpixx - (int)srcpixx;
+            const BicubicPrecalc& hPrecalc = hPrecalcs[dstx];

 
             // Sums for each color channel
             double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;
 
             // Sums for each color channel
             double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;


@@ -755,21 +901,13 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
             for ( int k = -1; k <= 2; k++ )
             {
                 // Y offset
             for ( int k = -1; k <= 2; k++ )
             {
                 // Y offset

-                int y_offset = srcpixy + k < 0.0
-                                ? 0
-                                : srcpixy + k >= M_IMGDATA->m_height
-                                       ? M_IMGDATA->m_height - 1
-                                       : (int)(srcpixy + k);
+                const int y_offset = vPrecalc.offset[k + 1];

 
                 // Loop across the X axis
                 for ( int i = -1; i <= 2; i++ )
                 {
                     // X offset
 
                 // Loop across the X axis
                 for ( int i = -1; i <= 2; i++ )
                 {
                     // X offset

-                    int x_offset = srcpixx + i < 0.0
-                                    ? 0
-                                    : srcpixx + i >= M_IMGDATA->m_width
-                                            ? M_IMGDATA->m_width - 1
-                                            : (int)(srcpixx + i);
+                    const int x_offset = hPrecalc.offset[i + 1];

 
                     // Calculate the exact position where the source data
                     // should be pulled from based on the x_offset and y_offset
 
                     // Calculate the exact position where the source data
                     // should be pulled from based on the x_offset and y_offset


@@ -778,8 +916,8 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
                     // Calculate the weight for the specified pixel according
                     // to the bicubic b-spline kernel we're using for
                     // interpolation
                     // Calculate the weight for the specified pixel according
                     // to the bicubic b-spline kernel we're using for
                     // interpolation

-                    double
-                        pixel_weight = spline_weight(i - dx)*spline_weight(k - dy);
+                    const double
+                        pixel_weight = vPrecalc.weight[k + 1] * hPrecalc.weight[i + 1];

 
                     // Create a sum of all velues for each color channel
                     // adjusted for the pixel's calculated weight
 
                     // Create a sum of all velues for each color channel
                     // adjusted for the pixel's calculated weight


@@ -809,26 +947,14 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
 // Blur in the horizontal direction
 wxImage wxImage::BlurHorizontal(int blurRadius) const
 {
 // Blur in the horizontal direction
 wxImage wxImage::BlurHorizontal(int blurRadius) const
 {

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

 
 

-    unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* dst_data = ret_image.GetData();
-    unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_alpha = NULL;
+    wxCHECK( ret_image.IsOk(), ret_image );

 
 

-    // Check for a mask or alpha
-    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);
-    }
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* dst_data = ret_image.GetData();
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_alpha = ret_image.GetAlpha();

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


@@ -924,26 +1050,14 @@ wxImage wxImage::BlurHorizontal(int blurRadius) const
 // Blur in the vertical direction
 wxImage wxImage::BlurVertical(int blurRadius) const
 {
 // Blur in the vertical direction
 wxImage wxImage::BlurVertical(int blurRadius) const
 {

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

 
 

-    unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* dst_data = ret_image.GetData();
-    unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_alpha = NULL;
+    wxCHECK( ret_image.IsOk(), ret_image );

 
 

-    // Check for a mask or alpha
-    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);
-    }
+    const unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* dst_data = ret_image.GetData();
+    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_alpha = ret_image.GetAlpha();

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


@@ -1051,62 +1165,144 @@ wxImage wxImage::Blur(int blurRadius) const
 
 wxImage wxImage::Rotate90( bool clockwise ) const
 {
 
 wxImage wxImage::Rotate90( bool clockwise ) const
 {

-    wxImage image;
+    wxImage image(MakeEmptyClone(Clone_SwapOrientation));

 
 

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

 
 

-    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;

 
 

-    unsigned char *data = image.GetData();
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+    {
+        int hot_x = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_X );
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                        clockwise ? hot_x : width - 1 - hot_x);
+    }

 
 

-    wxCHECK_MSG( data, image, wxT("unable to create image") );
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+    {
+        int hot_y = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_Y );
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                        clockwise ? height - 1 - hot_y : hot_y);
+    }

 
 

-    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *data = image.GetData();

     unsigned char *target_data;
     unsigned char *target_data;

-    unsigned char *alpha_data = 0 ;
-    unsigned char *source_alpha = 0 ;
-    unsigned char *target_alpha = 0 ;

 
 

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

     {
     {

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

     }
     }

-    else
+
+    const unsigned char *source_alpha = M_IMGDATA->m_alpha;
+
+    if ( source_alpha )

     {
     {

-        source_alpha = M_IMGDATA->m_alpha ;
-        if ( source_alpha )
+        unsigned char *alpha_data = image.GetAlpha();
+        unsigned char *target_alpha = 0 ;
+
+        for (long ii = 0; ii < width; )

         {
         {

-            image.SetAlpha() ;
-            alpha_data = image.GetAlpha() ;
+            long next_ii = wxMin(ii + 64, width);
+
+            for (long j = 0; j < height; j++)
+            {
+                source_alpha = M_IMGDATA->m_alpha + j*width + ii;
+
+                for (long i = ii; i < next_ii; i++)
+                {
+                    if ( clockwise )
+                    {
+                        target_alpha = alpha_data + (i+1)*height - j - 1;
+                    }
+                    else
+                    {
+                        target_alpha = alpha_data + height*(width - i - 1) + j;
+                    }
+
+                    *target_alpha = *source_alpha++;
+                }
+            }
+
+            ii = next_ii;

         }
     }
 
         }
     }
 

+    return image;
+}
+
+wxImage wxImage::Rotate180() const
+{
+    wxImage image(MakeEmptyClone());
+
+    wxCHECK( image.IsOk(), image );
+

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

+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+    {
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                        width - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X));
+    }
+
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+    {
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                        height - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y));
+    }
+
+    unsigned char *data = image.GetData();
+    unsigned char *alpha = image.GetAlpha();
+    const unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data + width * height * 3;
+

     for (long j = 0; j < height; j++)
     {
         for (long i = 0; i < width; i++)
         {
     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;
-                if(source_alpha)
-                    target_alpha = alpha_data + (((i+1)*height) - j - 1);
-            }
-            else
-            {
-                target_data = data + ((height*(width-1)) + j - (i*height))*3;
-                if(source_alpha)
-                    target_alpha = alpha_data + ((height*(width-1)) + j - (i*height));
-            }
+            target_data -= 3;

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

+        }
+    }

 
 

-            if(source_alpha)
+    if ( alpha )
+    {
+        const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+        unsigned char *dest_alpha = alpha + width * height;
+
+        for (long j = 0; j < height; ++j)
+        {
+            for (long i = 0; i < width; ++i)

             {
             {

-                memcpy( target_alpha, source_alpha, 1 );
-                source_alpha += 1;
+                *(--dest_alpha) = *(src_alpha++);

             }
         }
     }
             }
         }
     }


@@ -1116,30 +1312,16 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 
 wxImage wxImage::Mirror( bool horizontally ) const
 {
 
 wxImage wxImage::Mirror( bool horizontally ) const
 {

-    wxImage image;
+    wxImage image(MakeEmptyClone());

 
 

-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
-
-    unsigned char *data = image.GetData();
-    unsigned char *alpha = NULL;
-
-    wxCHECK_MSG( data, image, wxT("unable to create image") );
-
-    if (M_IMGDATA->m_alpha != NULL) {
-        image.SetAlpha();
-        alpha = image.GetAlpha();
-        wxCHECK_MSG( alpha, image, wxT("unable to create alpha channel") );
-    }
-
-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    wxCHECK( image.IsOk(), image );

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

-    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *data = image.GetData();
+    unsigned char *alpha = image.GetAlpha();
+    const unsigned char *source_data = M_IMGDATA->m_data;

     unsigned char *target_data;
 
     if (horizontally)
     unsigned char *target_data;
 
     if (horizontally)


@@ -1184,7 +1366,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
             source_data += 3*width;
         }
 
             source_data += 3*width;
         }
 

-        if (alpha != NULL)
+        if ( alpha )

         {
             // src_alpha starts at the first pixel and increases by 1 width after each step
             // (a step here is the copy of the alpha channel of an entire line)
         {
             // src_alpha starts at the first pixel and increases by 1 width after each step
             // (a step here is the copy of the alpha channel of an entire line)


@@ -1209,7 +1391,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
 {
     wxImage image;
 
 {
     wxImage image;
 

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

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


@@ -1227,7 +1409,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
 
     wxCHECK_MSG( subdata, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( subdata, image, wxT("unable to create image") );
 

-    if (src_alpha != NULL) {
+    if ( src_alpha ) {

         image.SetAlpha();
         subalpha = image.GetAlpha();
         wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));
         image.SetAlpha();
         subalpha = image.GetAlpha();
         wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));


@@ -1262,7 +1444,7 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
 {
     wxImage image;
 
 {
     wxImage image;
 

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

     wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") );
 
     int width = GetWidth(), height = GetHeight();
     wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") );
 
     int width = GetWidth(), height = GetHeight();


@@ -1279,21 +1461,30 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
 
     image.SetRGB(wxRect(), r, g, b);
 
 
     image.SetRGB(wxRect(), r, g, b);
 

-    wxRect subRect(pos.x, pos.y, width, height);
-    wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight());
-    if (pos.x < 0)
-        finalRect.width -= pos.x;
-    if (pos.y < 0)
-        finalRect.height -= pos.y;
+    // we have two coordinate systems:
+    // source:     starting at 0,0 of source image
+    // destination starting at 0,0 of destination image
+    // Documentation says:
+    // "The image is pasted into a new image [...] at the position pos relative
+    // to the upper left of the new image." this means the transition rule is:
+    // "dest coord" = "source coord" + pos;
+
+    // calculate the intersection using source coordinates:
+    wxRect srcRect(0, 0, width, height);
+    wxRect dstRect(-pos, size);

 
 

-    subRect.Intersect(finalRect);
+    srcRect.Intersect(dstRect);

 
 

-    if (!subRect.IsEmpty())
+    if (!srcRect.IsEmpty())

     {
     {

-        if ((subRect.GetWidth() == width) && (subRect.GetHeight() == height))
-            image.Paste(*this, pos.x, pos.y);
+        // insertion point is needed in destination coordinates.
+        // NB: it is not always "pos"!
+        wxPoint ptInsert = srcRect.GetTopLeft() + pos;
+
+        if ((srcRect.GetWidth() == width) && (srcRect.GetHeight() == height))
+            image.Paste(*this, ptInsert.x, ptInsert.y);

         else
         else

-            image.Paste(GetSubImage(subRect), pos.x, pos.y);
+            image.Paste(GetSubImage(srcRect), ptInsert.x, ptInsert.y);

     }
 
     return image;
     }
 
     return image;


@@ -1301,8 +1492,8 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
 
 void wxImage::Paste( const wxImage &image, int x, int y )
 {
 
 void wxImage::Paste( const wxImage &image, int x, int y )
 {

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

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -1330,17 +1521,20 @@ void wxImage::Paste( const wxImage &image, int x, int y )
     if (width < 1) return;
     if (height < 1) return;
 
     if (width < 1) return;
     if (height < 1) return;
 

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

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

-         (GetMaskBlue()==image.GetMaskBlue()))))
+         (GetMaskBlue()==image.GetMaskBlue()))) )

     {
     {

-        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+        const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());

         int source_step = image.GetWidth()*3;
 
         int source_step = image.GetWidth()*3;
 

-        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+        unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);

         int target_step = M_IMGDATA->m_width*3;
         for (int j = 0; j < height; j++)
         {
         int target_step = M_IMGDATA->m_width*3;
         for (int j = 0; j < height; j++)
         {


@@ -1356,7 +1550,7 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         if ( !HasAlpha() )
             InitAlpha();
 
         if ( !HasAlpha() )
             InitAlpha();
 

-        unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth();
+        const 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 source_step = image.GetWidth();
 
         unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width;


@@ -1376,10 +1570,10 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         unsigned char g = image.GetMaskGreen();
         unsigned char b = image.GetMaskBlue();
 
         unsigned char g = image.GetMaskGreen();
         unsigned char b = image.GetMaskBlue();
 

-        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+        const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());

         int source_step = image.GetWidth()*3;
 
         int source_step = image.GetWidth()*3;
 

-        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+        unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);

         int target_step = M_IMGDATA->m_width*3;
 
         for (int j = 0; j < height; j++)
         int target_step = M_IMGDATA->m_width*3;
 
         for (int j = 0; j < height; j++)


@@ -1402,7 +1596,7 @@ void wxImage::Paste( const wxImage &image, int x, int y )
 void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                        unsigned char r2, unsigned char g2, unsigned char b2 )
 {
 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") );
+    wxCHECK_RET( IsOk(), wxT("invalid image") );

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -1424,53 +1618,46 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
         }
 }
 
         }
 }
 

-wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const
+wxImage wxImage::ConvertToGreyscale(void) const

 {
 {

-    wxImage image;
-
-    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-
-    image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
-
-    unsigned char *dest = image.GetData();
-
-    wxCHECK_MSG( dest, image, wxT("unable to create image") );
-
-    unsigned char *src = M_IMGDATA->m_data;
-    bool hasMask = M_IMGDATA->m_hasMask;
-    unsigned char maskRed = M_IMGDATA->m_maskRed;
-    unsigned char maskGreen = M_IMGDATA->m_maskGreen;
-    unsigned char maskBlue = M_IMGDATA->m_maskBlue;
-
-    if ( hasMask )
-        image.SetMaskColour(maskRed, maskGreen, maskBlue);
+    return ConvertToGreyscale(0.299, 0.587, 0.114);
+}

 
 

-    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
-    for ( long i = 0; i < size; i++, src += 3, dest += 3 )
-    {
-        // don't modify the mask
-        if ( hasMask && src[0] == maskRed && src[1] == maskGreen && src[2] == maskBlue )
-        {
-            memcpy(dest, src, 3);
-        }
-        else
-        {
-            // calculate the luma
-            double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;
-            dest[0] = dest[1] = dest[2] = static_cast<unsigned char>(luma);
-        }
-    }
+wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const
+{
+    wxImage image;
+    wxCHECK_MSG(IsOk(), image, "invalid image");

 
 

-    // copy the alpha channel, if any
-    if (HasAlpha())
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;
+    size_t size = size_t(w) * h;
+    image.Create(w, h, false);
+    const unsigned char* alpha = M_IMGDATA->m_alpha;
+    if (alpha)

     {
     {

-        const size_t alphaSize = GetWidth() * GetHeight();
-        unsigned char *alpha = (unsigned char*)malloc(alphaSize);
-        memcpy(alpha, GetAlpha(), alphaSize);
-        image.InitAlpha();
-        image.SetAlpha(alpha);
+        image.SetAlpha();
+        memcpy(image.GetAlpha(), alpha, size);
+    }
+    const unsigned char mask_r = M_IMGDATA->m_maskRed;
+    const unsigned char mask_g = M_IMGDATA->m_maskGreen;
+    const unsigned char mask_b = M_IMGDATA->m_maskBlue;
+    const bool hasMask = M_IMGDATA->m_hasMask;
+    if (hasMask)
+        image.SetMaskColour(mask_r, mask_g, mask_b);
+
+    const unsigned char* src = M_IMGDATA->m_data;
+    unsigned char* dst = image.GetData();
+    while (size--)
+    {
+        unsigned char r = *src++;
+        unsigned char g = *src++;
+        unsigned char b = *src++;
+        if (!hasMask || r != mask_r || g != mask_g || b != mask_b)
+            wxColour::MakeGrey(&r, &g, &b, weight_r, weight_g, weight_b);
+        *dst++ = r;
+        *dst++ = g;
+        *dst++ = b;

     }
     }

-

     return image;
 }
 
     return image;
 }
 


@@ -1478,7 +1665,7 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 {
     wxImage image;
 
 {
     wxImage image;
 

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

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


@@ -1502,25 +1689,61 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 
     for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
     {
 
     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;
+        bool on = (srcd[0] == r) && (srcd[1] == g) && (srcd[2] == b);
+        wxColourBase::MakeMono(tard + 0, tard + 1, tard + 2, on);

     }
 
     return image;
 }
 
     }
 
     return image;
 }
 

+wxImage wxImage::ConvertToDisabled(unsigned char brightness) const
+{
+    wxImage image;
+    wxCHECK_MSG(IsOk(), image, "invalid image");
+
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;
+    size_t size = size_t(w) * h;
+    image.Create(w, h, false);
+    const unsigned char* alpha = M_IMGDATA->m_alpha;
+    if (alpha)
+    {
+        image.SetAlpha();
+        memcpy(image.GetAlpha(), alpha, size);
+    }
+    const unsigned char mask_r = M_IMGDATA->m_maskRed;
+    const unsigned char mask_g = M_IMGDATA->m_maskGreen;
+    const unsigned char mask_b = M_IMGDATA->m_maskBlue;
+    const bool hasMask = M_IMGDATA->m_hasMask;
+    if (hasMask)
+        image.SetMaskColour(mask_r, mask_g, mask_b);
+
+    const unsigned char* src = M_IMGDATA->m_data;
+    unsigned char* dst = image.GetData();
+    while (size--)
+    {
+        unsigned char r = *src++;
+        unsigned char g = *src++;
+        unsigned char b = *src++;
+        if (!hasMask || r != mask_r || g != mask_g || b != mask_b)
+            wxColour::MakeDisabled(&r, &g, &b, brightness);
+        *dst++ = r;
+        *dst++ = g;
+        *dst++ = b;
+    }
+    return image;
+}
+

 int wxImage::GetWidth() const
 {
 int wxImage::GetWidth() const
 {

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

 
     return M_IMGDATA->m_width;
 }
 
 int wxImage::GetHeight() const
 {
 
     return M_IMGDATA->m_width;
 }
 
 int wxImage::GetHeight() const
 {

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

 
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }


@@ -1544,7 +1767,7 @@ void wxImage::SetType(wxBitmapType type)
 
 long wxImage::XYToIndex(int x, int y) const
 {
 
 long wxImage::XYToIndex(int x, int y) const
 {

-    if ( Ok() &&
+    if ( IsOk() &&

             x >= 0 && y >= 0 &&
                 x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )
     {
             x >= 0 && y >= 0 &&
                 x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )
     {


@@ -1570,7 +1793,7 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c
 
 void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )
 {
 
 void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )
 {

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

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -1646,14 +1869,14 @@ bool wxImage::IsOk() const
 
 unsigned char *wxImage::GetData() const
 {
 
 unsigned char *wxImage::GetData() const
 {

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

 
     return M_IMGDATA->m_data;
 }
 
 void wxImage::SetData( unsigned char *data, bool static_data  )
 {
 
     return M_IMGDATA->m_data;
 }
 
 void wxImage::SetData( unsigned char *data, bool static_data  )
 {

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

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


@@ -1754,7 +1977,7 @@ wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b)
 
 void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
 {
 
 void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
 {

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

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -1772,7 +1995,7 @@ void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
 
 unsigned char *wxImage::GetAlpha() const
 {
 
 unsigned char *wxImage::GetAlpha() const
 {

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

 
     return M_IMGDATA->m_alpha;
 }
 
     return M_IMGDATA->m_alpha;
 }


@@ -1813,13 +2036,24 @@ void wxImage::InitAlpha()
     }
 }
 
     }
 }
 

+void wxImage::ClearAlpha()
+{
+    wxCHECK_RET( HasAlpha(), wxT("image already doesn't have an alpha channel") );
+
+    if ( !M_IMGDATA->m_staticAlpha )
+        free( M_IMGDATA->m_alpha );
+
+    M_IMGDATA->m_alpha = NULL;
+}
+
+

 // ----------------------------------------------------------------------------
 // mask support
 // ----------------------------------------------------------------------------
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {
 // ----------------------------------------------------------------------------
 // mask support
 // ----------------------------------------------------------------------------
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {

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

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -1831,7 +2065,7 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 
 bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
 {
 
 bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
 {

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

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


@@ -1849,28 +2083,28 @@ bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned
 
 unsigned char wxImage::GetMaskRed() const
 {
 
 unsigned char wxImage::GetMaskRed() const
 {

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

 
     return M_IMGDATA->m_maskRed;
 }
 
 unsigned char wxImage::GetMaskGreen() const
 {
 
     return M_IMGDATA->m_maskRed;
 }
 
 unsigned char wxImage::GetMaskGreen() const
 {

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

 
     return M_IMGDATA->m_maskGreen;
 }
 
 unsigned char wxImage::GetMaskBlue() const
 {
 
     return M_IMGDATA->m_maskGreen;
 }
 
 unsigned char wxImage::GetMaskBlue() const
 {

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

 
     return M_IMGDATA->m_maskBlue;
 }
 
 void wxImage::SetMask( bool mask )
 {
 
     return M_IMGDATA->m_maskBlue;
 }
 
 void wxImage::SetMask( bool mask )
 {

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

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -1879,7 +2113,7 @@ void wxImage::SetMask( bool mask )
 
 bool wxImage::HasMask() const
 {
 
 bool wxImage::HasMask() const
 {

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

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


@@ -1965,7 +2199,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
 bool wxImage::ConvertAlphaToMask(unsigned char threshold)
 {
     if ( !HasAlpha() )
 bool wxImage::ConvertAlphaToMask(unsigned char threshold)
 {
     if ( !HasAlpha() )

-        return true;
+        return false;

 
     unsigned char mr, mg, mb;
     if ( !FindFirstUnusedColour(&mr, &mg, &mb) )
 
     unsigned char mr, mg, mb;
     if ( !FindFirstUnusedColour(&mr, &mg, &mb) )


@@ -1974,17 +2208,16 @@ bool wxImage::ConvertAlphaToMask(unsigned char threshold)
         return false;
     }
 
         return false;
     }
 

-    ConvertAlphaToMask(mr, mg, mb, threshold);
-    return true;
+    return ConvertAlphaToMask(mr, mg, mb, threshold);

 }
 
 }
 

-void wxImage::ConvertAlphaToMask(unsigned char mr,
+bool wxImage::ConvertAlphaToMask(unsigned char mr,

                                  unsigned char mg,
                                  unsigned char mb,
                                  unsigned char threshold)
 {
     if ( !HasAlpha() )
                                  unsigned char mg,
                                  unsigned char mb,
                                  unsigned char threshold)
 {
     if ( !HasAlpha() )

-        return;
+        return false;

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -2015,6 +2248,8 @@ void wxImage::ConvertAlphaToMask(unsigned char mr,
 
     M_IMGDATA->m_alpha = NULL;
     M_IMGDATA->m_staticAlpha = false;
 
     M_IMGDATA->m_alpha = NULL;
     M_IMGDATA->m_staticAlpha = false;

+
+    return true;

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


@@ -2025,22 +2260,22 @@ void wxImage::ConvertAlphaToMask(unsigned char mr,
 
 bool wxImage::HasPalette() const
 {
 
 bool wxImage::HasPalette() const
 {

-    if (!Ok())
+    if (!IsOk())

         return false;
 
         return false;
 

-    return M_IMGDATA->m_palette.Ok();
+    return M_IMGDATA->m_palette.IsOk();

 }
 
 const wxPalette& wxImage::GetPalette() const
 {
 }
 
 const wxPalette& wxImage::GetPalette() const
 {

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

 
     return M_IMGDATA->m_palette;
 }
 
 void wxImage::SetPalette(const wxPalette& palette)
 {
 
     return M_IMGDATA->m_palette;
 }
 
 void wxImage::SetPalette(const wxPalette& palette)
 {

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

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -2104,26 +2339,118 @@ bool wxImage::HasOption(const wxString& name) const
 // image I/O
 // ----------------------------------------------------------------------------
 
 // image I/O
 // ----------------------------------------------------------------------------
 

-bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
-                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type),
-                        int WXUNUSED_UNLESS_STREAMS(index) )
+// Under Windows we can load wxImage not only from files but also from
+// resources.
+#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE
+    #define HAS_LOAD_FROM_RESOURCE
+#endif
+
+#ifdef HAS_LOAD_FROM_RESOURCE
+
+#include "wx/msw/dib.h"
+#include "wx/msw/private.h"
+
+static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type)

 {
 {

-#if HAS_FILE_STREAMS
-    if (wxFileExists(filename))
+    AutoHBITMAP
+        hBitmap,
+        hMask;
+
+    if ( type == wxBITMAP_TYPE_BMP_RESOURCE )

     {
     {

-        wxImageFileInputStream stream(filename);
-        wxBufferedInputStream bstream( stream );
-        return LoadFile(bstream, type, index);
+        hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) );
+
+        if ( !hBitmap )
+        {
+            wxLogError(_("Failed to load bitmap \"%s\" from resources."), name);
+        }
+    }
+    else if ( type == wxBITMAP_TYPE_ICO_RESOURCE )
+    {
+        const HICON hIcon = ::LoadIcon(wxGetInstance(), name.t_str());
+
+        if ( !hIcon )
+        {
+            wxLogError(_("Failed to load icon \"%s\" from resources."), name);
+        }
+        else
+        {
+            ICONINFO info;
+            if ( !::GetIconInfo(hIcon, &info) )
+            {
+                wxLogLastError(wxT("GetIconInfo"));
+                return wxImage();
+            }
+
+            hBitmap.Init(info.hbmColor);
+            hMask.Init(info.hbmMask);
+        }
+    }
+    else if ( type == wxBITMAP_TYPE_CUR_RESOURCE )
+    {
+        wxLogDebug(wxS("Loading cursors from resources is not implemented."));

     }
     else
     {
     }
     else
     {

-        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+        wxFAIL_MSG(wxS("Invalid bitmap resource type."));
+    }

 
 

-        return false;
+    if ( !hBitmap )
+        return wxImage();
+
+    wxImage image = wxDIB(hBitmap).ConvertToImage();
+    if ( hMask )
+    {
+        const wxImage mask = wxDIB(hMask).ConvertToImage();
+        image.SetMaskFromImage(mask, 255, 255, 255);

     }
     }

-#else // !HAS_FILE_STREAMS
-    return false;
+    else
+    {
+        // Light gray colour is a default mask
+        image.SetMaskColour(0xc0, 0xc0, 0xc0);
+    }
+
+    // We could have already loaded alpha from the resources, but if not,
+    // initialize it now using the mask.
+    if ( !image.HasAlpha() )
+        image.InitAlpha();
+
+    return image;
+}
+
+#endif // HAS_LOAD_FROM_RESOURCE
+
+bool wxImage::LoadFile( const wxString& filename,
+                        wxBitmapType type,
+                        int WXUNUSED_UNLESS_STREAMS(index) )
+{
+#ifdef HAS_LOAD_FROM_RESOURCE
+    if (   type == wxBITMAP_TYPE_BMP_RESOURCE
+        || type == wxBITMAP_TYPE_ICO_RESOURCE
+        || type == wxBITMAP_TYPE_CUR_RESOURCE)
+    {
+        const wxImage image = ::LoadImageFromResource(filename, type);
+        if ( image.IsOk() )
+        {
+            *this = image;
+            return true;
+        }
+    }
+#endif // HAS_LOAD_FROM_RESOURCE
+
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(filename);
+    if ( stream.IsOk() )
+    {
+        wxBufferedInputStream bstream( stream );
+        if ( LoadFile(bstream, type, index) )
+            return true;
+    }
+
+    wxLogError(_("Failed to load image from file \"%s\"."), filename);

 #endif // HAS_FILE_STREAMS
 #endif // HAS_FILE_STREAMS

+
+    return false;

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


@@ -2131,21 +2458,18 @@ bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
                         int WXUNUSED_UNLESS_STREAMS(index) )
 {
 #if HAS_FILE_STREAMS
                         int WXUNUSED_UNLESS_STREAMS(index) )
 {
 #if HAS_FILE_STREAMS

-    if (wxFileExists(filename))
+    wxImageFileInputStream stream(filename);
+    if ( stream.IsOk() )

     {
     {

-        wxImageFileInputStream stream(filename);

         wxBufferedInputStream bstream( stream );
         wxBufferedInputStream bstream( stream );

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

     }
     }

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

 
 

-        return false;
-    }
-#else // !HAS_FILE_STREAMS
-    return false;
+    wxLogError(_("Failed to load image from file \"%s\"."), filename);

 #endif // HAS_FILE_STREAMS
 #endif // HAS_FILE_STREAMS

+
+    return false;

 }
 
 
 }
 
 


@@ -2168,7 +2492,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
                         wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const
 {
 #if HAS_FILE_STREAMS
                         wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const
 {
 #if HAS_FILE_STREAMS

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

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


@@ -2188,7 +2512,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
                         const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const
 {
 #if HAS_FILE_STREAMS
                         const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const
 {
 #if HAS_FILE_STREAMS

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

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


@@ -2219,7 +2543,7 @@ int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
 {
 #if HAS_FILE_STREAMS
     wxImageFileInputStream stream(name);
 {
 #if HAS_FILE_STREAMS
     wxImageFileInputStream stream(name);

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

         return GetImageCount(stream, type);
 #endif
 
         return GetImageCount(stream, type);
 #endif
 


@@ -2272,7 +2596,7 @@ int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
 
     if ( !handler )
     {
 
     if ( !handler )
     {

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

         return false;
     }
 
         return false;
     }
 


@@ -2282,7 +2606,7 @@ int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
     }
     else
     {
     }
     else
     {

-        wxLogError(_("Image file is not of type %ld."), type);
+        wxLogError(_("Image file is not of type %d."), type);

         return 0;
     }
 }
         return 0;
     }
 }


@@ -2294,10 +2618,20 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
     const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
                    maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);
 
     const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
                    maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);
 

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

     if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
     if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )

-        return false;
+    {
+        if ( posOld != wxInvalidOffset )
+            stream.SeekI(posOld);

 
 

-    M_IMGDATA->m_type = handler.GetType();
+        return false;
+    }

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


@@ -2316,9 +2650,22 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
         }
 
         if ( width != widthOrig || height != heightOrig )
         }
 
         if ( width != widthOrig || height != heightOrig )

+        {
+            // get the original size if it was set by the image handler
+            // but also in order to restore it after Rescale
+            int widthOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_WIDTH),
+                heightOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_HEIGHT);
+

             Rescale(width, height, wxIMAGE_QUALITY_HIGH);
             Rescale(width, height, wxIMAGE_QUALITY_HIGH);

+
+            SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, widthOrigOption ? widthOrigOption : widthOrig);
+            SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, heightOrigOption ? heightOrigOption : heightOrig);
+        }

     }
 
     }
 

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

     return true;
 }
 
     return true;
 }
 


@@ -2330,6 +2677,17 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
 
     if ( type == wxBITMAP_TYPE_ANY )
     {
 
     if ( type == wxBITMAP_TYPE_ANY )
     {

+        if ( !stream.IsSeekable() )
+        {
+            // The error message about image data format being unknown below
+            // would be misleading in this case as we are not even going to try
+            // any handlers because CanRead() never does anything for not
+            // seekable stream, so try to be more precise here.
+            wxLogError(_("Can't automatically determine the image format "
+                         "for non-seekable input."));
+            return false;
+        }
+

         const wxList& list = GetHandlers();
         for ( wxList::compatibility_iterator node = list.GetFirst();
               node;
         const wxList& list = GetHandlers();
         for ( wxList::compatibility_iterator node = list.GetFirst();
               node;


@@ -2340,7 +2698,7 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
                  return true;
         }
 
                  return true;
         }
 

-        wxLogWarning( _("No handler found for image type.") );
+        wxLogWarning( _("Unknown image data format.") );

 
         return false;
     }
 
         return false;
     }


@@ -2349,13 +2707,13 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
     handler = FindHandler(type);
     if ( !handler )
     {
     handler = FindHandler(type);
     if ( !handler )
     {

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

         return false;
     }
 
     if ( stream.IsSeekable() && !handler->CanRead(stream) )
     {
         return false;
     }
 
     if ( stream.IsSeekable() && !handler->CanRead(stream) )
     {

-        wxLogError(_("Image file is not of type %ld."), type);
+        wxLogError(_("This is not a %s."), handler->GetName());

         return false;
     }
 
         return false;
     }
 


@@ -2378,7 +2736,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
 
     if ( stream.IsSeekable() && !handler->CanRead(stream) )
     {
 
     if ( stream.IsSeekable() && !handler->CanRead(stream) )
     {

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

         return false;
     }
 
         return false;
     }
 


@@ -2397,7 +2755,7 @@ bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
 
 bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
 {
 
 bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
 {

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

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


@@ -2411,12 +2769,13 @@ bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
 {

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

 
     wxImageHandler *handler = FindHandlerMime(mimetype);
     if ( !handler )
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
     if ( !handler )
     {
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );

+        return false;

     }
 
     return DoSave(*handler, stream);
     }
 
     return DoSave(*handler, stream);


@@ -2625,10 +2984,6 @@ wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
             case BLUE:
                 hue = 4.0 + (red - green) / deltaRGB;
                 break;
             case BLUE:
                 hue = 4.0 + (red - green) / deltaRGB;
                 break;

-
-            default:
-                wxFAIL_MSG(wxT("hue not specified"));
-                break;

         }
 
         hue /= 6.0;
         }
 
         hue /= 6.0;


@@ -2778,15 +3133,15 @@ int wxImageHandler::GetImageCount( wxInputStream& stream )
 
 bool wxImageHandler::CanRead( const wxString& name )
 {
 
 bool wxImageHandler::CanRead( const wxString& name )
 {

-    if (wxFileExists(name))
+    wxImageFileInputStream stream(name);
+    if ( !stream.IsOk() )

     {
     {

-        wxImageFileInputStream stream(name);
-        return CanRead(stream);
-    }
+        wxLogError(_("Failed to check format of image file \"%s\"."), name);

 
 

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

 
 

-    return false;
+    return CanRead(stream);

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