AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle hot spots in wxImage::Rotate90().

Browse Source 
Set hot spot coordinates for the rotated image if the original one had them.

Also handle the case when the source image has both alpha and mask correctly.

Closes #3680.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-11-14 01:02:27 +00:00
parent f8314f3c20
commit 000c2be40d
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/image.cpp
View File

@ -1068,26 +1068,36 @@ wxImage wxImage::Rotate90( bool clockwise ) const
unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data;
unsigned char *alpha_data = 0 ;
unsigned char *source_alpha = 0 ;
unsigned char *source_alpha = M_IMGDATA->m_alpha;
unsigned char *target_alpha = 0 ;
if (M_IMGDATA->m_hasMask)
if ( source_alpha )
{
image.SetAlpha();
alpha_data = image.GetAlpha();
wxCHECK_MSG( alpha_data, image, wxS("unable to create alpha channel") );
}
if ( M_IMGDATA->m_hasMask )
image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
}
else
{
source_alpha = M_IMGDATA->m_alpha ;
if ( source_alpha )
{
image.SetAlpha() ;
alpha_data = image.GetAlpha() ;
}
}
long height = M_IMGDATA->m_height;
long width = M_IMGDATA->m_width;
if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
{
int hot_x = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_X );
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
clockwise ? hot_x : width - 1 - hot_x);
}
if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
{
int hot_y = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_Y );
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
clockwise ? height - 1 - hot_y : hot_y);
}
for (long j = 0; j < height; j++)
{
for (long i = 0; i < width; i++)