/////////////////////////////////////////////////////////////////////////////
-// Name: image.cpp
+// Name: src/common/image.cpp
// Purpose: wxImage
// Author: Robert Roebling
// RCS-ID: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "image.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#include "wx/defs.h"
-
#if wxUSE_IMAGE
#include "wx/image.h"
-#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
-#include "wx/filefn.h"
-#include "wx/wfstream.h"
-#include "wx/intl.h"
-#include "wx/module.h"
-#include "wx/hash.h"
-#include "wx/utils.h"
-#include "wx/math.h"
-#if wxUSE_XPM
-#include "wx/xpmdecod.h"
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/hash.h"
+ #include "wx/utils.h"
+ #include "wx/math.h"
+ #include "wx/module.h"
+ #include "wx/palette.h"
+ #include "wx/intl.h"
+ #include "wx/colour.h"
#endif
+#include "wx/wfstream.h"
+#include "wx/xpmdecod.h"
+
// For memcpy
#include <string.h>
-#ifdef __SALFORDC__
- #undef FAR
+// make the code compile with either wxFile*Stream or wxFFile*Stream:
+#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
+
+#if HAS_FILE_STREAMS
+ #if wxUSE_FFILE
+ typedef wxFFileInputStream wxImageFileInputStream;
+ typedef wxFFileOutputStream wxImageFileOutputStream;
+ #elif wxUSE_FILE
+ typedef wxFileInputStream wxImageFileInputStream;
+ typedef wxFileOutputStream wxImageFileOutputStream;
+ #endif // wxUSE_FILE/wxUSE_FFILE
+#endif // HAS_FILE_STREAMS
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxImage,WXDLLEXPORT)
#endif
+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+wxList wxImage::sm_handlers;
+wxImage wxNullImage;
//-----------------------------------------------------------------------------
-// wxImage
+// wxImageRefData
//-----------------------------------------------------------------------------
class wxImageRefData: public wxObjectRefData
int m_width;
int m_height;
+ wxBitmapType m_type;
unsigned char *m_data;
bool m_hasMask;
wxArrayString m_optionNames;
wxArrayString m_optionValues;
- DECLARE_NO_COPY_CLASS(wxImageRefData)
+ wxDECLARE_NO_COPY_CLASS(wxImageRefData);
};
wxImageRefData::wxImageRefData()
{
m_width = 0;
m_height = 0;
+ m_type = wxBITMAP_TYPE_INVALID;
m_data =
m_alpha = (unsigned char *) NULL;
free( m_alpha );
}
-wxList wxImage::sm_handlers;
-
-wxImage wxNullImage;
+//-----------------------------------------------------------------------------
+// wxImage
//-----------------------------------------------------------------------------
-#define M_IMGDATA ((wxImageRefData *)m_refData)
+#define M_IMGDATA static_cast<wxImageRefData*>(m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
-wxImage::wxImage( int width, int height, bool clear )
-{
- Create( width, height, clear );
-}
-
-wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
-{
- Create( width, height, data, static_data );
-}
-
-wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
-{
- Create( width, height, data, alpha, static_data );
-}
-
-wxImage::wxImage( const wxString& name, long type, int index )
-{
- LoadFile( name, type, index );
-}
-
-wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )
-{
- LoadFile( name, mimetype, index );
-}
-
-#if wxUSE_STREAMS
-wxImage::wxImage( wxInputStream& stream, long type, int index )
-{
- LoadFile( stream, type, index );
-}
-
-wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
-{
- LoadFile( stream, mimetype, index );
-}
-#endif // wxUSE_STREAMS
-
-wxImage::wxImage( const wxImage& image )
- : wxObject()
-{
- Ref(image);
-}
-
-wxImage::wxImage( const wxImage* image )
-{
- if (image) Ref(*image);
-}
-
-wxImage::wxImage( const char** xpmData )
-{
- Create(xpmData);
-}
-
-wxImage::wxImage( char** xpmData )
-{
- Create((const char**) xpmData);
-}
-
-bool wxImage::Create( const char** xpmData )
+bool wxImage::Create(const char* const* xpmData)
{
#if wxUSE_XPM
UnRef();
wxXPMDecoder decoder;
(*this) = decoder.ReadData(xpmData);
- return Ok();
+ return IsOk();
#else
+ wxUnusedVar(xpmData);
return false;
#endif
}
return false;
}
- if (clear)
- memset(M_IMGDATA->m_data, 0, width*height*3);
-
M_IMGDATA->m_width = width;
M_IMGDATA->m_height = height;
M_IMGDATA->m_ok = true;
+ if (clear)
+ {
+ Clear();
+ }
+
return true;
}
{
UnRef();
- wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+ wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") );
m_refData = new wxImageRefData();
{
UnRef();
- wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+ wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") );
m_refData = new wxImageRefData();
M_IMGDATA->m_height = height;
M_IMGDATA->m_ok = true;
M_IMGDATA->m_static = static_data;
+ M_IMGDATA->m_staticAlpha = static_data;
return true;
}
UnRef();
}
-wxImage wxImage::Copy() const
+void wxImage::Clear(unsigned char value)
+{
+ memset(M_IMGDATA->m_data, value, M_IMGDATA->m_width*M_IMGDATA->m_height*3);
+}
+
+wxObjectRefData* wxImage::CreateRefData() const
+{
+ return new wxImageRefData;
+}
+
+wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
+{
+ const wxImageRefData* refData = static_cast<const wxImageRefData*>(that);
+ wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );
+
+ wxImageRefData* refData_new = new wxImageRefData;
+ refData_new->m_width = refData->m_width;
+ refData_new->m_height = refData->m_height;
+ refData_new->m_maskRed = refData->m_maskRed;
+ refData_new->m_maskGreen = refData->m_maskGreen;
+ refData_new->m_maskBlue = refData->m_maskBlue;
+ refData_new->m_hasMask = refData->m_hasMask;
+ refData_new->m_ok = true;
+ unsigned size = unsigned(refData->m_width) * unsigned(refData->m_height);
+ if (refData->m_alpha != NULL)
+ {
+ refData_new->m_alpha = (unsigned char*)malloc(size);
+ memcpy(refData_new->m_alpha, refData->m_alpha, size);
+ }
+ size *= 3;
+ refData_new->m_data = (unsigned char*)malloc(size);
+ memcpy(refData_new->m_data, refData->m_data, size);
+#if wxUSE_PALETTE
+ refData_new->m_palette = refData->m_palette;
+#endif
+ refData_new->m_optionNames = refData->m_optionNames;
+ refData_new->m_optionValues = refData->m_optionValues;
+ 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, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), image, wxS("invalid image") );
- image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
+ long height = M_IMGDATA->m_height;
+ long width = M_IMGDATA->m_width;
- unsigned char *data = image.GetData();
+ if ( flags & Clone_SwapOrientation )
+ wxSwap( width, height );
- wxCHECK_MSG( data, image, wxT("unable to create image") );
+ if ( !image.Create( width, height, false ) )
+ {
+ wxFAIL_MSG( wxS("unable to create image") );
+ return image;
+ }
- image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
- image.SetMask( M_IMGDATA->m_hasMask );
+ 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 image;
- memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
+ wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
- // also copy the image options
- wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
- imgData->m_optionNames = M_IMGDATA->m_optionNames;
- imgData->m_optionValues = M_IMGDATA->m_optionValues;
+ image.m_refData = CloneRefData(m_refData);
return image;
}
wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
{
if( xFactor == 1 && yFactor == 1 )
- return Copy() ;
+ return *this;
wxImage image;
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
// can't scale to/from 0 size
wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,
bool hasMask = false ;
unsigned char maskRed = 0;
unsigned char maskGreen = 0;
- unsigned char maskBlue =0 ;
+ unsigned char maskBlue = 0 ;
- unsigned char *source_data = M_IMGDATA->m_data;
+ const unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data = data;
- unsigned char *source_alpha = 0 ;
+ const unsigned char *source_alpha = 0 ;
unsigned char *target_alpha = 0 ;
if (M_IMGDATA->m_hasMask)
{
long y_offset = (y * yFactor + y1) * old_width;
for ( int x1 = 0 ; x1 < xFactor ; ++x1 )
{
- unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;
+ const unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;
unsigned char red = pixel[0] ;
unsigned char green = pixel[1] ;
unsigned char blue = pixel[2] ;
}
}
- // In case this is a cursor, make sure the hotspot is scalled accordingly:
+ // In case this is a cursor, make sure the hotspot is scaled accordingly:
if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
(GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);
return image;
}
-wxImage wxImage::Scale( int width, int height ) const
+wxImage
+wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
{
wxImage image;
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
// can't scale to/from 0 size
wxCHECK_MSG( (width > 0) && (height > 0), image,
wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
wxT("invalid old image size") );
- if ( old_width % width == 0 && old_width >= width &&
- old_height % height == 0 && old_height >= height )
+ // If the image's new width and height are the same as the original, no
+ // need to waste time or CPU cycles
+ if ( old_width == width && old_height == height )
+ return *this;
+
+ if (quality == wxIMAGE_QUALITY_HIGH)
{
- return ShrinkBy( old_width / width , old_height / height ) ;
+ quality = (width < old_width && height < old_height)
+ ? wxIMAGE_QUALITY_BOX_AVERAGE
+ : wxIMAGE_QUALITY_BICUBIC;
+ }
+
+ // Resample the image using the method as specified.
+ switch ( quality )
+ {
+ case wxIMAGE_QUALITY_NEAREST:
+ if ( old_width % width == 0 && old_width >= width &&
+ old_height % height == 0 && old_height >= height )
+ {
+ return ShrinkBy( old_width / width , old_height / height );
+ }
+
+ image = ResampleNearest(width, height);
+ break;
+
+ case wxIMAGE_QUALITY_BILINEAR:
+ image = ResampleBilinear(width, height);
+ break;
+
+ case wxIMAGE_QUALITY_BICUBIC:
+ image = ResampleBicubic(width, height);
+ break;
+
+ case wxIMAGE_QUALITY_BOX_AVERAGE:
+ image = ResampleBox(width, height);
+ break;
}
+
+ // If the original image has a mask, apply the mask to the new image
+ if (M_IMGDATA->m_hasMask)
+ {
+ image.SetMaskColour( M_IMGDATA->m_maskRed,
+ M_IMGDATA->m_maskGreen,
+ M_IMGDATA->m_maskBlue );
+ }
+
+ // In case this is a cursor, make sure the hotspot is scaled accordingly:
+ if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+ image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+ (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
+ if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+ image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+ (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
+
+ return image;
+}
+
+wxImage wxImage::ResampleNearest(int width, int height) const
+{
+ wxImage image;
image.Create( width, height, false );
unsigned char *data = image.GetData();
wxCHECK_MSG( data, image, wxT("unable to create image") );
- unsigned char *source_data = M_IMGDATA->m_data;
+ const unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data = data;
- unsigned char *source_alpha = 0 ;
+ const unsigned char *source_alpha = 0 ;
unsigned char *target_alpha = 0 ;
- if (M_IMGDATA->m_hasMask)
- {
- image.SetMaskColour( M_IMGDATA->m_maskRed,
- M_IMGDATA->m_maskGreen,
- M_IMGDATA->m_maskBlue );
- }
- else
+ if ( !M_IMGDATA->m_hasMask )
{
source_alpha = M_IMGDATA->m_alpha ;
if ( source_alpha )
}
}
+ long old_height = M_IMGDATA->m_height,
+ old_width = M_IMGDATA->m_width;
long x_delta = (old_width<<16) / width;
long y_delta = (old_height<<16) / height;
long y = 0;
for ( long j = 0; j < height; j++ )
- {
- unsigned char* src_line = &source_data[(y>>16)*old_width*3];
- unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;
+ {
+ const unsigned char* src_line = &source_data[(y>>16)*old_width*3];
+ const unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;
long x = 0;
for ( long i = 0; i < width; i++ )
{
- unsigned char* src_pixel = &src_line[(x>>16)*3];
- unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;
- dest_pixel[0] = src_pixel[0];
- dest_pixel[1] = src_pixel[1];
- dest_pixel[2] = src_pixel[2];
- dest_pixel += 3;
- if ( source_alpha )
+ const unsigned char* src_pixel = &src_line[(x>>16)*3];
+ const unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;
+ dest_pixel[0] = src_pixel[0];
+ dest_pixel[1] = src_pixel[1];
+ dest_pixel[2] = src_pixel[2];
+ dest_pixel += 3;
+ if ( source_alpha )
*(target_alpha++) = *src_alpha_pixel ;
- x += x_delta;
+ x += x_delta;
}
y += y_delta;
}
- // In case this is a cursor, make sure the hotspot is scalled accordingly:
- if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
- image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
- (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
- if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
- image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
- (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
-
return image;
}
+wxImage wxImage::ResampleBox(int width, int height) const
+{
+ // This function implements a simple pre-blur/box averaging method for
+ // downsampling that gives reasonably smooth results To scale the image
+ // down we will need to gather a grid of pixels of the size of the scale
+ // factor in each direction and then do an averaging of the pixels.
+
+ wxImage ret_image(width, height, false);
+
+ const double scale_factor_x = double(M_IMGDATA->m_width) / width;
+ const double scale_factor_y = double(M_IMGDATA->m_height) / height;
+
+ const int scale_factor_x_2 = (int)(scale_factor_x / 2);
+ const int scale_factor_y_2 = (int)(scale_factor_y / 2);
+
+ const unsigned char* src_data = M_IMGDATA->m_data;
+ const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+ unsigned char* dst_data = ret_image.GetData();
+ unsigned char* dst_alpha = NULL;
+
+ if ( src_alpha )
+ {
+ ret_image.SetAlpha();
+ dst_alpha = ret_image.GetAlpha();
+ }
+
+ int averaged_pixels, src_pixel_index;
+ double sum_r, sum_g, sum_b, sum_a;
+
+ for ( int y = 0; y < height; y++ ) // Destination image - Y direction
+ {
+ // Source pixel in the Y direction
+ int src_y = (int)(y * scale_factor_y);
+
+ for ( int x = 0; x < width; x++ ) // Destination image - X direction
+ {
+ // Source pixel in the X direction
+ int src_x = (int)(x * scale_factor_x);
+
+ // Box of pixels to average
+ averaged_pixels = 0;
+ sum_r = sum_g = sum_b = sum_a = 0.0;
+
+ for ( int j = int(src_y - scale_factor_y/2.0 + 1), k = j;
+ j <= int(src_y + scale_factor_y_2) || j < k + 2;
+ j++ )
+ {
+ // We don't care to average pixels that don't exist (edges)
+ if ( j < 0 || j > M_IMGDATA->m_height - 1 )
+ continue;
+
+ for ( int i = int(src_x - scale_factor_x/2.0 + 1), e = i;
+ i <= src_x + scale_factor_x_2 || i < e + 2;
+ i++ )
+ {
+ // Don't average edge pixels
+ if ( i < 0 || i > M_IMGDATA->m_width - 1 )
+ continue;
+
+ // Calculate the actual index in our source pixels
+ src_pixel_index = j * M_IMGDATA->m_width + i;
+
+ sum_r += src_data[src_pixel_index * 3 + 0];
+ sum_g += src_data[src_pixel_index * 3 + 1];
+ sum_b += src_data[src_pixel_index * 3 + 2];
+ if ( src_alpha )
+ sum_a += src_alpha[src_pixel_index];
+
+ averaged_pixels++;
+ }
+ }
+
+ // Calculate the average from the sum and number of averaged pixels
+ dst_data[0] = (unsigned char)(sum_r / averaged_pixels);
+ dst_data[1] = (unsigned char)(sum_g / averaged_pixels);
+ dst_data[2] = (unsigned char)(sum_b / averaged_pixels);
+ dst_data += 3;
+ if ( src_alpha )
+ *dst_alpha++ = (unsigned char)(sum_a / averaged_pixels);
+ }
+ }
+
+ return ret_image;
+}
+
+wxImage wxImage::ResampleBilinear(int width, int height) const
+{
+ // This function implements a Bilinear algorithm for resampling.
+ wxImage ret_image(width, height, false);
+ const unsigned char* src_data = M_IMGDATA->m_data;
+ const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+ unsigned char* dst_data = ret_image.GetData();
+ unsigned char* dst_alpha = NULL;
+
+ if ( src_alpha )
+ {
+ ret_image.SetAlpha();
+ dst_alpha = ret_image.GetAlpha();
+ }
+ double HFactor = double(M_IMGDATA->m_height) / height;
+ double WFactor = double(M_IMGDATA->m_width) / width;
+
+ int srcpixymax = M_IMGDATA->m_height - 1;
+ int srcpixxmax = M_IMGDATA->m_width - 1;
+
+ double srcpixy, srcpixy1, srcpixy2, dy, dy1;
+ double srcpixx, srcpixx1, srcpixx2, dx, dx1;
+
+ // initialize alpha values to avoid g++ warnings about possibly
+ // uninitialized variables
+ double r1, g1, b1, a1 = 0;
+ double r2, g2, b2, a2 = 0;
+
+ for ( int dsty = 0; dsty < height; dsty++ )
+ {
+ // We need to calculate the source pixel to interpolate from - Y-axis
+ srcpixy = double(dsty) * HFactor;
+ srcpixy1 = int(srcpixy);
+ srcpixy2 = ( srcpixy1 == srcpixymax ) ? srcpixy1 : srcpixy1 + 1.0;
+ dy = srcpixy - (int)srcpixy;
+ dy1 = 1.0 - dy;
+
+
+ for ( int dstx = 0; dstx < width; dstx++ )
+ {
+ // X-axis of pixel to interpolate from
+ srcpixx = double(dstx) * WFactor;
+ srcpixx1 = int(srcpixx);
+ srcpixx2 = ( srcpixx1 == srcpixxmax ) ? srcpixx1 : srcpixx1 + 1.0;
+ dx = srcpixx - (int)srcpixx;
+ dx1 = 1.0 - dx;
+
+ int x_offset1 = srcpixx1 < 0.0 ? 0 : srcpixx1 > srcpixxmax ? srcpixxmax : (int)srcpixx1;
+ int x_offset2 = srcpixx2 < 0.0 ? 0 : srcpixx2 > srcpixxmax ? srcpixxmax : (int)srcpixx2;
+ int y_offset1 = srcpixy1 < 0.0 ? 0 : srcpixy1 > srcpixymax ? srcpixymax : (int)srcpixy1;
+ int y_offset2 = srcpixy2 < 0.0 ? 0 : srcpixy2 > srcpixymax ? srcpixymax : (int)srcpixy2;
+
+ int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1;
+ int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2;
+ int src_pixel_index10 = y_offset2 * M_IMGDATA->m_width + x_offset1;
+ int src_pixel_index11 = y_offset2 * M_IMGDATA->m_width + x_offset2;
+
+ // first line
+ r1 = src_data[src_pixel_index00 * 3 + 0] * dx1 + src_data[src_pixel_index01 * 3 + 0] * dx;
+ g1 = src_data[src_pixel_index00 * 3 + 1] * dx1 + src_data[src_pixel_index01 * 3 + 1] * dx;
+ b1 = src_data[src_pixel_index00 * 3 + 2] * dx1 + src_data[src_pixel_index01 * 3 + 2] * dx;
+ if ( src_alpha )
+ a1 = src_alpha[src_pixel_index00] * dx1 + src_alpha[src_pixel_index01] * dx;
+
+ // second line
+ r2 = src_data[src_pixel_index10 * 3 + 0] * dx1 + src_data[src_pixel_index11 * 3 + 0] * dx;
+ g2 = src_data[src_pixel_index10 * 3 + 1] * dx1 + src_data[src_pixel_index11 * 3 + 1] * dx;
+ b2 = src_data[src_pixel_index10 * 3 + 2] * dx1 + src_data[src_pixel_index11 * 3 + 2] * dx;
+ if ( src_alpha )
+ a2 = src_alpha[src_pixel_index10] * dx1 + src_alpha[src_pixel_index11] * dx;
+
+ // result lines
+
+ dst_data[0] = static_cast<unsigned char>(r1 * dy1 + r2 * dy);
+ dst_data[1] = static_cast<unsigned char>(g1 * dy1 + g2 * dy);
+ dst_data[2] = static_cast<unsigned char>(b1 * dy1 + b2 * dy);
+ dst_data += 3;
+
+ if ( src_alpha )
+ *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy);
+ }
+ }
+
+ return ret_image;
+}
+
+// The following two local functions are for the B-spline weighting of the
+// bicubic sampling algorithm
+static inline double spline_cube(double value)
+{
+ return value <= 0.0 ? 0.0 : value * value * value;
+}
+
+static inline double spline_weight(double value)
+{
+ return (spline_cube(value + 2) -
+ 4 * spline_cube(value + 1) +
+ 6 * spline_cube(value) -
+ 4 * spline_cube(value - 1)) / 6;
+}
+
+// This is the bicubic resampling algorithm
+wxImage wxImage::ResampleBicubic(int width, int height) const
+{
+ // This function implements a Bicubic B-Spline algorithm for resampling.
+ // This method is certainly a little slower than wxImage's default pixel
+ // replication method, however for most reasonably sized images not being
+ // upsampled too much on a fairly average CPU this difference is hardly
+ // noticeable and the results are far more pleasing to look at.
+ //
+ // This particular bicubic algorithm does pixel weighting according to a
+ // B-Spline that basically implements a Gaussian bell-like weighting
+ // kernel. Because of this method the results may appear a bit blurry when
+ // upsampling by large factors. This is basically because a slight
+ // gaussian blur is being performed to get the smooth look of the upsampled
+ // image.
+
+ // Edge pixels: 3-4 possible solutions
+ // - (Wrap/tile) Wrap the image, take the color value from the opposite
+ // side of the image.
+ // - (Mirror) Duplicate edge pixels, so that pixel at coordinate (2, n),
+ // where n is nonpositive, will have the value of (2, 1).
+ // - (Ignore) Simply ignore the edge pixels and apply the kernel only to
+ // pixels which do have all neighbours.
+ // - (Clamp) Choose the nearest pixel along the border. This takes the
+ // border pixels and extends them out to infinity.
+ //
+ // NOTE: below the y_offset and x_offset variables are being set for edge
+ // pixels using the "Mirror" method mentioned above
+
+ wxImage ret_image;
+
+ ret_image.Create(width, height, false);
+
+ const unsigned char* src_data = M_IMGDATA->m_data;
+ const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+ unsigned char* dst_data = ret_image.GetData();
+ unsigned char* dst_alpha = NULL;
+
+ if ( src_alpha )
+ {
+ ret_image.SetAlpha();
+ dst_alpha = ret_image.GetAlpha();
+ }
+
+ for ( int dsty = 0; dsty < height; dsty++ )
+ {
+ // We need to calculate the source pixel to interpolate from - Y-axis
+ double srcpixy = double(dsty * M_IMGDATA->m_height) / height;
+ double dy = srcpixy - (int)srcpixy;
+
+ for ( int dstx = 0; dstx < width; dstx++ )
+ {
+ // X-axis of pixel to interpolate from
+ double srcpixx = double(dstx * M_IMGDATA->m_width) / width;
+ double dx = srcpixx - (int)srcpixx;
+
+ // Sums for each color channel
+ double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;
+
+ // Here we actually determine the RGBA values for the destination pixel
+ for ( int k = -1; k <= 2; k++ )
+ {
+ // Y offset
+ int y_offset = srcpixy + k < 0.0
+ ? 0
+ : srcpixy + k >= M_IMGDATA->m_height
+ ? M_IMGDATA->m_height - 1
+ : (int)(srcpixy + k);
+
+ // Loop across the X axis
+ for ( int i = -1; i <= 2; i++ )
+ {
+ // X offset
+ int x_offset = srcpixx + i < 0.0
+ ? 0
+ : srcpixx + i >= M_IMGDATA->m_width
+ ? M_IMGDATA->m_width - 1
+ : (int)(srcpixx + i);
+
+ // Calculate the exact position where the source data
+ // should be pulled from based on the x_offset and y_offset
+ int src_pixel_index = y_offset*M_IMGDATA->m_width + x_offset;
+
+ // Calculate the weight for the specified pixel according
+ // to the bicubic b-spline kernel we're using for
+ // interpolation
+ double
+ pixel_weight = spline_weight(i - dx)*spline_weight(k - dy);
+
+ // Create a sum of all velues for each color channel
+ // adjusted for the pixel's calculated weight
+ sum_r += src_data[src_pixel_index * 3 + 0] * pixel_weight;
+ sum_g += src_data[src_pixel_index * 3 + 1] * pixel_weight;
+ sum_b += src_data[src_pixel_index * 3 + 2] * pixel_weight;
+ if ( src_alpha )
+ sum_a += src_alpha[src_pixel_index] * pixel_weight;
+ }
+ }
+
+ // Put the data into the destination image. The summed values are
+ // of double data type and are rounded here for accuracy
+ dst_data[0] = (unsigned char)(sum_r + 0.5);
+ dst_data[1] = (unsigned char)(sum_g + 0.5);
+ dst_data[2] = (unsigned char)(sum_b + 0.5);
+ dst_data += 3;
+
+ if ( src_alpha )
+ *dst_alpha++ = (unsigned char)sum_a;
+ }
+ }
+
+ return ret_image;
+}
+
+// Blur in the horizontal direction
+wxImage wxImage::BlurHorizontal(int blurRadius) const
+{
+ wxImage ret_image(MakeEmptyClone());
+
+ wxCHECK( ret_image.IsOk(), ret_image );
+
+ const unsigned char* src_data = M_IMGDATA->m_data;
+ unsigned char* dst_data = ret_image.GetData();
+ const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+ unsigned char* dst_alpha = ret_image.GetAlpha();
+
+ // number of pixels we average over
+ const int blurArea = blurRadius*2 + 1;
+
+ // Horizontal blurring algorithm - average all pixels in the specified blur
+ // radius in the X or horizontal direction
+ for ( int y = 0; y < M_IMGDATA->m_height; y++ )
+ {
+ // Variables used in the blurring algorithm
+ long sum_r = 0,
+ sum_g = 0,
+ sum_b = 0,
+ sum_a = 0;
+
+ long pixel_idx;
+ const unsigned char *src;
+ unsigned char *dst;
+
+ // Calculate the average of all pixels in the blur radius for the first
+ // pixel of the row
+ for ( int kernel_x = -blurRadius; kernel_x <= blurRadius; kernel_x++ )
+ {
+ // To deal with the pixels at the start of a row so it's not
+ // grabbing GOK values from memory at negative indices of the
+ // image's data or grabbing from the previous row
+ if ( kernel_x < 0 )
+ pixel_idx = y * M_IMGDATA->m_width;
+ else
+ pixel_idx = kernel_x + y * M_IMGDATA->m_width;
+
+ src = src_data + pixel_idx*3;
+ sum_r += src[0];
+ sum_g += src[1];
+ sum_b += src[2];
+ if ( src_alpha )
+ sum_a += src_alpha[pixel_idx];
+ }
+
+ dst = dst_data + y * M_IMGDATA->m_width*3;
+ dst[0] = (unsigned char)(sum_r / blurArea);
+ dst[1] = (unsigned char)(sum_g / blurArea);
+ dst[2] = (unsigned char)(sum_b / blurArea);
+ if ( src_alpha )
+ dst_alpha[y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+
+ // Now average the values of the rest of the pixels by just moving the
+ // blur radius box along the row
+ for ( int x = 1; x < M_IMGDATA->m_width; x++ )
+ {
+ // Take care of edge pixels on the left edge by essentially
+ // duplicating the edge pixel
+ if ( x - blurRadius - 1 < 0 )
+ pixel_idx = y * M_IMGDATA->m_width;
+ else
+ pixel_idx = (x - blurRadius - 1) + y * M_IMGDATA->m_width;
+
+ // Subtract the value of the pixel at the left side of the blur
+ // radius box
+ src = src_data + pixel_idx*3;
+ sum_r -= src[0];
+ sum_g -= src[1];
+ sum_b -= src[2];
+ if ( src_alpha )
+ sum_a -= src_alpha[pixel_idx];
+
+ // Take care of edge pixels on the right edge
+ if ( x + blurRadius > M_IMGDATA->m_width - 1 )
+ pixel_idx = M_IMGDATA->m_width - 1 + y * M_IMGDATA->m_width;
+ else
+ pixel_idx = x + blurRadius + y * M_IMGDATA->m_width;
+
+ // Add the value of the pixel being added to the end of our box
+ src = src_data + pixel_idx*3;
+ sum_r += src[0];
+ sum_g += src[1];
+ sum_b += src[2];
+ if ( src_alpha )
+ sum_a += src_alpha[pixel_idx];
+
+ // Save off the averaged data
+ dst = dst_data + x*3 + y*M_IMGDATA->m_width*3;
+ dst[0] = (unsigned char)(sum_r / blurArea);
+ dst[1] = (unsigned char)(sum_g / blurArea);
+ dst[2] = (unsigned char)(sum_b / blurArea);
+ if ( src_alpha )
+ dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+ }
+ }
+
+ return ret_image;
+}
+
+// Blur in the vertical direction
+wxImage wxImage::BlurVertical(int blurRadius) const
+{
+ wxImage ret_image(MakeEmptyClone());
+
+ wxCHECK( ret_image.IsOk(), ret_image );
+
+ const unsigned char* src_data = M_IMGDATA->m_data;
+ unsigned char* dst_data = ret_image.GetData();
+ const unsigned char* src_alpha = M_IMGDATA->m_alpha;
+ unsigned char* dst_alpha = ret_image.GetAlpha();
+
+ // number of pixels we average over
+ const int blurArea = blurRadius*2 + 1;
+
+ // Vertical blurring algorithm - same as horizontal but switched the
+ // opposite direction
+ for ( int x = 0; x < M_IMGDATA->m_width; x++ )
+ {
+ // Variables used in the blurring algorithm
+ long sum_r = 0,
+ sum_g = 0,
+ sum_b = 0,
+ sum_a = 0;
+
+ long pixel_idx;
+ const unsigned char *src;
+ unsigned char *dst;
+
+ // Calculate the average of all pixels in our blur radius box for the
+ // first pixel of the column
+ for ( int kernel_y = -blurRadius; kernel_y <= blurRadius; kernel_y++ )
+ {
+ // To deal with the pixels at the start of a column so it's not
+ // grabbing GOK values from memory at negative indices of the
+ // image's data or grabbing from the previous column
+ if ( kernel_y < 0 )
+ pixel_idx = x;
+ else
+ pixel_idx = x + kernel_y * M_IMGDATA->m_width;
+
+ src = src_data + pixel_idx*3;
+ sum_r += src[0];
+ sum_g += src[1];
+ sum_b += src[2];
+ if ( src_alpha )
+ sum_a += src_alpha[pixel_idx];
+ }
+
+ dst = dst_data + x*3;
+ dst[0] = (unsigned char)(sum_r / blurArea);
+ dst[1] = (unsigned char)(sum_g / blurArea);
+ dst[2] = (unsigned char)(sum_b / blurArea);
+ if ( src_alpha )
+ dst_alpha[x] = (unsigned char)(sum_a / blurArea);
+
+ // Now average the values of the rest of the pixels by just moving the
+ // box along the column from top to bottom
+ for ( int y = 1; y < M_IMGDATA->m_height; y++ )
+ {
+ // Take care of pixels that would be beyond the top edge by
+ // duplicating the top edge pixel for the column
+ if ( y - blurRadius - 1 < 0 )
+ pixel_idx = x;
+ else
+ pixel_idx = x + (y - blurRadius - 1) * M_IMGDATA->m_width;
+
+ // Subtract the value of the pixel at the top of our blur radius box
+ src = src_data + pixel_idx*3;
+ sum_r -= src[0];
+ sum_g -= src[1];
+ sum_b -= src[2];
+ if ( src_alpha )
+ sum_a -= src_alpha[pixel_idx];
+
+ // Take care of the pixels that would be beyond the bottom edge of
+ // the image similar to the top edge
+ if ( y + blurRadius > M_IMGDATA->m_height - 1 )
+ pixel_idx = x + (M_IMGDATA->m_height - 1) * M_IMGDATA->m_width;
+ else
+ pixel_idx = x + (blurRadius + y) * M_IMGDATA->m_width;
+
+ // Add the value of the pixel being added to the end of our box
+ src = src_data + pixel_idx*3;
+ sum_r += src[0];
+ sum_g += src[1];
+ sum_b += src[2];
+ if ( src_alpha )
+ sum_a += src_alpha[pixel_idx];
+
+ // Save off the averaged data
+ dst = dst_data + (x + y * M_IMGDATA->m_width) * 3;
+ dst[0] = (unsigned char)(sum_r / blurArea);
+ dst[1] = (unsigned char)(sum_g / blurArea);
+ dst[2] = (unsigned char)(sum_b / blurArea);
+ if ( src_alpha )
+ dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+ }
+ }
+
+ return ret_image;
+}
+
+// The new blur function
+wxImage wxImage::Blur(int blurRadius) const
+{
+ wxImage ret_image;
+ ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+ // Blur the image in each direction
+ ret_image = BlurHorizontal(blurRadius);
+ ret_image = ret_image.BlurVertical(blurRadius);
+
+ return ret_image;
+}
+
wxImage wxImage::Rotate90( bool clockwise ) const
{
- wxImage image;
+ wxImage image(MakeEmptyClone(Clone_SwapOrientation));
+
+ wxCHECK( image.IsOk(), image );
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+ 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);
+ }
- image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );
+ 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);
+ }
unsigned char *data = image.GetData();
+ unsigned char *target_data;
- wxCHECK_MSG( data, image, wxT("unable to create image") );
+ // we rotate the image in 21-pixel (63-byte) wide strips
+ // to make better use of cpu cache - memory transfers
+ // (note: while much better than single-pixel "strips",
+ // our vertical strips will still generally straddle 64-byte cachelines)
+ for (long ii = 0; ii < width; )
+ {
+ long next_ii = wxMin(ii + 21, width);
- if (M_IMGDATA->m_hasMask)
- image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+ for (long j = 0; j < height; j++)
+ {
+ const unsigned char *source_data
+ = M_IMGDATA->m_data + (j*width + ii)*3;
+
+ for (long i = ii; i < next_ii; i++)
+ {
+ if ( clockwise )
+ {
+ target_data = data + ((i + 1)*height - j - 1)*3;
+ }
+ else
+ {
+ target_data = data + (height*(width - 1 - i) + j)*3;
+ }
+ memcpy( target_data, source_data, 3 );
+ source_data += 3;
+ }
+ }
+
+ ii = next_ii;
+ }
+
+ const unsigned char *source_alpha = M_IMGDATA->m_alpha;
+
+ if ( source_alpha )
+ {
+ unsigned char *alpha_data = image.GetAlpha();
+ unsigned char *target_alpha = 0 ;
+
+ for (long ii = 0; ii < width; )
+ {
+ long next_ii = wxMin(ii + 64, width);
+
+ for (long j = 0; j < height; j++)
+ {
+ source_alpha = M_IMGDATA->m_alpha + j*width + ii;
+
+ for (long i = ii; i < next_ii; i++)
+ {
+ if ( clockwise )
+ {
+ target_alpha = alpha_data + (i+1)*height - j - 1;
+ }
+ else
+ {
+ target_alpha = alpha_data + height*(width - i - 1) + j;
+ }
+
+ *target_alpha = *source_alpha++;
+ }
+ }
+
+ ii = next_ii;
+ }
+ }
+
+ return image;
+}
+
+wxImage wxImage::Rotate180() const
+{
+ wxImage image(MakeEmptyClone());
+
+ wxCHECK( image.IsOk(), image );
long height = M_IMGDATA->m_height;
long width = M_IMGDATA->m_width;
- unsigned char *source_data = M_IMGDATA->m_data;
- unsigned char *target_data;
+ if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+ {
+ image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+ width - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X));
+ }
+
+ if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+ {
+ image.SetOption(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;
+ unsigned char *target_data = data + width * height * 3;
for (long j = 0; j < height; j++)
{
for (long i = 0; i < width; i++)
{
- if (clockwise)
- target_data = data + (((i+1)*height) - j - 1)*3;
- else
- target_data = data + ((height*(width-1)) + j - (i*height))*3;
+ target_data -= 3;
memcpy( target_data, source_data, 3 );
source_data += 3;
}
}
+ if ( alpha )
+ {
+ const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+ unsigned char *dest_alpha = alpha + width * height;
+
+ for (long j = 0; j < height; ++j)
+ {
+ for (long i = 0; i < width; ++i)
+ {
+ *(--dest_alpha) = *(src_alpha++);
+ }
+ }
+ }
+
return image;
}
wxImage wxImage::Mirror( bool horizontally ) const
{
- wxImage image;
-
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-
- image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
-
- unsigned char *data = image.GetData();
+ wxImage image(MakeEmptyClone());
- wxCHECK_MSG( data, image, wxT("unable to create image") );
-
- if (M_IMGDATA->m_hasMask)
- image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+ wxCHECK( image.IsOk(), image );
long height = M_IMGDATA->m_height;
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;
if (horizontally)
target_data -= 3;
}
}
+
+ if (alpha != NULL)
+ {
+ // src_alpha starts at the first pixel and increases by 1 after each step
+ // (a step here is the copy of the alpha value of one pixel)
+ const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+ // dest_alpha starts just beyond the first line, decreases before each step,
+ // and after each line is finished, increases by 2 widths (skipping the line
+ // just copied and the line that will be copied next)
+ unsigned char *dest_alpha = alpha + width;
+
+ for (long jj = 0; jj < height; ++jj)
+ {
+ for (long i = 0; i < width; ++i) {
+ *(--dest_alpha) = *(src_alpha++); // copy one pixel
+ }
+ dest_alpha += 2 * width; // advance beyond the end of the next line
+ }
+ }
}
else
{
memcpy( target_data, source_data, (size_t)3*width );
source_data += 3*width;
}
+
+ if ( alpha )
+ {
+ // src_alpha starts at the first pixel and increases by 1 width after each step
+ // (a step here is the copy of the alpha channel of an entire line)
+ const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+ // dest_alpha starts just beyond the last line (beyond the whole image)
+ // and decreases by 1 width before each step
+ unsigned char *dest_alpha = alpha + width * height;
+
+ for (long jj = 0; jj < height; ++jj)
+ {
+ dest_alpha -= width;
+ memcpy( dest_alpha, src_alpha, (size_t)width );
+ src_alpha += width;
+ }
+ }
}
return image;
{
wxImage image;
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
- wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+ wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) &&
+ (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
image, wxT("invalid subimage size") );
- int subwidth=rect.GetWidth();
- const int subheight=rect.GetHeight();
+ const int subwidth = rect.GetWidth();
+ const int subheight = rect.GetHeight();
image.Create( subwidth, subheight, false );
- unsigned char *subdata = image.GetData(), *data=GetData();
+ const unsigned char *src_data = GetData();
+ const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+ unsigned char *subdata = image.GetData();
+ unsigned char *subalpha = NULL;
wxCHECK_MSG( subdata, image, wxT("unable to create image") );
+ if ( src_alpha ) {
+ image.SetAlpha();
+ subalpha = image.GetAlpha();
+ wxCHECK_MSG( subalpha, 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 );
- const int subleft=3*rect.GetLeft();
- const int width=3*GetWidth();
- subwidth*=3;
+ const int width = GetWidth();
+ const int pixsoff = rect.GetLeft() + width * rect.GetTop();
- data+=rect.GetTop()*width+subleft;
+ src_data += 3 * pixsoff;
+ src_alpha += pixsoff; // won't be used if was NULL, so this is ok
for (long j = 0; j < subheight; ++j)
{
- memcpy( subdata, data, subwidth);
- subdata+=subwidth;
- data+=width;
+ memcpy( subdata, src_data, 3 * subwidth );
+ subdata += 3 * subwidth;
+ src_data += 3 * width;
+ if (subalpha != NULL) {
+ memcpy( subalpha, src_alpha, subwidth );
+ subalpha += subwidth;
+ src_alpha += width;
+ }
}
return image;
{
wxImage image;
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") );
int width = GetWidth(), height = GetHeight();
image.SetRGB(wxRect(), r, g, b);
- wxRect subRect(pos.x, pos.y, width, height);
- wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight());
+ // we have two coordinate systems:
+ // source: starting at 0,0 of source image
+ // destination starting at 0,0 of destination image
+ // Documentation says:
+ // "The image is pasted into a new image [...] at the position pos relative
+ // to the upper left of the new image." this means the transition rule is:
+ // "dest coord" = "source coord" + pos;
+
+ // calculate the intersection using source coordinates:
+ wxRect srcRect(0, 0, width, height);
+ wxRect dstRect(-pos, size);
- subRect.Intersect(finalRect);
+ srcRect.Intersect(dstRect);
- if (!subRect.IsEmpty())
+ if (!srcRect.IsEmpty())
{
- if ((subRect.GetWidth() == width) && (subRect.GetHeight() == height))
- image.Paste(*this, pos.x, pos.y);
+ // insertion point is needed in destination coordinates.
+ // NB: it is not always "pos"!
+ wxPoint ptInsert = srcRect.GetTopLeft() + pos;
+
+ if ((srcRect.GetWidth() == width) && (srcRect.GetHeight() == height))
+ image.Paste(*this, ptInsert.x, ptInsert.y);
else
- image.Paste(GetSubImage(subRect), pos.x, pos.y);
+ image.Paste(GetSubImage(srcRect), ptInsert.x, ptInsert.y);
}
return image;
void wxImage::Paste( const wxImage &image, int x, int y )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
- wxCHECK_RET( image.Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+ wxCHECK_RET( image.IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
int xx = 0;
int yy = 0;
if (width < 1) return;
if (height < 1) return;
- if ((!HasMask() && !image.HasMask()) ||
- (HasMask() && !image.HasMask()) ||
- ((HasMask() && image.HasMask() &&
+ // If we can, copy the data using memcpy() as this is the fastest way. But
+ // for this the image being pasted must have "compatible" mask with this
+ // one meaning that either it must not have one at all or it must use the
+ // same masked colour.
+ if ( !image.HasMask() ||
+ ((HasMask() &&
(GetMaskRed()==image.GetMaskRed()) &&
(GetMaskGreen()==image.GetMaskGreen()) &&
- (GetMaskBlue()==image.GetMaskBlue()))))
+ (GetMaskBlue()==image.GetMaskBlue()))) )
{
- width *= 3;
- unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+ const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());
int source_step = image.GetWidth()*3;
- unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+ unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);
int target_step = M_IMGDATA->m_width*3;
for (int j = 0; j < height; j++)
{
- memcpy( target_data, source_data, width );
+ memcpy( target_data, source_data, width*3 );
source_data += source_step;
target_data += target_step;
}
- return;
+ }
+
+ // Copy over the alpha channel from the original image
+ if ( image.HasAlpha() )
+ {
+ if ( !HasAlpha() )
+ InitAlpha();
+
+ const unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth();
+ int source_step = image.GetWidth();
+
+ unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width;
+ int target_step = M_IMGDATA->m_width;
+
+ for (int j = 0; j < height; j++,
+ source_data += source_step,
+ target_data += target_step)
+ {
+ memcpy( target_data, source_data, width );
+ }
}
if (!HasMask() && image.HasMask())
unsigned char g = image.GetMaskGreen();
unsigned char b = image.GetMaskBlue();
- width *= 3;
- unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+ const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());
int source_step = image.GetWidth()*3;
- unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+ unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);
int target_step = M_IMGDATA->m_width*3;
for (int j = 0; j < height; j++)
{
- for (int i = 0; i < width; i+=3)
+ for (int i = 0; i < width*3; i+=3)
{
- if ((source_data[i] != r) &&
- (source_data[i+1] != g) &&
+ if ((source_data[i] != r) ||
+ (source_data[i+1] != g) ||
(source_data[i+2] != b))
{
memcpy( target_data+i, source_data+i, 3 );
void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
unsigned char r2, unsigned char g2, unsigned char b2 )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
unsigned char *data = GetData();
}
}
+wxImage wxImage::ConvertToGreyscale(void) const
+{
+ return ConvertToGreyscale(0.299, 0.587, 0.114);
+}
+
+wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const
+{
+ wxImage image(MakeEmptyClone());
+
+ wxCHECK( image.IsOk(), image );
+
+ const unsigned char *src = M_IMGDATA->m_data;
+ unsigned char *dest = image.GetData();
+
+ const bool hasMask = M_IMGDATA->m_hasMask;
+ const unsigned char maskRed = M_IMGDATA->m_maskRed;
+ const unsigned char maskGreen = M_IMGDATA->m_maskGreen;
+ const unsigned char maskBlue = M_IMGDATA->m_maskBlue;
+
+ const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
+ for ( long i = 0; i < size; i++, src += 3, dest += 3 )
+ {
+ memcpy(dest, src, 3);
+ // only modify non-masked pixels
+ if ( !hasMask || src[0] != maskRed || src[1] != maskGreen || src[2] != maskBlue )
+ {
+ wxColour::MakeGrey(dest + 0, dest + 1, dest + 2, weight_r, weight_g, weight_b);
+ }
+ }
+
+ // copy the alpha channel, if any
+ if ( image.HasAlpha() )
+ {
+ memcpy( image.GetAlpha(), GetAlpha(), GetWidth() * GetHeight() );
+ }
+
+ return image;
+}
+
wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
{
wxImage image;
- wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
{
- if (srcd[0] == r && srcd[1] == g && srcd[2] == b)
- tard[0] = tard[1] = tard[2] = 255;
- else
- tard[0] = tard[1] = tard[2] = 0;
+ bool on = (srcd[0] == r) && (srcd[1] == g) && (srcd[2] == b);
+ wxColourBase::MakeMono(tard + 0, tard + 1, tard + 2, on);
}
- return image;
+ return image;
+}
+
+wxImage wxImage::ConvertToDisabled(unsigned char brightness) const
+{
+ wxImage image = *this;
+
+ unsigned char mr = image.GetMaskRed();
+ unsigned char mg = image.GetMaskGreen();
+ unsigned char mb = image.GetMaskBlue();
+
+ int width = image.GetWidth();
+ int height = image.GetHeight();
+ bool has_mask = image.HasMask();
+
+ for (int y = height-1; y >= 0; --y)
+ {
+ for (int x = width-1; x >= 0; --x)
+ {
+ unsigned char* data = image.GetData() + (y*(width*3))+(x*3);
+ unsigned char* r = data;
+ unsigned char* g = data+1;
+ unsigned char* b = data+2;
+
+ if (has_mask && (*r == mr) && (*g == mg) && (*b == mb))
+ continue;
+
+ wxColour::MakeDisabled(r, g, b, brightness);
+ }
+ }
+ return image;
+}
+
+int wxImage::GetWidth() const
+{
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_width;
+}
+
+int wxImage::GetHeight() const
+{
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_height;
+}
+
+wxBitmapType wxImage::GetType() const
+{
+ wxCHECK_MSG( IsOk(), wxBITMAP_TYPE_INVALID, wxT("invalid image") );
+
+ return M_IMGDATA->m_type;
+}
+
+void wxImage::SetType(wxBitmapType type)
+{
+ wxCHECK_RET( IsOk(), "must create the image before setting its type");
+
+ // type can be wxBITMAP_TYPE_INVALID to reset the image type to default
+ wxASSERT_MSG( type != wxBITMAP_TYPE_MAX, "invalid bitmap type" );
+
+ M_IMGDATA->m_type = type;
}
long wxImage::XYToIndex(int x, int y) const
{
- if ( Ok() &&
+ if ( IsOk() &&
x >= 0 && y >= 0 &&
x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )
{
long pos = XYToIndex(x, y);
wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );
+ AllocExclusive();
+
pos *= 3;
M_IMGDATA->m_data[ pos ] = r;
void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
wxRect rect(rect_);
wxRect imageRect(0, 0, GetWidth(), GetHeight());
}
else
{
- wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) &&
- imageRect.Inside(rect.GetBottomRight()),
+ wxCHECK_RET( imageRect.Contains(rect.GetTopLeft()) &&
+ imageRect.Contains(rect.GetBottomRight()),
wxT("invalid bounding rectangle") );
}
return M_IMGDATA->m_data[pos+2];
}
-bool wxImage::Ok() const
+bool wxImage::IsOk() const
{
// image of 0 width or height can't be considered ok - at least because it
// causes crashes in ConvertToBitmap() if we don't catch it in time
unsigned char *wxImage::GetData() const
{
- wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") );
return M_IMGDATA->m_data;
}
void wxImage::SetData( unsigned char *data, bool static_data )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
wxImageRefData *newRefData = new wxImageRefData();
long pos = XYToIndex(x, y);
wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );
+ AllocExclusive();
+
M_IMGDATA->m_alpha[pos] = alpha;
}
void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
if ( !alpha )
{
alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
}
- free(M_IMGDATA->m_alpha);
+ if( !M_IMGDATA->m_staticAlpha )
+ free(M_IMGDATA->m_alpha);
+
M_IMGDATA->m_alpha = alpha;
M_IMGDATA->m_staticAlpha = static_data;
}
unsigned char *wxImage::GetAlpha() const
{
- wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") );
return M_IMGDATA->m_alpha;
}
unsigned char *alpha = M_IMGDATA->m_alpha;
const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height;
- static const unsigned char ALPHA_TRANSPARENT = 0;
- static const unsigned char ALPHA_OPAQUE = 0xff;
if ( HasMask() )
{
// use the mask to initialize the alpha channel.
src += 3, alpha++ )
{
*alpha = (src[0] == mr && src[1] == mg && src[2] == mb)
- ? ALPHA_TRANSPARENT
- : ALPHA_OPAQUE;
+ ? wxIMAGE_ALPHA_TRANSPARENT
+ : wxIMAGE_ALPHA_OPAQUE;
}
M_IMGDATA->m_hasMask = false;
else // no mask
{
// make the image fully opaque
- memset(alpha, ALPHA_OPAQUE, lenAlpha);
+ memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha);
}
}
+void wxImage::ClearAlpha()
+{
+ wxCHECK_RET( HasAlpha(), wxT("image already doesn't have an alpha channel") );
+
+ if ( !M_IMGDATA->m_staticAlpha )
+ free( M_IMGDATA->m_alpha );
+
+ M_IMGDATA->m_alpha = NULL;
+}
+
+
// ----------------------------------------------------------------------------
// mask support
// ----------------------------------------------------------------------------
void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
M_IMGDATA->m_maskRed = r;
M_IMGDATA->m_maskGreen = g;
bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
if (M_IMGDATA->m_hasMask)
{
unsigned char wxImage::GetMaskRed() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
return M_IMGDATA->m_maskRed;
}
unsigned char wxImage::GetMaskGreen() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
return M_IMGDATA->m_maskGreen;
}
unsigned char wxImage::GetMaskBlue() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
return M_IMGDATA->m_maskBlue;
}
void wxImage::SetMask( bool mask )
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
M_IMGDATA->m_hasMask = mask;
}
bool wxImage::HasMask() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
return M_IMGDATA->m_hasMask;
}
-int wxImage::GetWidth() const
+bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+ long pos = XYToIndex(x, y);
+ wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") );
- return M_IMGDATA->m_width;
-}
+ // check mask
+ if ( M_IMGDATA->m_hasMask )
+ {
+ const unsigned char *p = M_IMGDATA->m_data + 3*pos;
+ if ( p[0] == M_IMGDATA->m_maskRed &&
+ p[1] == M_IMGDATA->m_maskGreen &&
+ p[2] == M_IMGDATA->m_maskBlue )
+ {
+ return true;
+ }
+ }
-int wxImage::GetHeight() const
-{
- wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+ // then check alpha
+ if ( M_IMGDATA->m_alpha )
+ {
+ if ( M_IMGDATA->m_alpha[pos] < threshold )
+ {
+ // transparent enough
+ return true;
+ }
+ }
- return M_IMGDATA->m_height;
+ // not transparent
+ return false;
}
bool wxImage::SetMaskFromImage(const wxImage& mask,
return false ;
}
+ AllocExclusive();
+
unsigned char *imgdata = GetData();
unsigned char *maskdata = mask.GetData();
bool wxImage::ConvertAlphaToMask(unsigned char threshold)
{
- if (!HasAlpha())
- return true;
+ if ( !HasAlpha() )
+ return false;
unsigned char mr, mg, mb;
- if (!FindFirstUnusedColour(&mr, &mg, &mb))
+ if ( !FindFirstUnusedColour(&mr, &mg, &mb) )
{
wxLogError( _("No unused colour in image being masked.") );
return false;
}
+ return ConvertAlphaToMask(mr, mg, mb, threshold);
+}
+
+bool wxImage::ConvertAlphaToMask(unsigned char mr,
+ unsigned char mg,
+ unsigned char mb,
+ unsigned char threshold)
+{
+ if ( !HasAlpha() )
+ return false;
+
+ AllocExclusive();
+
SetMask(true);
SetMaskColour(mr, mg, mb);
}
}
- free(M_IMGDATA->m_alpha);
+ if ( !M_IMGDATA->m_staticAlpha )
+ free(M_IMGDATA->m_alpha);
+
M_IMGDATA->m_alpha = NULL;
+ M_IMGDATA->m_staticAlpha = false;
return true;
}
-#if wxUSE_PALETTE
-
+// ----------------------------------------------------------------------------
// Palette functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PALETTE
bool wxImage::HasPalette() const
{
- if (!Ok())
+ if (!IsOk())
return false;
- return M_IMGDATA->m_palette.Ok();
+ return M_IMGDATA->m_palette.IsOk();
}
const wxPalette& wxImage::GetPalette() const
{
- wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") );
return M_IMGDATA->m_palette;
}
void wxImage::SetPalette(const wxPalette& palette)
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ wxCHECK_RET( IsOk(), wxT("invalid image") );
+
+ AllocExclusive();
M_IMGDATA->m_palette = palette;
}
#endif // wxUSE_PALETTE
+// ----------------------------------------------------------------------------
// Option functions (arbitrary name/value mapping)
+// ----------------------------------------------------------------------------
+
void wxImage::SetOption(const wxString& name, const wxString& value)
{
- wxCHECK_RET( Ok(), wxT("invalid image") );
+ AllocExclusive();
int idx = M_IMGDATA->m_optionNames.Index(name, false);
- if (idx == wxNOT_FOUND)
+ if ( idx == wxNOT_FOUND )
{
M_IMGDATA->m_optionNames.Add(name);
M_IMGDATA->m_optionValues.Add(value);
wxString wxImage::GetOption(const wxString& name) const
{
- wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
+ if ( !M_IMGDATA )
+ return wxEmptyString;
int idx = M_IMGDATA->m_optionNames.Index(name, false);
- if (idx == wxNOT_FOUND)
+ if ( idx == wxNOT_FOUND )
return wxEmptyString;
else
return M_IMGDATA->m_optionValues[idx];
bool wxImage::HasOption(const wxString& name) const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
-
- return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);
+ return M_IMGDATA ? M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND
+ : false;
}
-bool wxImage::LoadFile( const wxString& filename, long type, int index )
+// ----------------------------------------------------------------------------
+// image I/O
+// ----------------------------------------------------------------------------
+
+bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+ wxBitmapType WXUNUSED_UNLESS_STREAMS(type),
+ int WXUNUSED_UNLESS_STREAMS(index) )
{
-#if wxUSE_STREAMS
- if (wxFileExists(filename))
+#if HAS_FILE_STREAMS
+ wxImageFileInputStream stream(filename);
+ if ( stream.IsOk() )
{
- wxFileInputStream stream(filename);
wxBufferedInputStream bstream( stream );
- return LoadFile(bstream, type, index);
+ if ( LoadFile(bstream, type, index) )
+ return true;
}
- else
- {
- wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
- return false;
- }
-#else // !wxUSE_STREAMS
+ wxLogError(_("Failed to load image from file \"%s\"."), filename);
+#endif // HAS_FILE_STREAMS
+
return false;
-#endif // wxUSE_STREAMS
}
-bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int index )
+bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+ const wxString& WXUNUSED_UNLESS_STREAMS(mimetype),
+ int WXUNUSED_UNLESS_STREAMS(index) )
{
-#if wxUSE_STREAMS
- if (wxFileExists(filename))
+#if HAS_FILE_STREAMS
+ wxImageFileInputStream stream(filename);
+ if ( stream.IsOk() )
{
- wxFileInputStream stream(filename);
wxBufferedInputStream bstream( stream );
- return LoadFile(bstream, mimetype, index);
+ if ( LoadFile(bstream, mimetype, index) )
+ return true;
}
- else
- {
- wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
- return false;
- }
-#else // !wxUSE_STREAMS
+ wxLogError(_("Failed to load image from file \"%s\"."), filename);
+#endif // HAS_FILE_STREAMS
+
return false;
-#endif // wxUSE_STREAMS
}
-
bool wxImage::SaveFile( const wxString& filename ) const
{
wxString ext = filename.AfterLast('.').Lower();
- wxImageHandler * pHandler = FindHandler(ext, -1);
- if (pHandler)
+ wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY);
+ if ( !handler)
{
- SaveFile(filename, pHandler->GetType());
- return true;
+ wxLogError(_("Can't save image to file '%s': unknown extension."),
+ filename);
+ return false;
}
- wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
-
- return false;
+ return SaveFile(filename, handler->GetType());
}
-bool wxImage::SaveFile( const wxString& filename, int type ) const
+bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+ wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const
{
-#if wxUSE_STREAMS
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+#if HAS_FILE_STREAMS
+ wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
- wxFileOutputStream stream(filename);
+ wxImageFileOutputStream stream(filename);
if ( stream.IsOk() )
{
wxBufferedOutputStream bstream( stream );
return SaveFile(bstream, type);
}
-#endif // wxUSE_STREAMS
+#endif // HAS_FILE_STREAMS
return false;
}
-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
+bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+ const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const
{
-#if wxUSE_STREAMS
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+#if HAS_FILE_STREAMS
+ wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
- wxFileOutputStream stream(filename);
+ wxImageFileOutputStream stream(filename);
if ( stream.IsOk() )
{
wxBufferedOutputStream bstream( stream );
return SaveFile(bstream, mimetype);
}
-#endif // wxUSE_STREAMS
+#endif // HAS_FILE_STREAMS
return false;
}
-bool wxImage::CanRead( const wxString &name )
+bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) )
{
-#if wxUSE_STREAMS
- wxFileInputStream stream(name);
- return CanRead(stream);
+#if HAS_FILE_STREAMS
+ wxImageFileInputStream stream(name);
+ return CanRead(stream);
#else
- return false;
+ return false;
#endif
}
-int wxImage::GetImageCount( const wxString &name, long type )
+int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
+ wxBitmapType WXUNUSED_UNLESS_STREAMS(type) )
{
-#if wxUSE_STREAMS
- wxFileInputStream stream(name);
- if (stream.Ok())
- return GetImageCount(stream, type);
+#if HAS_FILE_STREAMS
+ wxImageFileInputStream stream(name);
+ if (stream.IsOk())
+ return GetImageCount(stream, type);
#endif
return 0;
return false;
}
-int wxImage::GetImageCount( wxInputStream &stream, long type )
+int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
{
wxImageHandler *handler;
if ( type == wxBITMAP_TYPE_ANY )
{
- wxList &list=GetHandlers();
+ const wxList& list = GetHandlers();
- for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
+ for ( wxList::compatibility_iterator node = list.GetFirst();
+ node;
+ node = node->GetNext() )
{
- handler=(wxImageHandler*)node->GetData();
+ handler = (wxImageHandler*)node->GetData();
if ( handler->CanRead(stream) )
- return handler->GetImageCount(stream);
+ {
+ const int count = handler->GetImageCount(stream);
+ if ( count >= 0 )
+ return count;
+ }
}
}
}
-bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
+bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
{
- UnRef();
+ // save the options values which can be clobbered by the handler (e.g. many
+ // of them call Destroy() before trying to load the file)
+ const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
+ maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);
- m_refData = new wxImageRefData;
+ // Preserve the original stream position if possible to rewind back to it
+ // if we failed to load the file -- maybe the next handler that we try can
+ // succeed after us then.
+ wxFileOffset posOld = wxInvalidOffset;
+ if ( stream.IsSeekable() )
+ posOld = stream.TellI();
+
+ if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
+ {
+ if ( posOld != wxInvalidOffset )
+ stream.SeekI(posOld);
+
+ return false;
+ }
+
+ // rescale the image to the specified size if needed
+ if ( maxWidth || maxHeight )
+ {
+ const unsigned widthOrig = GetWidth(),
+ heightOrig = GetHeight();
+
+ // this uses the same (trivial) algorithm as the JPEG handler
+ unsigned width = widthOrig,
+ height = heightOrig;
+ while ( (maxWidth && width > maxWidth) ||
+ (maxHeight && height > maxHeight) )
+ {
+ width /= 2;
+ height /= 2;
+ }
+
+ 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
+ M_IMGDATA->m_type = handler.GetType();
+
+ return true;
+}
+
+bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
+{
+ AllocExclusive();
wxImageHandler *handler;
if ( type == wxBITMAP_TYPE_ANY )
{
- wxList &list=GetHandlers();
-
- for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
+ if ( !stream.IsSeekable() )
{
- handler=(wxImageHandler*)node->GetData();
- if ( handler->CanRead(stream) )
- return handler->LoadFile(this, stream, true/*verbose*/, index);
+ // The error message about image data format being unknown below
+ // would be misleading in this case as we are not even going to try
+ // any handlers because CanRead() never does anything for not
+ // seekable stream, so try to be more precise here.
+ wxLogError(_("Can't automatically determine the image format "
+ "for non-seekable input."));
+ return false;
+ }
+ const wxList& list = GetHandlers();
+ for ( wxList::compatibility_iterator node = list.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ handler = (wxImageHandler*)node->GetData();
+ if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) )
+ return true;
}
- wxLogWarning( _("No handler found for image type.") );
+ wxLogWarning( _("Unknown image data format.") );
+
return false;
}
+ //else: have specific type
handler = FindHandler(type);
-
- if (handler == 0)
+ if ( !handler )
{
wxLogWarning( _("No image handler for type %d defined."), type );
+ return false;
+ }
+ if ( stream.IsSeekable() && !handler->CanRead(stream) )
+ {
+ wxLogError(_("This is not a %s."), handler->GetName());
return false;
}
- return handler->LoadFile(this, stream, true/*verbose*/, index);
+ return DoLoad(*handler, stream, index);
}
bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
wxImageHandler *handler = FindHandlerMime(mimetype);
- if (handler == 0)
+ if ( !handler )
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+ return false;
+ }
+ if ( stream.IsSeekable() && !handler->CanRead(stream) )
+ {
+ wxLogError(_("Image is not of type %s."), mimetype);
return false;
}
- return handler->LoadFile( this, stream, true/*verbose*/, index );
+ return DoLoad(*handler, stream, index);
+}
+
+bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
+{
+ wxImage * const self = const_cast<wxImage *>(this);
+ if ( !handler.SaveFile(self, stream) )
+ return false;
+
+ M_IMGDATA->m_type = handler.GetType();
+ return true;
}
-bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
+bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
wxImageHandler *handler = FindHandler(type);
if ( !handler )
{
wxLogWarning( _("No image handler for type %d defined."), type );
-
return false;
}
- return handler->SaveFile( (wxImage*)this, stream );
+ return DoSave(*handler, stream);
}
bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
wxImageHandler *handler = FindHandlerMime(mimetype);
if ( !handler )
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
-
return false;
}
- return handler->SaveFile( (wxImage*)this, stream );
+ return DoSave(*handler, stream);
}
+
#endif // wxUSE_STREAMS
+// ----------------------------------------------------------------------------
+// image I/O handlers
+// ----------------------------------------------------------------------------
+
void wxImage::AddHandler( wxImageHandler *handler )
{
// Check for an existing handler of the type being added.
// may) we should probably refcount the duplicates.
// also an issue in InsertHandler below.
- wxLogDebug( _T("Adding duplicate image handler for '%s'"),
+ wxLogDebug( wxT("Adding duplicate image handler for '%s'"),
handler->GetName().c_str() );
delete handler;
}
else
{
// see AddHandler for additional comments.
- wxLogDebug( _T("Inserting duplicate image handler for '%s'"),
+ wxLogDebug( wxT("Inserting duplicate image handler for '%s'"),
handler->GetName().c_str() );
delete handler;
}
node = node->GetNext();
}
- return 0;
+ return NULL;
}
-wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
+wxImageHandler *wxImage::FindHandler( const wxString& extension, wxBitmapType bitmapType )
{
wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler*)node->GetData();
- if ( (handler->GetExtension().Cmp(extension) == 0) &&
- (bitmapType == -1 || handler->GetType() == bitmapType) )
- return handler;
+ if ((bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType))
+ {
+ if (handler->GetExtension() == extension)
+ return handler;
+ if (handler->GetAltExtensions().Index(extension, false) != wxNOT_FOUND)
+ return handler;
+ }
node = node->GetNext();
}
- return 0;
+ return NULL;
}
-wxImageHandler *wxImage::FindHandler( long bitmapType )
+wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType )
{
wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
if (handler->GetType() == bitmapType) return handler;
node = node->GetNext();
}
- return 0;
+ return NULL;
}
wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
node = node->GetNext();
}
- return 0;
+ return NULL;
}
void wxImage::InitStandardHandlers()
{
wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
fmts += wxT("*.") + Handler->GetExtension();
+ for (size_t i = 0; i < Handler->GetAltExtensions().size(); i++)
+ fmts += wxT(";*.") + Handler->GetAltExtensions()[i];
Node = Node->GetNext();
if ( Node ) fmts += wxT(";");
}
return wxT("(") + fmts + wxT(")|") + fmts;
}
+wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
+{
+ const double red = rgb.red / 255.0,
+ green = rgb.green / 255.0,
+ blue = rgb.blue / 255.0;
+
+ // find the min and max intensity (and remember which one was it for the
+ // latter)
+ double minimumRGB = red;
+ if ( green < minimumRGB )
+ minimumRGB = green;
+ if ( blue < minimumRGB )
+ minimumRGB = blue;
+
+ enum { RED, GREEN, BLUE } chMax = RED;
+ double maximumRGB = red;
+ if ( green > maximumRGB )
+ {
+ chMax = GREEN;
+ maximumRGB = green;
+ }
+ if ( blue > maximumRGB )
+ {
+ chMax = BLUE;
+ maximumRGB = blue;
+ }
+
+ const double value = maximumRGB;
+
+ double hue = 0.0, saturation;
+ const double deltaRGB = maximumRGB - minimumRGB;
+ if ( wxIsNullDouble(deltaRGB) )
+ {
+ // Gray has no color
+ hue = 0.0;
+ saturation = 0.0;
+ }
+ else
+ {
+ switch ( chMax )
+ {
+ case RED:
+ hue = (green - blue) / deltaRGB;
+ break;
+
+ case GREEN:
+ hue = 2.0 + (blue - red) / deltaRGB;
+ break;
+
+ case BLUE:
+ hue = 4.0 + (red - green) / deltaRGB;
+ break;
+
+ default:
+ wxFAIL_MSG(wxT("hue not specified"));
+ break;
+ }
+
+ hue /= 6.0;
+
+ if ( hue < 0.0 )
+ hue += 1.0;
+
+ saturation = deltaRGB / maximumRGB;
+ }
+
+ return HSVValue(hue, saturation, value);
+}
+
+wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv)
+{
+ double red, green, blue;
+
+ if ( wxIsNullDouble(hsv.saturation) )
+ {
+ // Grey
+ red = hsv.value;
+ green = hsv.value;
+ blue = hsv.value;
+ }
+ else // not grey
+ {
+ double hue = hsv.hue * 6.0; // sector 0 to 5
+ int i = (int)floor(hue);
+ double f = hue - i; // fractional part of h
+ double p = hsv.value * (1.0 - hsv.saturation);
+
+ switch (i)
+ {
+ case 0:
+ red = hsv.value;
+ green = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+ blue = p;
+ break;
+
+ case 1:
+ red = hsv.value * (1.0 - hsv.saturation * f);
+ green = hsv.value;
+ blue = p;
+ break;
+
+ case 2:
+ red = p;
+ green = hsv.value;
+ blue = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+ break;
+
+ case 3:
+ red = p;
+ green = hsv.value * (1.0 - hsv.saturation * f);
+ blue = hsv.value;
+ break;
+
+ case 4:
+ red = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+ green = p;
+ blue = hsv.value;
+ break;
+
+ default: // case 5:
+ red = hsv.value;
+ green = p;
+ blue = hsv.value * (1.0 - hsv.saturation * f);
+ break;
+ }
+ }
+
+ return RGBValue((unsigned char)(red * 255.0),
+ (unsigned char)(green * 255.0),
+ (unsigned char)(blue * 255.0));
+}
+
+/*
+ * Rotates the hue of each pixel of the image. angle is a double in the range
+ * -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
+ */
+void wxImage::RotateHue(double angle)
+{
+ AllocExclusive();
+
+ unsigned char *srcBytePtr;
+ unsigned char *dstBytePtr;
+ unsigned long count;
+ wxImage::HSVValue hsv;
+ wxImage::RGBValue rgb;
+
+ wxASSERT (angle >= -1.0 && angle <= 1.0);
+ count = M_IMGDATA->m_width * M_IMGDATA->m_height;
+ if ( count > 0 && !wxIsNullDouble(angle) )
+ {
+ srcBytePtr = M_IMGDATA->m_data;
+ dstBytePtr = srcBytePtr;
+ do
+ {
+ rgb.red = *srcBytePtr++;
+ rgb.green = *srcBytePtr++;
+ rgb.blue = *srcBytePtr++;
+ hsv = RGBtoHSV(rgb);
+
+ hsv.hue = hsv.hue + angle;
+ if (hsv.hue > 1.0)
+ hsv.hue = hsv.hue - 1.0;
+ else if (hsv.hue < 0.0)
+ hsv.hue = hsv.hue + 1.0;
+
+ rgb = HSVtoRGB(hsv);
+ *dstBytePtr++ = rgb.red;
+ *dstBytePtr++ = rgb.green;
+ *dstBytePtr++ = rgb.blue;
+ } while (--count != 0);
+ }
+}
+
//-----------------------------------------------------------------------------
// wxImageHandler
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
#if wxUSE_STREAMS
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
+int wxImageHandler::GetImageCount( wxInputStream& stream )
{
- return false;
-}
+ // NOTE: this code is the same of wxAnimationDecoder::CanRead and
+ // wxImageHandler::CallDoCanRead
-bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
-{
- return false;
-}
+ if ( !stream.IsSeekable() )
+ return false; // can't test unseekable stream
-int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
-{
- return 1;
+ wxFileOffset posOld = stream.TellI();
+ int n = DoGetImageCount(stream);
+
+ // restore the old position to be able to test other formats and so on
+ if ( stream.SeekI(posOld) == wxInvalidOffset )
+ {
+ wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!"));
+
+ // reading would fail anyhow as we're not at the right position
+ return false;
+ }
+
+ return n;
}
bool wxImageHandler::CanRead( const wxString& name )
{
- if (wxFileExists(name))
+ wxImageFileInputStream stream(name);
+ if ( !stream.IsOk() )
{
- wxFileInputStream stream(name);
- return CanRead(stream);
- }
+ wxLogError(_("Failed to check format of image file \"%s\"."), name);
- wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
+ return false;
+ }
- return false;
+ return CanRead(stream);
}
bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
{
- wxFileOffset posOld = stream.TellI();
- if ( posOld == wxInvalidOffset )
- {
- // can't test unseekable stream
- return false;
- }
+ // NOTE: this code is the same of wxAnimationDecoder::CanRead and
+ // wxImageHandler::GetImageCount
+ if ( !stream.IsSeekable() )
+ return false; // can't test unseekable stream
+
+ wxFileOffset posOld = stream.TellI();
bool ok = DoCanRead(stream);
// restore the old position to be able to test other formats and so on
if ( stream.SeekI(posOld) == wxInvalidOffset )
{
- wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
+ wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!"));
// reading would fail anyhow as we're not at the right position
return false;
#endif // wxUSE_STREAMS
+/* static */
+wxImageResolution
+wxImageHandler::GetResolutionFromOptions(const wxImage& image, int *x, int *y)
+{
+ wxCHECK_MSG( x && y, wxIMAGE_RESOLUTION_NONE, wxT("NULL pointer") );
+
+ if ( image.HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+ image.HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
+ {
+ *x = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
+ *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
+ }
+ else if ( image.HasOption(wxIMAGE_OPTION_RESOLUTION) )
+ {
+ *x =
+ *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+ }
+ else // no resolution options specified
+ {
+ *x =
+ *y = 0;
+
+ return wxIMAGE_RESOLUTION_NONE;
+ }
+
+ // get the resolution unit too
+ int resUnit = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
+ if ( !resUnit )
+ {
+ // this is the default
+ resUnit = wxIMAGE_RESOLUTION_INCHES;
+ }
+
+ return (wxImageResolution)resUnit;
+}
+
// ----------------------------------------------------------------------------
// image histogram stuff
// ----------------------------------------------------------------------------
* Rotation code by Carlos Moreno
*/
-// GRG: I've removed wxRotationPoint - we already have wxRealPoint which
-// does exactly the same thing. And I also got rid of wxRotationPixel
-// bacause of potential problems in architectures where alignment
-// is an issue, so I had to rewrite parts of the code.
-
-static const double gs_Epsilon = 1e-10;
-
-static inline int wxCint (double x)
-{
- return (x > 0) ? (int) (x + 0.5) : (int) (x - 0.5);
-}
-
+static const double wxROTATE_EPSILON = 1e-10;
// Auxiliary function to rotate a point (x,y) with respect to point p0
// make it inline and use a straight return to facilitate optimization
// repeating the time-consuming calls to these functions -- sin/cos can
// be computed and stored in the calling function.
-inline wxRealPoint rotated_point (const wxRealPoint & p, double cos_angle, double sin_angle, const wxRealPoint & p0)
+static inline wxRealPoint
+wxRotatePoint(const wxRealPoint& p, double cos_angle, double sin_angle,
+ const wxRealPoint& p0)
{
- return wxRealPoint (p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
- p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);
+ return wxRealPoint(p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
+ p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);
}
-inline wxRealPoint rotated_point (double x, double y, double cos_angle, double sin_angle, const wxRealPoint & p0)
+static inline wxRealPoint
+wxRotatePoint(double x, double y, double cos_angle, double sin_angle,
+ const wxRealPoint & p0)
{
- return rotated_point (wxRealPoint(x,y), cos_angle, sin_angle, p0);
+ return wxRotatePoint (wxRealPoint(x,y), cos_angle, sin_angle, p0);
}
-wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool interpolating, wxPoint * offset_after_rotation) const
+wxImage wxImage::Rotate(double angle,
+ const wxPoint& centre_of_rotation,
+ bool interpolating,
+ wxPoint *offset_after_rotation) const
{
- int i;
- angle = -angle; // screen coordinates are a mirror image of "real" coordinates
+ // screen coordinates are a mirror image of "real" coordinates
+ angle = -angle;
+
+ const bool has_alpha = HasAlpha();
- bool has_alpha = HasAlpha();
+ const int w = GetWidth();
+ const int h = GetHeight();
+
+ int i;
// Create pointer-based array to accelerate access to wxImage's data
- unsigned char ** data = new unsigned char * [GetHeight()];
+ unsigned char ** data = new unsigned char * [h];
data[0] = GetData();
- for (i = 1; i < GetHeight(); i++)
- data[i] = data[i - 1] + (3 * GetWidth());
+ for (i = 1; i < h; i++)
+ data[i] = data[i - 1] + (3 * w);
// Same for alpha channel
unsigned char ** alpha = NULL;
if (has_alpha)
{
- alpha = new unsigned char * [GetHeight()];
+ alpha = new unsigned char * [h];
alpha[0] = GetAlpha();
- for (i = 1; i < GetHeight(); i++)
- alpha[i] = alpha[i - 1] + GetWidth();
+ for (i = 1; i < h; i++)
+ alpha[i] = alpha[i - 1] + w;
}
// precompute coefficients for rotation formula
- // (sine and cosine of the angle)
const double cos_angle = cos(angle);
const double sin_angle = sin(angle);
const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
- wxRealPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0);
- wxRealPoint p2 = rotated_point (0, GetHeight(), cos_angle, sin_angle, p0);
- wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0);
- wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), cos_angle, sin_angle, p0);
+ wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0);
+ wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0);
+ wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0);
+ wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0);
- int x1 = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
- int y1 = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
- int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
- int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
+ int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
+ int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
+ int x2a = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
+ int y2a = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
// Create rotated image
- wxImage rotated (x2 - x1 + 1, y2 - y1 + 1, false);
+ wxImage rotated (x2a - x1a + 1, y2a - y1a + 1, false);
// With alpha channel
if (has_alpha)
rotated.SetAlpha();
if (offset_after_rotation != NULL)
{
- *offset_after_rotation = wxPoint (x1, y1);
+ *offset_after_rotation = wxPoint (x1a, y1a);
}
- // GRG: The rotated (destination) image is always accessed
- // sequentially, so there is no need for a pointer-based
- // array here (and in fact it would be slower).
- //
- unsigned char * dst = rotated.GetData();
+ // the rotated (destination) image is always accessed sequentially via this
+ // pointer, there is no need for pointer-based arrays here
+ unsigned char *dst = rotated.GetData();
- unsigned char * alpha_dst = NULL;
- if (has_alpha)
- alpha_dst = rotated.GetAlpha();
+ unsigned char *alpha_dst = has_alpha ? rotated.GetAlpha() : NULL;
- // GRG: if the original image has a mask, use its RGB values
- // as the blank pixel, else, fall back to default (black).
- //
+ // if the original image has a mask, use its RGB values as the blank pixel,
+ // else, fall back to default (black).
unsigned char blank_r = 0;
unsigned char blank_g = 0;
unsigned char blank_b = 0;
// performing an inverse rotation (a rotation of -angle) and getting the
// pixel at those coordinates
- // GRG: I've taken the (interpolating) test out of the loops, so that
- // it is done only once, instead of repeating it for each pixel.
+ const int rH = rotated.GetHeight();
+ const int rW = rotated.GetWidth();
- int x;
+ // do the (interpolating) test outside of the loops, so that it is done
+ // only once, instead of repeating it for each pixel.
if (interpolating)
{
- for (int y = 0; y < rotated.GetHeight(); y++)
+ for (int y = 0; y < rH; y++)
{
- for (x = 0; x < rotated.GetWidth(); x++)
+ for (int x = 0; x < rW; x++)
{
- wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+ wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
- if (-0.25 < src.x && src.x < GetWidth() - 0.75 &&
- -0.25 < src.y && src.y < GetHeight() - 0.75)
+ if (-0.25 < src.x && src.x < w - 0.75 &&
+ -0.25 < src.y && src.y < h - 0.75)
{
// interpolate using the 4 enclosing grid-points. Those
// points can be obtained using floor and ceiling of the
// exact coordinates of the point
- // C.M. 2000-02-17: when the point is near the border, special care is required.
-
int x1, y1, x2, y2;
- if (0 < src.x && src.x < GetWidth() - 1)
+ if (0 < src.x && src.x < w - 1)
{
- x1 = wxCint(floor(src.x));
- x2 = wxCint(ceil(src.x));
+ x1 = wxRound(floor(src.x));
+ x2 = wxRound(ceil(src.x));
}
else // else means that x is near one of the borders (0 or width-1)
{
- x1 = x2 = wxCint (src.x);
+ x1 = x2 = wxRound (src.x);
}
- if (0 < src.y && src.y < GetHeight() - 1)
+ if (0 < src.y && src.y < h - 1)
{
- y1 = wxCint(floor(src.y));
- y2 = wxCint(ceil(src.y));
+ y1 = wxRound(floor(src.y));
+ y2 = wxRound(ceil(src.y));
}
else
{
- y1 = y2 = wxCint (src.y);
+ y1 = y2 = wxRound (src.y);
}
// get four points and the distances (square of the distance,
// GRG: Do not calculate the points until they are
// really needed -- this way we can calculate
// just one, instead of four, if d1, d2, d3
- // or d4 are < gs_Epsilon
+ // or d4 are < wxROTATE_EPSILON
const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1);
const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1);
// If the point is exactly at one point of the grid of the source
// image, then don't interpolate -- just assign the pixel
- if (d1 < gs_Epsilon) // d1,d2,d3,d4 are positive -- no need for abs()
+ // d1,d2,d3,d4 are positive -- no need for abs()
+ if (d1 < wxROTATE_EPSILON)
{
unsigned char *p = data[y1] + (3 * x1);
*(dst++) = *(p++);
*(dst++) = *p;
if (has_alpha)
- {
- unsigned char *p = alpha[y1] + x1;
- *(alpha_dst++) = *p;
- }
+ *(alpha_dst++) = *(alpha[y1] + x1);
}
- else if (d2 < gs_Epsilon)
+ else if (d2 < wxROTATE_EPSILON)
{
unsigned char *p = data[y1] + (3 * x2);
*(dst++) = *(p++);
*(dst++) = *p;
if (has_alpha)
- {
- unsigned char *p = alpha[y1] + x2;
- *(alpha_dst++) = *p;
- }
+ *(alpha_dst++) = *(alpha[y1] + x2);
}
- else if (d3 < gs_Epsilon)
+ else if (d3 < wxROTATE_EPSILON)
{
unsigned char *p = data[y2] + (3 * x2);
*(dst++) = *(p++);
*(dst++) = *p;
if (has_alpha)
- {
- unsigned char *p = alpha[y2] + x2;
- *(alpha_dst++) = *p;
- }
+ *(alpha_dst++) = *(alpha[y2] + x2);
}
- else if (d4 < gs_Epsilon)
+ else if (d4 < wxROTATE_EPSILON)
{
unsigned char *p = data[y2] + (3 * x1);
*(dst++) = *(p++);
*(dst++) = *p;
if (has_alpha)
- {
- unsigned char *p = alpha[y2] + x1;
- *(alpha_dst++) = *p;
- }
+ *(alpha_dst++) = *(alpha[y2] + x1);
}
else
{
if (has_alpha)
{
- unsigned char *v1 = alpha[y1] + (x1);
- unsigned char *v2 = alpha[y1] + (x2);
- unsigned char *v3 = alpha[y2] + (x2);
- unsigned char *v4 = alpha[y2] + (x1);
+ v1 = alpha[y1] + (x1);
+ v2 = alpha[y1] + (x2);
+ v3 = alpha[y2] + (x2);
+ v4 = alpha[y2] + (x1);
*(alpha_dst++) = (unsigned char)
( (w1 * *v1 + w2 * *v2 +
}
}
}
- else // not interpolating
+ else // not interpolating
{
- for (int y = 0; y < rotated.GetHeight(); y++)
+ for (int y = 0; y < rH; y++)
{
- for (x = 0; x < rotated.GetWidth(); x++)
+ for (int x = 0; x < rW; x++)
{
- wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
+ wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
- const int xs = wxCint (src.x); // wxCint rounds to the
- const int ys = wxCint (src.y); // closest integer
+ const int xs = wxRound (src.x); // wxRound rounds to the
+ const int ys = wxRound (src.y); // closest integer
- if (0 <= xs && xs < GetWidth() &&
- 0 <= ys && ys < GetHeight())
+ if (0 <= xs && xs < w && 0 <= ys && ys < h)
{
unsigned char *p = data[ys] + (3 * xs);
*(dst++) = *(p++);
*(dst++) = *p;
if (has_alpha)
- {
- unsigned char *p = alpha[ys] + (xs);
- *(alpha_dst++) = *p;
- }
+ *(alpha_dst++) = *(alpha[ys] + (xs));
}
else
{
}
delete [] data;
-
- if (has_alpha)
- delete [] alpha;
+ delete [] alpha;
return rotated;
}
DECLARE_DYNAMIC_CLASS(wxImageModule)
public:
wxImageModule() {}
- bool OnInit() { wxImage::InitStandardHandlers(); return true; };
- void OnExit() { wxImage::CleanUpHandlers(); };
+ bool OnInit() { wxImage::InitStandardHandlers(); return true; }
+ void OnExit() { wxImage::CleanUpHandlers(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
projects / wxWidgets.git / blobdiff