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

Added wxIMAGE_OPTION_ORIGINAL_{WIDTH,HEIGHT} wxImage options.

Browse Source 
These options allow to retrieve the original image size if the image was
scaled during load.

Closes #13662.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-14 13:35:48 +00:00
parent d6c37f5bc4
commit b6963858fb
6 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/image.cpp
View File

@@ -2450,7 +2450,17 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
}
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);
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