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

No changes, just refactor common code in wxImage cloning functions.

Browse Source 
Extract code common to several wxImage methods creating new images based on an
existing one in a new MakeEmptyClone() method.

Closes #12682.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-11-16 22:37:59 +00:00
parent e4f54cce1e
commit 496dbbe76e
2 changed files with 90 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/image.h
View File

@@ -591,6 +591,24 @@ protected:
private: private:
friend class WXDLLIMPEXP_FWD_CORE wxImageHandler; friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;
// Possible values for MakeEmptyClone() flags.
enum
{
// Create an image with the same orientation as this one. This is the
// default and only exists for symmetry with SwapOrientation.
Clone_SameOrientation = 0,
// Create an image with the same height as this image width and the
// same width as this image height.
Clone_SwapOrientation = 1
};
// Returns a new blank image with the same dimensions (or with width and
// height swapped if Clone_SwapOrientation flag is given), alpha, and mask
// as this image itself. This is used by several functions creating
// modified versions of this image.
wxImage MakeEmptyClone(int flags = Clone_SameOrientation) const;
#if wxUSE_STREAMS #if wxUSE_STREAMS
// read the image from the specified stream updating image type if // read the image from the specified stream updating image type if
// successful // successful

186
src/common/image.cpp
View File

@@ -253,6 +253,43 @@ wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
return refData_new; return refData_new;
} }
// returns a new image with the same dimensions, alpha, and mask as *this
// if on_its_side is true, width and height are swapped
wxImage wxImage::MakeEmptyClone(int flags) const
{
wxImage image;
wxCHECK_MSG( Ok(), image, wxS("invalid image") );
long height = M_IMGDATA->m_height;
long width = M_IMGDATA->m_width;
if ( flags & Clone_SwapOrientation )
wxSwap( width, height );
if ( !image.Create( width, height, false ) )
{
wxFAIL_MSG( wxS("unable to create image") );
return image;
}
if ( M_IMGDATA->m_alpha )
{
image.SetAlpha();
wxCHECK2_MSG( image.GetAlpha(), return wxImage(),
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 );
}
return image;
}
wxImage wxImage::Copy() const wxImage wxImage::Copy() const
{ {
wxImage image; wxImage image;
@@ -813,26 +850,14 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
// Blur in the horizontal direction // Blur in the horizontal direction
wxImage wxImage::BlurHorizontal(int blurRadius) const wxImage wxImage::BlurHorizontal(int blurRadius) const
{ {
wxImage ret_image; wxImage ret_image(MakeEmptyClone());
ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
unsigned char* src_data = M_IMGDATA->m_data; wxCHECK( ret_image.Ok(), ret_image );
const unsigned char* src_data = M_IMGDATA->m_data;
unsigned char* dst_data = ret_image.GetData(); unsigned char* dst_data = ret_image.GetData();
unsigned char* src_alpha = M_IMGDATA->m_alpha; const unsigned char* src_alpha = M_IMGDATA->m_alpha;
unsigned char* dst_alpha = NULL; unsigned char* dst_alpha = ret_image.GetAlpha();
// Check for a mask or alpha
if ( src_alpha )
{
ret_image.SetAlpha();
dst_alpha = ret_image.GetAlpha();
}
else if ( M_IMGDATA->m_hasMask )
{
ret_image.SetMaskColour(M_IMGDATA->m_maskRed,
M_IMGDATA->m_maskGreen,
M_IMGDATA->m_maskBlue);
}
// number of pixels we average over // number of pixels we average over
const int blurArea = blurRadius*2 + 1; const int blurArea = blurRadius*2 + 1;
@@ -928,26 +953,14 @@ wxImage wxImage::BlurHorizontal(int blurRadius) const
// Blur in the vertical direction // Blur in the vertical direction
wxImage wxImage::BlurVertical(int blurRadius) const wxImage wxImage::BlurVertical(int blurRadius) const
{ {
wxImage ret_image; wxImage ret_image(MakeEmptyClone());
ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
unsigned char* src_data = M_IMGDATA->m_data; wxCHECK( ret_image.Ok(), ret_image );
const unsigned char* src_data = M_IMGDATA->m_data;
unsigned char* dst_data = ret_image.GetData(); unsigned char* dst_data = ret_image.GetData();
unsigned char* src_alpha = M_IMGDATA->m_alpha; const unsigned char* src_alpha = M_IMGDATA->m_alpha;
unsigned char* dst_alpha = NULL; unsigned char* dst_alpha = ret_image.GetAlpha();
// Check for a mask or alpha
if ( src_alpha )
{
ret_image.SetAlpha();
dst_alpha = ret_image.GetAlpha();
}
else if ( M_IMGDATA->m_hasMask )
{
ret_image.SetMaskColour(M_IMGDATA->m_maskRed,
M_IMGDATA->m_maskGreen,
M_IMGDATA->m_maskBlue);
}
// number of pixels we average over // number of pixels we average over
const int blurArea = blurRadius*2 + 1; const int blurArea = blurRadius*2 + 1;
@@ -1055,31 +1068,9 @@ wxImage wxImage::Blur(int blurRadius) const
wxImage wxImage::Rotate90( bool clockwise ) const wxImage wxImage::Rotate90( bool clockwise ) const
{ {
wxImage image; wxImage image(MakeEmptyClone(Clone_SwapOrientation));
wxCHECK_MSG( Ok(), image, wxT("invalid image") ); wxCHECK( image.Ok(), image );
image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );
unsigned char *data = image.GetData();
wxCHECK_MSG( data, image, wxT("unable to create image") );
unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data;
unsigned char *alpha_data = 0 ;
unsigned char *source_alpha = M_IMGDATA->m_alpha;
unsigned char *target_alpha = 0 ;
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 );
long height = M_IMGDATA->m_height; long height = M_IMGDATA->m_height;
long width = M_IMGDATA->m_width; long width = M_IMGDATA->m_width;
@@ -1098,6 +1089,13 @@ wxImage wxImage::Rotate90( bool clockwise ) const
clockwise ? height - 1 - hot_y : hot_y); clockwise ? height - 1 - hot_y : hot_y);
} }
unsigned char *data = image.GetData();
const unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data;
unsigned char *alpha_data = image.GetAlpha();
const unsigned char *source_alpha = M_IMGDATA->m_alpha;
unsigned char *target_alpha = 0 ;
for (long j = 0; j < height; j++) for (long j = 0; j < height; j++)
{ {
for (long i = 0; i < width; i++) for (long i = 0; i < width; i++)
@@ -1130,26 +1128,9 @@ wxImage wxImage::Rotate90( bool clockwise ) const
wxImage wxImage::Rotate180() const wxImage wxImage::Rotate180() const
{ {
wxImage image; wxImage image( MakeEmptyClone( false ));
wxCHECK_MSG( Ok(), image, wxS("invalid image") ); wxCHECK( image.Ok(), image );
image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
unsigned char *data = image.GetData();
unsigned char *alpha = NULL;
wxCHECK_MSG( data, image, wxS("unable to create image") );
if ( M_IMGDATA->m_alpha != NULL )
{
image.SetAlpha();
alpha = image.GetAlpha();
wxCHECK_MSG( alpha, 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 );
long height = M_IMGDATA->m_height; long height = M_IMGDATA->m_height;
long width = M_IMGDATA->m_width; long width = M_IMGDATA->m_width;
@@ -1166,6 +1147,8 @@ wxImage wxImage::Rotate180() const
height - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)); height - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y));
} }
unsigned char *data = image.GetData();
unsigned char *alpha = image.GetAlpha();
const unsigned char *source_data = M_IMGDATA->m_data; const unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data = data + width * height * 3; unsigned char *target_data = data + width * height * 3;
@@ -1198,30 +1181,16 @@ wxImage wxImage::Rotate180() const
wxImage wxImage::Mirror( bool horizontally ) const wxImage wxImage::Mirror( bool horizontally ) const
{ {
wxImage image; wxImage image( MakeEmptyClone( false ));
wxCHECK_MSG( Ok(), image, wxT("invalid image") ); wxCHECK( image.Ok(), image );
image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
unsigned char *data = image.GetData();
unsigned char *alpha = NULL;
wxCHECK_MSG( data, image, wxT("unable to create image") );
if (M_IMGDATA->m_alpha != NULL) {
image.SetAlpha();
alpha = image.GetAlpha();
wxCHECK_MSG( alpha, image, wxT("unable to create alpha channel") );
}
if (M_IMGDATA->m_hasMask)
image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
long height = M_IMGDATA->m_height; long height = M_IMGDATA->m_height;
long width = M_IMGDATA->m_width; long width = M_IMGDATA->m_width;
unsigned char *source_data = M_IMGDATA->m_data; unsigned char *data = image.GetData();
unsigned char *alpha = image.GetAlpha();
const unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data; unsigned char *target_data;
if (horizontally) if (horizontally)
@@ -1522,25 +1491,18 @@ wxImage wxImage::ConvertToGreyscale(void) const
wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const
{ {
wxImage image; wxImage image( MakeEmptyClone( false ));
wxCHECK_MSG( Ok(), image, wxT("invalid image") ); wxCHECK( image.Ok(), image );
image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
const unsigned char *src = M_IMGDATA->m_data;
unsigned char *dest = image.GetData(); unsigned char *dest = image.GetData();
wxCHECK_MSG( dest, image, wxT("unable to create image") );
unsigned char *src = M_IMGDATA->m_data;
bool hasMask = M_IMGDATA->m_hasMask; bool hasMask = M_IMGDATA->m_hasMask;
unsigned char maskRed = M_IMGDATA->m_maskRed; unsigned char maskRed = M_IMGDATA->m_maskRed;
unsigned char maskGreen = M_IMGDATA->m_maskGreen; unsigned char maskGreen = M_IMGDATA->m_maskGreen;
unsigned char maskBlue = M_IMGDATA->m_maskBlue; unsigned char maskBlue = M_IMGDATA->m_maskBlue;
if ( hasMask )
image.SetMaskColour(maskRed, maskGreen, maskBlue);
const long size = M_IMGDATA->m_width * M_IMGDATA->m_height; const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
for ( long i = 0; i < size; i++, src += 3, dest += 3 ) for ( long i = 0; i < size; i++, src += 3, dest += 3 )
{ {
@@ -1556,13 +1518,9 @@ wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double wei
} }
// copy the alpha channel, if any // copy the alpha channel, if any
if (HasAlpha()) if ( image.HasAlpha() )
{ {
const size_t alphaSize = GetWidth() * GetHeight(); memcpy( image.GetAlpha(), GetAlpha(), GetWidth() * GetHeight() );
unsigned char *alpha = (unsigned char*)malloc(alphaSize);
memcpy(alpha, GetAlpha(), alphaSize);
image.InitAlpha();
image.SetAlpha(alpha);
} }
return image; return image;