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

second merge of the 2.2 branch (RL)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/image.cpp
View File

@@ -317,7 +317,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
for (long i = 0; i < height; i++)
{
target_data = data + 3*width*(height-1-i);
memcpy( target_data, source_data, 3*width );
memcpy( target_data, source_data, (size_t)3*width );
source_data += 3*width;
}
}
@@ -739,9 +739,9 @@ bool wxImage::SaveFile( const wxString& filename, int type )
wxBufferedOutputStream bstream( stream );
return SaveFile(bstream, type);
}
else
#endif // wxUSE_STREAMS
return FALSE;
return FALSE;
}
bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
@@ -754,9 +754,9 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
wxBufferedOutputStream bstream( stream );
return SaveFile(bstream, mimetype);
}
else
#endif // wxUSE_STREAMS
return FALSE;
return FALSE;
}
bool wxImage::CanRead( const wxString &name )