Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index de87a34257f985fd3111ed2ca12d8c6f5bf2f6f1..62597542fd95dfaf2c759b93a8664c498486ccfd 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -140,8 +140,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
 }


@@ -258,7 +259,7 @@ wxImage wxImage::MakeEmptyClone(int flags) const
 {
     wxImage image;
 
 {
     wxImage image;
 

-    wxCHECK_MSG( Ok(), image, wxS("invalid image") );
+    wxCHECK_MSG( IsOk(), image, wxS("invalid 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;


@@ -293,7 +294,7 @@ wxImage wxImage::Copy() const
 {
     wxImage image;
 
 {
     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);
 


@@ -307,7 +308,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,


@@ -426,7 +427,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,


@@ -856,7 +857,7 @@ wxImage wxImage::BlurHorizontal(int blurRadius) const
 {
     wxImage ret_image(MakeEmptyClone());
 
 {
     wxImage ret_image(MakeEmptyClone());
 

-    wxCHECK( ret_image.Ok(), ret_image );
+    wxCHECK( ret_image.IsOk(), ret_image );

 
     const unsigned char* src_data = M_IMGDATA->m_data;
     unsigned char* dst_data = ret_image.GetData();
 
     const unsigned char* src_data = M_IMGDATA->m_data;
     unsigned char* dst_data = ret_image.GetData();


@@ -959,7 +960,7 @@ wxImage wxImage::BlurVertical(int blurRadius) const
 {
     wxImage ret_image(MakeEmptyClone());
 
 {
     wxImage ret_image(MakeEmptyClone());
 

-    wxCHECK( ret_image.Ok(), ret_image );
+    wxCHECK( ret_image.IsOk(), ret_image );

 
     const unsigned char* src_data = M_IMGDATA->m_data;
     unsigned char* dst_data = ret_image.GetData();
 
     const unsigned char* src_data = M_IMGDATA->m_data;
     unsigned char* dst_data = ret_image.GetData();


@@ -1074,7 +1075,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 {
     wxImage image(MakeEmptyClone(Clone_SwapOrientation));
 
 {
     wxImage image(MakeEmptyClone(Clone_SwapOrientation));
 

-    wxCHECK( image.Ok(), image );
+    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;


@@ -1168,7 +1169,7 @@ wxImage wxImage::Rotate180() const
 {
     wxImage image(MakeEmptyClone());
 
 {
     wxImage image(MakeEmptyClone());
 

-    wxCHECK( image.Ok(), image );
+    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;


@@ -1221,7 +1222,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
 {
     wxImage image(MakeEmptyClone());
 
 {
     wxImage image(MakeEmptyClone());
 

-    wxCHECK( image.Ok(), image );
+    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;


@@ -1298,7 +1299,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()),


@@ -1351,7 +1352,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();


@@ -1399,8 +1400,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();
 


@@ -1503,7 +1504,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();
 


@@ -1534,7 +1535,7 @@ wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double wei
 {
     wxImage image(MakeEmptyClone());
 
 {
     wxImage image(MakeEmptyClone());
 

-    wxCHECK( image.Ok(), image );
+    wxCHECK( image.IsOk(), image );

 
     const unsigned char *src = M_IMGDATA->m_data;
     unsigned char *dest = image.GetData();
 
     const unsigned char *src = M_IMGDATA->m_data;
     unsigned char *dest = image.GetData();


@@ -1568,7 +1569,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 );
 


@@ -1631,14 +1632,14 @@ wxImage wxImage::ConvertToDisabled(unsigned char brightness) const
 
 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;
 }


@@ -1662,7 +1663,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 )
     {


@@ -1688,7 +1689,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();
 


@@ -1764,14 +1765,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();
 


@@ -1872,7 +1873,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();
 


@@ -1890,7 +1891,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;
 }


@@ -1948,7 +1949,7 @@ void wxImage::ClearAlpha()
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {
 
 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();
 


@@ -1960,7 +1961,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)
     {


@@ -1978,28 +1979,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();
 


@@ -2008,7 +2009,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;
 }


@@ -2155,22 +2156,22 @@ bool 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();
 


@@ -2292,7 +2293,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);
 


@@ -2312,7 +2313,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);
 


@@ -2343,7 +2344,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
 


@@ -2450,7 +2451,17 @@ 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
     }
 
     // Set this after Rescale, which currently does not preserve it


@@ -2545,7 +2556,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 )


@@ -2559,7 +2570,7 @@ 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 )
 
     wxImageHandler *handler = FindHandlerMime(mimetype);
     if ( !handler )