Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

previous change to wxImage was wrong, it didn't account for saving same image twice

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-16 11:37:50 +00:00
parent 528e22936a
commit 36aac19594
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/image.cpp
View File

@@ -274,6 +274,7 @@ wxImage wxImage::Scale( int width, int height ) const
} }
} }
#endif #endif
// In case this is a cursor, make sure the hotspot is scalled accordingly: // In case this is a cursor, make sure the hotspot is scalled accordingly:
if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
@@ -940,8 +941,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
bool wxImage::SaveFile( const wxString& filename, int type ) const bool wxImage::SaveFile( const wxString& filename, int type ) const
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS
if ( !HasOption(wxIMAGE_OPTION_FILENAME) ) ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
wxFileOutputStream stream(filename); wxFileOutputStream stream(filename);
@@ -958,8 +958,7 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const
bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS
if ( !HasOption(wxIMAGE_OPTION_FILENAME) ) ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
wxFileOutputStream stream(filename); wxFileOutputStream stream(filename);