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

preserve type when loaded image is rescaled, #11543

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-12-16 17:10:52 +00:00
parent d6b17e1aa3
commit b50e6e416e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/image.cpp
View File

@@ -2341,8 +2341,6 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
if ( !handler.LoadFile(this, stream, true/*verbose*/, index) ) if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
return false; return false;
M_IMGDATA->m_type = handler.GetType();
// rescale the image to the specified size if needed // rescale the image to the specified size if needed
if ( maxWidth || maxHeight ) if ( maxWidth || maxHeight )
{ {
@@ -2363,6 +2361,9 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
Rescale(width, height, wxIMAGE_QUALITY_HIGH); Rescale(width, height, wxIMAGE_QUALITY_HIGH);
} }
// Set this after Rescale, which currently does not preserve it
M_IMGDATA->m_type = handler.GetType();
return true; return true;
} }