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

Fix wxIMAGE_QUALITY_HIGH definition.

Browse Source 
Embarrassingly, wxIMAGE_QUALITY_HIGH was never used as it had the same value
as wxIMAGE_QUALITY_BILINEAR due to the changes to these constants in r67203.

After fixing its value in the enum, also change the switch on this enum
elements to avoid g++ warnings about unhandled enum values.

See #12845, #15281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-06-29 12:51:47 +00:00
parent 9e8125a1a8
commit b712cc040f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/image.h
View File

@@ -71,7 +71,7 @@ enum wxImageResizeQuality
wxIMAGE_QUALITY_NORMAL = wxIMAGE_QUALITY_NEAREST, wxIMAGE_QUALITY_NORMAL = wxIMAGE_QUALITY_NEAREST,
// highest (but best) quality // highest (but best) quality
wxIMAGE_QUALITY_HIGH wxIMAGE_QUALITY_HIGH = 4
}; };
// alpha channel values: fully transparent, default threshold separating // alpha channel values: fully transparent, default threshold separating

13
src/common/image.cpp
View File

@@ -443,13 +443,6 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
if ( old_width == width && old_height == height ) if ( old_width == width && old_height == height )
return *this; return *this;
if (quality == wxIMAGE_QUALITY_HIGH)
{
quality = (width < old_width && height < old_height)
? wxIMAGE_QUALITY_BOX_AVERAGE
: wxIMAGE_QUALITY_BICUBIC;
}
// Resample the image using the method as specified. // Resample the image using the method as specified.
switch ( quality ) switch ( quality )
{ {
@@ -474,6 +467,12 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
case wxIMAGE_QUALITY_BOX_AVERAGE: case wxIMAGE_QUALITY_BOX_AVERAGE:
image = ResampleBox(width, height); image = ResampleBox(width, height);
break; break;
case wxIMAGE_QUALITY_HIGH:
image = width < old_width && height < old_height
? ResampleBox(width, height)
: ResampleBicubic(width, height);
break;
} }
// If the original image has a mask, apply the mask to the new image // If the original image has a mask, apply the mask to the new image