X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68be9f090f422450d333385cf62c9b4d350674be..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 5f61154db2..a2674529de 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: image.cpp +// Name: src/common/image.cpp // Purpose: wxImage // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "image.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -18,26 +14,42 @@ #pragma hdrstop #endif +#if wxUSE_IMAGE + #include "wx/image.h" -#include "wx/bitmap.h" -#include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.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" +#endif + #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" -#include "wx/module.h" +#include "wx/xpmdecod.h" // For memcpy #include -#include - -#ifdef __SALFORDC__ - #undef FAR -#endif -#ifdef __WXMSW__ - #include "wx/msw/private.h" +// 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_FILE + typedef wxFileInputStream wxImageFileInputStream; + typedef wxFileOutputStream wxImageFileOutputStream; + #elif wxUSE_FFILE + typedef wxFFileInputStream wxImageFileInputStream; + typedef wxFFileOutputStream wxImageFileOutputStream; + #endif // wxUSE_FILE/wxUSE_FFILE +#endif // HAS_FILE_STREAMS + +#if wxUSE_VARIANT +IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLEXPORT) #endif //----------------------------------------------------------------------------- @@ -48,2551 +60,2660 @@ class wxImageRefData: public wxObjectRefData { public: wxImageRefData(); - ~wxImageRefData(); + virtual ~wxImageRefData(); int m_width; int m_height; unsigned char *m_data; + bool m_hasMask; unsigned char m_maskRed,m_maskGreen,m_maskBlue; + + // alpha channel data, may be NULL for the formats without alpha support + unsigned char *m_alpha; + bool m_ok; + + // if true, m_data is pointer to static data and shouldn't be freed + bool m_static; + + // same as m_static but for m_alpha + bool m_staticAlpha; + +#if wxUSE_PALETTE + wxPalette m_palette; +#endif // wxUSE_PALETTE + + wxArrayString m_optionNames; + wxArrayString m_optionValues; + + DECLARE_NO_COPY_CLASS(wxImageRefData) }; wxImageRefData::wxImageRefData() { m_width = 0; m_height = 0; - m_data = (unsigned char*) NULL; - m_ok = FALSE; + m_data = + m_alpha = (unsigned char *) NULL; + m_maskRed = 0; m_maskGreen = 0; m_maskBlue = 0; - m_hasMask = FALSE; + m_hasMask = false; + + m_ok = false; + m_static = + m_staticAlpha = false; } wxImageRefData::~wxImageRefData() { - if (m_data) + if ( !m_static ) free( m_data ); + if ( !m_staticAlpha ) + free( m_alpha ); } wxList wxImage::sm_handlers; +wxImage wxNullImage; + //----------------------------------------------------------------------------- -#define M_IMGDATA ((wxImageRefData *)m_refData) +#define M_IMGDATA wx_static_cast(wxImageRefData*, m_refData) + +IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) +wxImage::wxImage( int width, int height, bool clear ) +{ + Create( width, height, clear ); +} -wxImage::wxImage() +wxImage::wxImage( int width, int height, unsigned char* data, bool static_data ) { + Create( width, height, data, static_data ); } -wxImage::wxImage( int width, int height ) +wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data ) { - Create( width, height ); + Create( width, height, data, alpha, static_data ); } -wxImage::wxImage( const wxString& name, long type ) +wxImage::wxImage( const wxString& name, long type, int index ) { - LoadFile( name, type ); + LoadFile( name, type, index ); } -wxImage::wxImage( const wxString& name, const wxString& mimetype ) +wxImage::wxImage( const wxString& name, const wxString& mimetype, int index ) { - LoadFile( name, mimetype ); + LoadFile( name, mimetype, index ); } #if wxUSE_STREAMS -wxImage::wxImage( wxInputStream& stream, long type ) +wxImage::wxImage( wxInputStream& stream, long type, int index ) { - LoadFile( stream, type ); + LoadFile( stream, type, index ); } -wxImage::wxImage( wxInputStream& stream, const wxString& mimetype ) +wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index ) { - LoadFile( stream, mimetype ); + LoadFile( stream, mimetype, index ); } #endif // wxUSE_STREAMS -wxImage::wxImage( const wxImage& image ) +wxImage::wxImage(const char* const* xpmData) { - Ref(image); + Create(xpmData); } -wxImage::wxImage( const wxImage* image ) +bool wxImage::Create(const char* const* xpmData) { - if (image) Ref(*image); +#if wxUSE_XPM + UnRef(); + + wxXPMDecoder decoder; + (*this) = decoder.ReadData(xpmData); + return Ok(); +#else + return false; +#endif } -void wxImage::Create( int width, int height ) +bool wxImage::Create( int width, int height, bool clear ) { UnRef(); m_refData = new wxImageRefData(); M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 ); - if (M_IMGDATA->m_data) - { - for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0; - - M_IMGDATA->m_width = width; - M_IMGDATA->m_height = height; - M_IMGDATA->m_ok = TRUE; - } - else + if (!M_IMGDATA->m_data) { UnRef(); + 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; + + return true; } -void wxImage::Destroy() +bool wxImage::Create( int width, int height, unsigned char* data, bool static_data ) { UnRef(); + + wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") ); + + m_refData = new wxImageRefData(); + + M_IMGDATA->m_data = data; + M_IMGDATA->m_width = width; + M_IMGDATA->m_height = height; + M_IMGDATA->m_ok = true; + M_IMGDATA->m_static = static_data; + + return true; } -wxImage wxImage::Scale( int width, int height ) const +bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data ) { - wxImage image; - - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + UnRef(); - wxCHECK_MSG( (width > 0) && (height > 0), image, wxT("invalid image size") ); + wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") ); - image.Create( width, height ); + m_refData = new wxImageRefData(); - char unsigned *data = image.GetData(); + M_IMGDATA->m_data = data; + M_IMGDATA->m_alpha = alpha; + M_IMGDATA->m_width = width; + M_IMGDATA->m_height = height; + M_IMGDATA->m_ok = true; + M_IMGDATA->m_static = static_data; - wxCHECK_MSG( data, image, wxT("unable to create image") ); + return true; +} - if (M_IMGDATA->m_hasMask) - image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); +void wxImage::Destroy() +{ + UnRef(); +} - long old_height = M_IMGDATA->m_height; - long old_width = M_IMGDATA->m_width; +wxObjectRefData* wxImage::CreateRefData() const +{ + return new wxImageRefData; +} - char unsigned *source_data = M_IMGDATA->m_data; - char unsigned *target_data = data; +wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const +{ + const wxImageRefData* refData = wx_static_cast(const wxImageRefData*, that); + wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") ); - for (long j = 0; j < height; j++) + 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) { - long y_offset = (j * old_height / height) * old_width; - - for (long i = 0; i < width; i++) - { - memcpy( target_data, - source_data + 3*(y_offset + ((i * old_width )/ width)), - 3 ); - target_data += 3; - } + 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; +} + +wxImage wxImage::Copy() const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.m_refData = CloneRefData(m_refData); return image; } -wxImage wxImage::GetSubImage( const wxRect &rect ) const +wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const { + if( xFactor == 1 && yFactor == 1 ) + return *this; + wxImage image; wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), - image, wxT("invalid subimage size") ); + // can't scale to/from 0 size + wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image, + wxT("invalid new image size") ); - int subwidth=rect.GetWidth(); - const int subheight=rect.GetHeight(); + long old_height = M_IMGDATA->m_height, + old_width = M_IMGDATA->m_width; - image.Create( subwidth, subheight ); + wxCHECK_MSG( (old_height > 0) && (old_width > 0), image, + wxT("invalid old image size") ); - char unsigned *subdata = image.GetData(), *data=GetData(); + long width = old_width / xFactor ; + long height = old_height / yFactor ; - wxCHECK_MSG( subdata, image, wxT("unable to create image") ); + image.Create( width, height, false ); - if (M_IMGDATA->m_hasMask) - image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + char unsigned *data = image.GetData(); - const int subleft=3*rect.GetLeft(); - const int width=3*GetWidth(); - subwidth*=3; + wxCHECK_MSG( data, image, wxT("unable to create image") ); - data+=rect.GetTop()*width+subleft; + bool hasMask = false ; + unsigned char maskRed = 0; + unsigned char maskGreen = 0; + unsigned char maskBlue =0 ; - for (long j = 0; j < subheight; ++j) + unsigned char *source_data = M_IMGDATA->m_data; + unsigned char *target_data = data; + unsigned char *source_alpha = 0 ; + unsigned char *target_alpha = 0 ; + if (M_IMGDATA->m_hasMask) + { + hasMask = true ; + maskRed = M_IMGDATA->m_maskRed; + maskGreen = M_IMGDATA->m_maskGreen; + maskBlue =M_IMGDATA->m_maskBlue ; + + image.SetMaskColour( M_IMGDATA->m_maskRed, + M_IMGDATA->m_maskGreen, + M_IMGDATA->m_maskBlue ); + } + else + { + source_alpha = M_IMGDATA->m_alpha ; + if ( source_alpha ) + { + image.SetAlpha() ; + target_alpha = image.GetAlpha() ; + } + } + + for (long y = 0; y < height; y++) { - memcpy( subdata, data, subwidth); - subdata+=subwidth; - data+=width; + for (long x = 0; x < width; x++) + { + unsigned long avgRed = 0 ; + unsigned long avgGreen = 0; + unsigned long avgBlue = 0; + unsigned long avgAlpha = 0 ; + unsigned long counter = 0 ; + // determine average + for ( int y1 = 0 ; y1 < yFactor ; ++y1 ) + { + 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 ) ; + unsigned char red = pixel[0] ; + unsigned char green = pixel[1] ; + unsigned char blue = pixel[2] ; + unsigned char alpha = 255 ; + if ( source_alpha ) + alpha = *(source_alpha + y_offset + x * xFactor + x1) ; + if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue ) + { + if ( alpha > 0 ) + { + avgRed += red ; + avgGreen += green ; + avgBlue += blue ; + } + avgAlpha += alpha ; + counter++ ; + } + } + } + if ( counter == 0 ) + { + *(target_data++) = M_IMGDATA->m_maskRed ; + *(target_data++) = M_IMGDATA->m_maskGreen ; + *(target_data++) = M_IMGDATA->m_maskBlue ; + } + else + { + if ( source_alpha ) + *(target_alpha++) = (unsigned char)(avgAlpha / counter ) ; + *(target_data++) = (unsigned char)(avgRed / counter); + *(target_data++) = (unsigned char)(avgGreen / counter); + *(target_data++) = (unsigned char)(avgBlue / counter); + } + } } + // 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); + if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ) + image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, + (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y))/yFactor); + return image; } -void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, - unsigned char r2, unsigned char g2, unsigned char b2 ) +wxImage wxImage::Scale( int width, int height, int quality ) const { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxImage image; - char unsigned *data = GetData(); + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - const int w = GetWidth(); - const int h = GetHeight(); + // can't scale to/from 0 size + wxCHECK_MSG( (width > 0) && (height > 0), image, + wxT("invalid new image size") ); - for (int j = 0; j < h; j++) - for (int i = 0; i < w; i++) + long old_height = M_IMGDATA->m_height, + old_width = M_IMGDATA->m_width; + wxCHECK_MSG( (old_height > 0) && (old_width > 0), image, + wxT("invalid old image size") ); + + // 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; + + // Scale the image (...or more appropriately, resample the image) using + // either the high-quality or normal method as specified + if ( quality == wxIMAGE_QUALITY_HIGH ) + { + // We need to check whether we are downsampling or upsampling the image + if ( width < old_width && height < old_height ) { - if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1)) - { - data[0] = r2; - data[1] = g2; - data[2] = b2; - } - data += 3; + // Downsample the image using the box averaging method for best results + image = ResampleBox(width, height); } -} + else + { + // For upsampling or other random/wierd image dimensions we'll use + // a bicubic b-spline scaling method + image = ResampleBicubic(width, height); + } + } + else // Default scaling method == simple pixel replication + { + if ( old_width % width == 0 && old_width >= width && + old_height % height == 0 && old_height >= height ) + { + return ShrinkBy( old_width / width , old_height / height ) ; + } + image.Create( width, height, false ); -void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) -{ - wxCHECK_RET( Ok(), wxT("invalid image") ); + unsigned char *data = image.GetData(); - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + wxCHECK_MSG( data, image, wxT("unable to create image") ); - wxCHECK_RET( (x>=0) && (y>=0) && (xm_data; + unsigned char *target_data = data; + unsigned char *source_alpha = 0 ; + unsigned char *target_alpha = 0 ; - long pos = (y * w + x) * 3; + if ( !M_IMGDATA->m_hasMask ) + { + source_alpha = M_IMGDATA->m_alpha ; + if ( source_alpha ) + { + image.SetAlpha() ; + target_alpha = image.GetAlpha() ; + } + } - M_IMGDATA->m_data[ pos ] = r; - M_IMGDATA->m_data[ pos+1 ] = g; - M_IMGDATA->m_data[ pos+2 ] = b; -} + long x_delta = (old_width<<16) / width; + long y_delta = (old_height<<16) / height; -unsigned char wxImage::GetRed( int x, int y ) -{ - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + unsigned char* dest_pixel = target_data; - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_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 ; - wxCHECK_MSG( (x>=0) && (y>=0) && (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 ) + *(target_alpha++) = *src_alpha_pixel ; + x += x_delta; + } - long pos = (y * w + x) * 3; + y += y_delta; + } + } - return M_IMGDATA->m_data[pos]; + // 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; } -unsigned char wxImage::GetGreen( int x, int y ) +wxImage wxImage::ResampleBox(int width, int height) const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + // 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. - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + wxImage ret_image(width, height, false); - wxCHECK_MSG( (x>=0) && (y>=0) && (xm_width) / width; + const double scale_factor_y = double(M_IMGDATA->m_height) / height; - long pos = (y * w + x) * 3; + const int scale_factor_x_2 = (int)(scale_factor_x / 2); + const int scale_factor_y_2 = (int)(scale_factor_y / 2); - return M_IMGDATA->m_data[pos+1]; -} + // If we want good-looking results we need to pre-blur the image a bit first + wxImage src_image(*this); + src_image = src_image.BlurHorizontal(scale_factor_x_2); + src_image = src_image.BlurVertical(scale_factor_y_2); -unsigned char wxImage::GetBlue( int x, int y ) -{ - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + unsigned char* src_data = src_image.GetData(); + unsigned char* src_alpha = src_image.GetAlpha(); + unsigned char* dst_data = ret_image.GetData(); + unsigned char* dst_alpha = NULL; - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + if ( src_alpha ) + { + ret_image.SetAlpha(); + dst_alpha = ret_image.GetAlpha(); + } - wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data[pos+2]; -} + 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); -bool wxImage::Ok() const -{ - return (M_IMGDATA && M_IMGDATA->m_ok); -} + // Box of pixels to average + averaged_pixels = 0; + sum_r = sum_g = sum_b = sum_a = 0.0; -char unsigned *wxImage::GetData() const -{ - wxCHECK_MSG( Ok(), (char unsigned *)NULL, wxT("invalid image") ); + for ( int j = int(src_y - scale_factor_y/2.0 + 1); + j <= int(src_y + scale_factor_y_2); + j++ ) + { + // We don't care to average pixels that don't exist (edges) + if ( j < 0 || j > M_IMGDATA->m_height ) + continue; - return M_IMGDATA->m_data; -} + for ( int i = int(src_x - scale_factor_x/2.0 + 1); + i <= src_x + scale_factor_x_2; + i++ ) + { + // Don't average edge pixels + if ( i < 0 || i > M_IMGDATA->m_width ) + continue; -void wxImage::SetData( char unsigned *data ) -{ - wxCHECK_RET( Ok(), wxT("invalid image") ); + // Calculate the actual index in our source pixels + src_pixel_index = src_y * M_IMGDATA->m_width + src_x; - wxImageRefData *newRefData = new wxImageRefData(); + 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]; - newRefData->m_width = M_IMGDATA->m_width; - newRefData->m_height = M_IMGDATA->m_height; - newRefData->m_data = data; - newRefData->m_ok = TRUE; - newRefData->m_maskRed = M_IMGDATA->m_maskRed; - newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; - newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; - newRefData->m_hasMask = M_IMGDATA->m_hasMask; + averaged_pixels++; + } + } - UnRef(); + // 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); + } + } - m_refData = newRefData; + return ret_image; } -void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) +// The following two local functions are for the B-spline weighting of the +// bicubic sampling algorithm +static inline double spline_cube(double value) { - wxCHECK_RET( Ok(), wxT("invalid image") ); - - M_IMGDATA->m_maskRed = r; - M_IMGDATA->m_maskGreen = g; - M_IMGDATA->m_maskBlue = b; - M_IMGDATA->m_hasMask = TRUE; + return value <= 0.0 ? 0.0 : value * value * value; } -unsigned char wxImage::GetMaskRed() const +static inline double spline_weight(double value) { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); - - return M_IMGDATA->m_maskRed; + return (spline_cube(value + 2) - + 4 * spline_cube(value + 1) + + 6 * spline_cube(value) - + 4 * spline_cube(value - 1)) / 6; } -unsigned char wxImage::GetMaskGreen() const +// This is the bicubic resampling algorithm +wxImage wxImage::ResampleBicubic(int width, int height) const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + // 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 - return M_IMGDATA->m_maskGreen; -} + wxImage ret_image; -unsigned char wxImage::GetMaskBlue() const -{ - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + ret_image.Create(width, height, false); - return M_IMGDATA->m_maskBlue; -} + unsigned char* src_data = M_IMGDATA->m_data; + unsigned char* src_alpha = M_IMGDATA->m_alpha; + unsigned char* dst_data = ret_image.GetData(); + unsigned char* dst_alpha = NULL; -void wxImage::SetMask( bool mask ) -{ - wxCHECK_RET( Ok(), wxT("invalid image") ); + if ( src_alpha ) + { + ret_image.SetAlpha(); + dst_alpha = ret_image.GetAlpha(); + } - M_IMGDATA->m_hasMask = mask; -} + for ( int dsty = 0; dsty < height; dsty++ ) + { + // We need to calculate the source pixel to interpolate from - Y-axis + double srcpixy = dsty * M_IMGDATA->m_height / height; + double dy = srcpixy - (int)srcpixy; -bool wxImage::HasMask() const -{ - wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + for ( int dstx = 0; dstx < width; dstx++ ) + { + // X-axis of pixel to interpolate from + double srcpixx = dstx * M_IMGDATA->m_width / width; + double dx = srcpixx - (int)srcpixx; - return M_IMGDATA->m_hasMask; -} + // Sums for each color channel + double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0; -int wxImage::GetWidth() const -{ - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + // 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; + } + } - return M_IMGDATA->m_width; -} + // 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; -int wxImage::GetHeight() const -{ - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + if ( src_alpha ) + *dst_alpha++ = (unsigned char)sum_a; + } + } - return M_IMGDATA->m_height; + return ret_image; } -bool wxImage::LoadFile( const wxString& filename, long type ) +// Blur in the horizontal direction +wxImage wxImage::BlurHorizontal(int blurRadius) { -#if wxUSE_STREAMS - if (wxFileExists(filename)) + wxImage ret_image; + ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false); + + unsigned char* src_data = M_IMGDATA->m_data; + unsigned char* dst_data = ret_image.GetData(); + unsigned char* src_alpha = M_IMGDATA->m_alpha; + unsigned char* dst_alpha = NULL; + + // Check for a mask or alpha + if ( M_IMGDATA->m_hasMask ) { - wxFileInputStream stream(filename); - wxBufferedInputStream bstream( stream ); - return LoadFile(bstream, type); + ret_image.SetMaskColour(M_IMGDATA->m_maskRed, + M_IMGDATA->m_maskGreen, + M_IMGDATA->m_maskBlue); } else { - wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() ); - - return FALSE; + if ( src_alpha ) + { + ret_image.SetAlpha(); + dst_alpha = ret_image.GetAlpha(); + } } -#else // !wxUSE_STREAMS - return FALSE; -#endif // wxUSE_STREAMS -} -bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype ) -{ -#if wxUSE_STREAMS - if (wxFileExists(filename)) + // 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++ ) { - wxFileInputStream stream(filename); - wxBufferedInputStream bstream( stream ); - return LoadFile(bstream, mimetype); - } - else - { - wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() ); + // 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]; + } - return FALSE; + 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); + } } -#else // !wxUSE_STREAMS - return FALSE; -#endif // wxUSE_STREAMS + + return ret_image; } -bool wxImage::SaveFile( const wxString& filename, int type ) +// Blur in the vertical direction +wxImage wxImage::BlurVertical(int blurRadius) { -#if wxUSE_STREAMS - wxFileOutputStream stream(filename); + wxImage ret_image; + ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false); - if ( stream.LastError() == wxStream_NOERROR ) + unsigned char* src_data = M_IMGDATA->m_data; + unsigned char* dst_data = ret_image.GetData(); + unsigned char* src_alpha = M_IMGDATA->m_alpha; + unsigned char* dst_alpha = NULL; + + // Check for a mask or alpha + if ( M_IMGDATA->m_hasMask ) { - wxBufferedOutputStream bstream( stream ); - return SaveFile(bstream, type); + ret_image.SetMaskColour(M_IMGDATA->m_maskRed, + M_IMGDATA->m_maskGreen, + M_IMGDATA->m_maskBlue); } else -#endif // wxUSE_STREAMS - return FALSE; -} + { + if ( src_alpha ) + { + ret_image.SetAlpha(); + dst_alpha = ret_image.GetAlpha(); + } + } -bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) -{ -#if wxUSE_STREAMS - wxFileOutputStream stream(filename); + // number of pixels we average over + const int blurArea = blurRadius*2 + 1; - if ( stream.LastError() == wxStream_NOERROR ) + // Vertical blurring algorithm - same as horizontal but switched the + // opposite direction + for ( int x = 0; x < M_IMGDATA->m_width; x++ ) { - wxBufferedOutputStream bstream( stream ); - return SaveFile(bstream, mimetype); + // 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); + } } - else -#endif // wxUSE_STREAMS - return FALSE; -} -bool wxImage::CanRead( const wxString &name ) -{ -#if wxUSE_STREAMS - wxFileInputStream stream(name); - return CanRead(stream); -#else - return FALSE; -#endif + return ret_image; } -#if wxUSE_STREAMS - -bool wxImage::CanRead( wxInputStream &stream ) +// The new blur function +wxImage wxImage::Blur(int blurRadius) { - wxList &list=GetHandlers(); + wxImage ret_image; + ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false); - for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() ) - { - wxImageHandler *handler=(wxImageHandler*)node->GetData(); - if (handler->CanRead( stream )) - return TRUE; - } + // Blur the image in each direction + ret_image = BlurHorizontal(blurRadius); + ret_image = ret_image.BlurVertical(blurRadius); - return FALSE; + return ret_image; } -bool wxImage::LoadFile( wxInputStream& stream, long type ) +wxImage wxImage::Rotate90( bool clockwise ) const { - UnRef(); + wxImage image; - m_refData = new wxImageRefData; + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - wxImageHandler *handler; + image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false ); - if (type==wxBITMAP_TYPE_ANY) - { - wxList &list=GetHandlers(); + unsigned char *data = image.GetData(); - for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() ) - { - handler=(wxImageHandler*)node->GetData(); - if (handler->CanRead( stream )) - return handler->LoadFile( this, stream ); + 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 = 0 ; + unsigned char *target_alpha = 0 ; - wxLogWarning( _("No handler found for image type.") ); - return FALSE; + if (M_IMGDATA->m_hasMask) + { + image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + } + else + { + source_alpha = M_IMGDATA->m_alpha ; + if ( source_alpha ) + { + image.SetAlpha() ; + alpha_data = image.GetAlpha() ; + } } - handler = FindHandler(type); + long height = M_IMGDATA->m_height; + long width = M_IMGDATA->m_width; - if (handler == NULL) + for (long j = 0; j < height; j++) { - wxLogWarning( _("No image handler for type %d defined."), type ); + for (long i = 0; i < width; i++) + { + if (clockwise) + { + target_data = data + (((i+1)*height) - j - 1)*3; + if(source_alpha) + target_alpha = alpha_data + (((i+1)*height) - j - 1); + } + else + { + target_data = data + ((height*(width-1)) + j - (i*height))*3; + if(source_alpha) + target_alpha = alpha_data + ((height*(width-1)) + j - (i*height)); + } + memcpy( target_data, source_data, 3 ); + source_data += 3; - return FALSE; + if(source_alpha) + { + memcpy( target_alpha, source_alpha, 1 ); + source_alpha += 1; + } + } } - return handler->LoadFile( this, stream ); + return image; } -bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype ) +wxImage wxImage::Mirror( bool horizontally ) const { - UnRef(); + wxImage image; - m_refData = new wxImageRefData; + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - wxImageHandler *handler = FindHandlerMime(mimetype); + 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 (handler == NULL) + 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 width = M_IMGDATA->m_width; + + unsigned char *source_data = M_IMGDATA->m_data; + unsigned char *target_data; + + if (horizontally) { - wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); + for (long j = 0; j < height; j++) + { + data += width*3; + target_data = data-3; + for (long i = 0; i < width; i++) + { + memcpy( target_data, source_data, 3 ); + source_data += 3; + target_data -= 3; + } + } - return FALSE; + 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 + { + for (long i = 0; i < height; i++) + { + target_data = data + 3*width*(height-1-i); + memcpy( target_data, source_data, (size_t)3*width ); + source_data += 3*width; + } - return handler->LoadFile( this, stream ); + if (alpha != NULL) + { + // 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; } -bool wxImage::SaveFile( wxOutputStream& stream, int type ) +wxImage wxImage::GetSubImage( const wxRect &rect ) const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + wxImage image; - wxImageHandler *handler = FindHandler(type); + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - if (handler == NULL) - { - wxLogWarning( _("No image handler for type %d defined."), type ); + wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && + (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), + image, wxT("invalid subimage size") ); + + const int subwidth = rect.GetWidth(); + const int subheight = rect.GetHeight(); + + image.Create( subwidth, subheight, false ); + + 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 != NULL) { + 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 width = GetWidth(); + const int pixsoff = rect.GetLeft() + width * rect.GetTop(); + + src_data += 3 * pixsoff; + src_alpha += pixsoff; // won't be used if was NULL, so this is ok - return FALSE; + for (long j = 0; j < subheight; ++j) + { + 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 handler->SaveFile( this, stream ); + return image; } -bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) +wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, + int r_, int g_, int b_ ) const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + wxImage image; - wxImageHandler *handler = FindHandlerMime(mimetype); + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") ); + + int width = GetWidth(), height = GetHeight(); + image.Create(size.GetWidth(), size.GetHeight(), false); - if (handler == NULL) + unsigned char r = (unsigned char)r_; + unsigned char g = (unsigned char)g_; + unsigned char b = (unsigned char)b_; + if ((r_ == -1) && (g_ == -1) && (b_ == -1)) { - wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); + GetOrFindMaskColour( &r, &g, &b ); + image.SetMaskColour(r, g, b); + } + + image.SetRGB(wxRect(), r, g, b); + + wxRect subRect(pos.x, pos.y, width, height); + wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight()); + if (pos.x < 0) + finalRect.width -= pos.x; + if (pos.y < 0) + finalRect.height -= pos.y; - return FALSE; + subRect.Intersect(finalRect); + + if (!subRect.IsEmpty()) + { + if ((subRect.GetWidth() == width) && (subRect.GetHeight() == height)) + image.Paste(*this, pos.x, pos.y); + else + image.Paste(GetSubImage(subRect), pos.x, pos.y); } - return handler->SaveFile( this, stream ); + return image; } -#endif // wxUSE_STREAMS -void wxImage::AddHandler( wxImageHandler *handler ) +void wxImage::Paste( const wxImage &image, int x, int y ) { - // make sure that the memory will be freed at the program end - sm_handlers.DeleteContents(TRUE); + wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( image.Ok(), wxT("invalid image") ); - sm_handlers.Append( handler ); -} + AllocExclusive(); -void wxImage::InsertHandler( wxImageHandler *handler ) -{ - // make sure that the memory will be freed at the program end - sm_handlers.DeleteContents(TRUE); + int xx = 0; + int yy = 0; + int width = image.GetWidth(); + int height = image.GetHeight(); - sm_handlers.Insert( handler ); -} + if (x < 0) + { + xx = -x; + width += x; + } + if (y < 0) + { + yy = -y; + height += y; + } -bool wxImage::RemoveHandler( const wxString& name ) -{ - wxImageHandler *handler = FindHandler(name); - if (handler) + if ((x+xx)+width > M_IMGDATA->m_width) + width = M_IMGDATA->m_width - (x+xx); + if ((y+yy)+height > M_IMGDATA->m_height) + height = M_IMGDATA->m_height - (y+yy); + + if (width < 1) return; + if (height < 1) return; + + if ((!HasMask() && !image.HasMask()) || + (HasMask() && !image.HasMask()) || + ((HasMask() && image.HasMask() && + (GetMaskRed()==image.GetMaskRed()) && + (GetMaskGreen()==image.GetMaskGreen()) && + (GetMaskBlue()==image.GetMaskBlue())))) { - sm_handlers.DeleteObject(handler); - return TRUE; + width *= 3; + unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth(); + int source_step = image.GetWidth()*3; + + unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*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 ); + source_data += source_step; + target_data += target_step; + } + return; } - else - return FALSE; -} -wxImageHandler *wxImage::FindHandler( const wxString& name ) -{ - wxNode *node = sm_handlers.First(); - while (node) + if (!HasMask() && image.HasMask()) { - wxImageHandler *handler = (wxImageHandler*)node->Data(); - if (handler->GetName().Cmp(name) == 0) return handler; + unsigned char r = image.GetMaskRed(); + unsigned char g = image.GetMaskGreen(); + unsigned char b = image.GetMaskBlue(); - node = node->Next(); + width *= 3; + unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth(); + int source_step = image.GetWidth()*3; + + unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*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) + { + if ((source_data[i] != r) || + (source_data[i+1] != g) || + (source_data[i+2] != b)) + { + memcpy( target_data+i, source_data+i, 3 ); + } + } + source_data += source_step; + target_data += target_step; + } } - return (wxImageHandler *)NULL; } -wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType ) +void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, + unsigned char r2, unsigned char g2, unsigned char b2 ) { - wxNode *node = sm_handlers.First(); - while (node) - { - wxImageHandler *handler = (wxImageHandler*)node->Data(); - if ( (handler->GetExtension().Cmp(extension) == 0) && - (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; - node = node->Next(); - } - return (wxImageHandler*)NULL; + wxCHECK_RET( Ok(), wxT("invalid image") ); + + AllocExclusive(); + + unsigned char *data = GetData(); + + const int w = GetWidth(); + const int h = GetHeight(); + + for (int j = 0; j < h; j++) + for (int i = 0; i < w; i++) + { + if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1)) + { + data[0] = r2; + data[1] = g2; + data[2] = b2; + } + data += 3; + } } -wxImageHandler *wxImage::FindHandler( long bitmapType ) +wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const { - wxNode *node = sm_handlers.First(); - while (node) + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false); + + 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; + unsigned char maskRed = M_IMGDATA->m_maskRed; + unsigned char maskGreen = M_IMGDATA->m_maskGreen; + 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; + for ( long i = 0; i < size; i++, src += 3, dest += 3 ) { - wxImageHandler *handler = (wxImageHandler *)node->Data(); - if (handler->GetType() == bitmapType) return handler; - node = node->Next(); + // don't modify the mask + if ( hasMask && src[0] == maskRed && src[1] == maskGreen && src[2] == maskBlue ) + { + memcpy(dest, src, 3); + } + else + { + // calculate the luma + double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5; + dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma); + } } - return NULL; -} -wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype ) -{ - wxNode *node = sm_handlers.First(); - while (node) + // copy the alpha channel, if any + if (HasAlpha()) { - wxImageHandler *handler = (wxImageHandler *)node->Data(); - if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler; - node = node->Next(); + const size_t alphaSize = GetWidth() * GetHeight(); + unsigned char *alpha = (unsigned char*)malloc(alphaSize); + memcpy(alpha, GetAlpha(), alphaSize); + image.InitAlpha(); + image.SetAlpha(alpha); } - return NULL; -} -void wxImage::InitStandardHandlers() -{ - AddHandler( new wxBMPHandler ); + return image; } -void wxImage::CleanUpHandlers() +wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const { - wxNode *node = sm_handlers.First(); - while (node) + 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(); + + wxCHECK_MSG( data, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) { - wxImageHandler *handler = (wxImageHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; + if (M_IMGDATA->m_maskRed == r && M_IMGDATA->m_maskGreen == g && + M_IMGDATA->m_maskBlue == b) + image.SetMaskColour( 255, 255, 255 ); + else + image.SetMaskColour( 0, 0, 0 ); } -} -//----------------------------------------------------------------------------- -// wxImageHandler -//----------------------------------------------------------------------------- + long size = M_IMGDATA->m_height * M_IMGDATA->m_width; -IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject) + unsigned char *srcd = M_IMGDATA->m_data; + unsigned char *tard = image.GetData(); -#if wxUSE_STREAMS -bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) ) -{ - return 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; + } + + return image; } -bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) ) +int wxImage::GetWidth() const { - return FALSE; + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_width; } -int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) ) +int wxImage::GetHeight() const { - return 1; + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_height; } -bool wxImageHandler::CanRead( const wxString& name ) +long wxImage::XYToIndex(int x, int y) const { - if (wxFileExists(name)) + if ( Ok() && + x >= 0 && y >= 0 && + x < M_IMGDATA->m_width && y < M_IMGDATA->m_height ) { - wxFileInputStream stream(name); - return CanRead(stream); + return y*M_IMGDATA->m_width + x; } - else { - wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() ); - - return FALSE; - } -// return FALSE; + return -1; } -#endif // wxUSE_STREAMS +void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) +{ + long pos = XYToIndex(x, y); + wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); -//----------------------------------------------------------------------------- -// MSW conversion routines -//----------------------------------------------------------------------------- + AllocExclusive(); -#ifdef __WXMSW__ + pos *= 3; -wxBitmap wxImage::ConvertToBitmap() const + M_IMGDATA->m_data[ pos ] = r; + M_IMGDATA->m_data[ pos+1 ] = g; + M_IMGDATA->m_data[ pos+2 ] = b; +} + +void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b ) { - if ( !Ok() ) - return wxNullBitmap; + wxCHECK_RET( Ok(), wxT("invalid image") ); - // sizeLimit is the MS upper limit for the DIB size -#ifdef WIN32 - int sizeLimit = 1024*768*3; -#else - int sizeLimit = 0x7fff ; -#endif + AllocExclusive(); - // width and height of the device-dependent bitmap - int width = GetWidth(); - int bmpHeight = GetHeight(); - - // calc the number of bytes per scanline and padding - int bytePerLine = width*3; - int sizeDWORD = sizeof( DWORD ); - int lineBoundary = bytePerLine % sizeDWORD; - int padding = 0; - if( lineBoundary > 0 ) - { - padding = sizeDWORD - lineBoundary; - bytePerLine += padding; - } - // calc the number of DIBs and heights of DIBs - int numDIB = 1; - int hRemain = 0; - int height = sizeLimit/bytePerLine; - if( height >= bmpHeight ) - height = bmpHeight; + wxRect rect(rect_); + wxRect imageRect(0, 0, GetWidth(), GetHeight()); + if ( rect == wxRect() ) + { + rect = imageRect; + } else { - numDIB = bmpHeight / height; - hRemain = bmpHeight % height; - if( hRemain >0 ) numDIB++; - } - - // set bitmap parameters - wxBitmap bitmap; - wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); - bitmap.SetWidth( width ); - bitmap.SetHeight( bmpHeight ); - bitmap.SetDepth( wxDisplayDepth() ); - - // create a DIB header - int headersize = sizeof(BITMAPINFOHEADER); - BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize ); - wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") ); - // Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = (DWORD)width; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - // the general formula for biSizeImage: - // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height; - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - // These seem not really needed for our purpose here. - lpDIBh->bmiHeader.biClrImportant = 0; - lpDIBh->bmiHeader.biXPelsPerMeter = 0; - lpDIBh->bmiHeader.biYPelsPerMeter = 0; - // memory for DIB data - unsigned char *lpBits; - lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage ); - if( !lpBits ) - { - wxFAIL_MSG( wxT("could not allocate memory for DIB") ); - free( lpDIBh ); - return bitmap; - } - - // create and set the device-dependent bitmap - HDC hdc = ::GetDC(NULL); - HDC memdc = ::CreateCompatibleDC( hdc ); - HBITMAP hbitmap; - hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight ); - ::SelectObject( memdc, hbitmap); - - // copy image data into DIB data and then into DDB (in a loop) - unsigned char *data = GetData(); - int i, j, n; - int origin = 0; - unsigned char *ptdata = data; - unsigned char *ptbits; + wxCHECK_RET( imageRect.Contains(rect.GetTopLeft()) && + imageRect.Contains(rect.GetBottomRight()), + wxT("invalid bounding rectangle") ); + } - for( n=0; n 1 && n == numDIB-1 && hRemain > 0 ) + data = M_IMGDATA->m_data + (y*width + x1)*3; + for (x = x1; x < x2; x++) { - // redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - height = hRemain; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; + *data++ = r; + *data++ = g; + *data++ = b; } - ptbits = lpBits; + } +} - for( j=0; jbmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS ); - // The above line is equivalent to the following two lines. - // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); - // ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS); - // or the following lines - // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); - // HDC memdc = ::CreateCompatibleDC( hdc ); - // ::SelectObject( memdc, hbitmap); - // ::SetDIBitsToDevice( memdc, 0, 0, width, height, - // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS); - // ::SelectObject( memdc, 0 ); - // ::DeleteDC( memdc ); - } - bitmap.SetHBITMAP( (WXHBITMAP) hbitmap ); - - // similarly, created an mono-bitmap for the possible mask - if( HasMask() ) - { - hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL ); - HGDIOBJ hbmpOld = ::SelectObject( memdc, hbitmap); - if( numDIB == 1 ) height = bmpHeight; - else height = sizeLimit/bytePerLine; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - origin = 0; - unsigned char r = GetMaskRed(); - unsigned char g = GetMaskGreen(); - unsigned char b = GetMaskBlue(); - unsigned char zero = 0, one = 255; - ptdata = data; - for( n=0; n 1 && n == numDIB - 1 && hRemain > 0 ) - { - // redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - height = hRemain; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - } - ptbits = lpBits; - for( int j=0; jSetMaskBitmap( (WXHBITMAP) hbitmap ); - bitmap.SetMask( mask ); - // It will be deleted when the wxBitmap object is deleted (as of 01/1999) - /* The following can also be used but is slow to run - wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue()); - wxMask *mask = new wxMask( bitmap, colour ); - bitmap.SetMask( mask ); - */ + pos *= 3; - ::SelectObject( memdc, hbmpOld ); - } + return M_IMGDATA->m_data[pos]; +} - // free allocated resources - ::DeleteDC( memdc ); - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); +unsigned char wxImage::GetGreen( int x, int y ) const +{ + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); -#if WXWIN_COMPATIBILITY_2 - // check the wxBitmap object - bitmap.GetBitmapData()->SetOk(); -#endif // WXWIN_COMPATIBILITY_2 + pos *= 3; - return bitmap; + return M_IMGDATA->m_data[pos+1]; } -wxImage::wxImage( const wxBitmap &bitmap ) +unsigned char wxImage::GetBlue( int x, int y ) const { - // check the bitmap - if( !bitmap.Ok() ) - { - wxFAIL_MSG( wxT("invalid bitmap") ); - return; - } + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - // create an wxImage object - int width = bitmap.GetWidth(); - int height = bitmap.GetHeight(); - Create( width, height ); - unsigned char *data = GetData(); - if( !data ) - { - wxFAIL_MSG( wxT("could not allocate data for image") ); - return; - } + pos *= 3; - // calc the number of bytes per scanline and padding in the DIB - int bytePerLine = width*3; - int sizeDWORD = sizeof( DWORD ); - int lineBoundary = bytePerLine % sizeDWORD; - int padding = 0; - if( lineBoundary > 0 ) - { - padding = sizeDWORD - lineBoundary; - bytePerLine += padding; - } + return M_IMGDATA->m_data[pos+2]; +} - // create a DIB header - int headersize = sizeof(BITMAPINFOHEADER); - BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize ); - if( !lpDIBh ) - { - wxFAIL_MSG( wxT("could not allocate data for DIB header") ); - free( data ); - return; - } - // Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = width; - lpDIBh->bmiHeader.biHeight = -height; - lpDIBh->bmiHeader.biSizeImage = bytePerLine * height; - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - // These seem not really needed for our purpose here. - lpDIBh->bmiHeader.biClrImportant = 0; - lpDIBh->bmiHeader.biXPelsPerMeter = 0; - lpDIBh->bmiHeader.biYPelsPerMeter = 0; - // memory for DIB data - unsigned char *lpBits; - lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage ); - if( !lpBits ) - { - wxFAIL_MSG( wxT("could not allocate data for DIB") ); - free( data ); - free( lpDIBh ); - return; - } +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 + wxImageRefData *data = M_IMGDATA; + return data && data->m_ok && data->m_width && data->m_height; +} + +unsigned char *wxImage::GetData() const +{ + wxCHECK_MSG( Ok(), (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") ); + + wxImageRefData *newRefData = new wxImageRefData(); - // copy data from the device-dependent bitmap to the DIB - HDC hdc = ::GetDC(NULL); - HBITMAP hbitmap; - hbitmap = (HBITMAP) bitmap.GetHBITMAP(); - ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); + newRefData->m_width = M_IMGDATA->m_width; + newRefData->m_height = M_IMGDATA->m_height; + newRefData->m_data = data; + newRefData->m_ok = true; + newRefData->m_maskRed = M_IMGDATA->m_maskRed; + newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; + newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; + newRefData->m_hasMask = M_IMGDATA->m_hasMask; + newRefData->m_static = static_data; + + UnRef(); + + m_refData = newRefData; +} + +void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data ) +{ + wxImageRefData *newRefData = new wxImageRefData(); - // copy DIB data into the wxImage object - int i, j; - unsigned char *ptdata = data; - unsigned char *ptbits = lpBits; - for( i=0; iGetMaskBitmap() ) - { - hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap(); - // memory DC created, color set, data copied, and memory DC deleted - HDC memdc = ::CreateCompatibleDC( hdc ); - ::SetTextColor( memdc, RGB( 0, 0, 0 ) ); - ::SetBkColor( memdc, RGB( 255, 255, 255 ) ); - ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); - ::DeleteDC( memdc ); - // background color set to RGB(16,16,16) in consistent with wxGTK - unsigned char r=16, g=16, b=16; - ptdata = data; - ptbits = lpBits; - for( i=0; im_width = new_width; + newRefData->m_height = new_height; + newRefData->m_data = data; + newRefData->m_ok = true; + newRefData->m_maskRed = M_IMGDATA->m_maskRed; + newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; + newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; + newRefData->m_hasMask = M_IMGDATA->m_hasMask; } else { - SetMask( FALSE ); + newRefData->m_width = new_width; + newRefData->m_height = new_height; + newRefData->m_data = data; + newRefData->m_ok = true; } - // free allocated resources - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); + newRefData->m_static = static_data; + + UnRef(); + + m_refData = newRefData; } -#endif +// ---------------------------------------------------------------------------- +// alpha channel support +// ---------------------------------------------------------------------------- + +void wxImage::SetAlpha(int x, int y, unsigned char alpha) +{ + wxCHECK_RET( HasAlpha(), wxT("no alpha channel") ); -#ifdef __WXMAC__ + long pos = XYToIndex(x, y); + wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); -#include + AllocExclusive(); -extern CTabHandle wxMacCreateColorTable( int numColors ) ; -extern void wxMacDestroyColorTable( CTabHandle colors ) ; -extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ; -extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ; -extern void wxMacDestroyGWorld( GWorldPtr gw ) ; + M_IMGDATA->m_alpha[pos] = alpha; +} -wxBitmap wxImage::ConvertToBitmap() const +unsigned char wxImage::GetAlpha(int x, int y) const { - // width and height of the device-dependent bitmap - int width = GetWidth(); - int height = GetHeight(); + wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") ); - // Create picture + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - wxBitmap bitmap( width , height , wxDisplayDepth() ) ; + return M_IMGDATA->m_alpha[pos]; +} - // Create mask +bool +wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b) +{ + SetAlpha(NULL); - if (HasMask()) + const int w = M_IMGDATA->m_width; + const int h = M_IMGDATA->m_height; + + unsigned char *alpha = GetAlpha(); + unsigned char *data = GetData(); + + for ( int y = 0; y < h; y++ ) { - /* - unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + for ( int x = 0; x < w; x++ ) + { + *alpha++ = *data; + *data++ = r; + *data++ = g; + *data++ = b; + } + } + + return true; +} - mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); +void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); - wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); + AllocExclusive(); - bitmap.SetMask( mask ); - */ + if ( !alpha ) + { + alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height); } - // Render + free(M_IMGDATA->m_alpha); + M_IMGDATA->m_alpha = alpha; + M_IMGDATA->m_staticAlpha = static_data; +} - int r_mask = GetMaskRed(); - int g_mask = GetMaskGreen(); - int b_mask = GetMaskBlue(); +unsigned char *wxImage::GetAlpha() const +{ + wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + + return M_IMGDATA->m_alpha; +} - CGrafPtr origPort ; - GDHandle origDevice ; +void wxImage::InitAlpha() +{ + wxCHECK_RET( !HasAlpha(), wxT("image already has an alpha channel") ); - GetGWorld( &origPort , &origDevice ) ; - SetGWorld( bitmap.GetHBITMAP() , NULL ) ; + // initialize memory for alpha channel + SetAlpha(); - register unsigned char* data = GetData(); + unsigned char *alpha = M_IMGDATA->m_alpha; + const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height; - int index = 0; - for (int y = 0; y < height; y++) + if ( HasMask() ) { - for (int x = 0; x < width; x++) + // use the mask to initialize the alpha channel. + const unsigned char * const alphaEnd = alpha + lenAlpha; + + const unsigned char mr = M_IMGDATA->m_maskRed; + const unsigned char mg = M_IMGDATA->m_maskGreen; + const unsigned char mb = M_IMGDATA->m_maskBlue; + for ( unsigned char *src = M_IMGDATA->m_data; + alpha < alphaEnd; + src += 3, alpha++ ) { - unsigned char r = data[index++]; - unsigned char g = data[index++]; - unsigned char b = data[index++]; - RGBColor color ; - color.red = ( r << 8 ) + r ; - color.green = ( g << 8 ) + g ; - color.blue = ( b << 8 ) + b ; - SetCPixel( x , y , &color ) ; + *alpha = (src[0] == mr && src[1] == mg && src[2] == mb) + ? wxIMAGE_ALPHA_TRANSPARENT + : wxIMAGE_ALPHA_OPAQUE; } - } // for height - SetGWorld( origPort , origDevice ) ; - - if ( HasMask() ) + M_IMGDATA->m_hasMask = false; + } + else // no mask { - wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue()); - wxMask *mask = new wxMask( bitmap, colour ); - bitmap.SetMask( mask ); + // make the image fully opaque + memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha); } - return bitmap; - } -wxImage::wxImage( const wxBitmap &bitmap ) -{ - // check the bitmap - if( !bitmap.Ok() ) - { - wxFAIL_MSG( "invalid bitmap" ); - return; - } +// ---------------------------------------------------------------------------- +// mask support +// ---------------------------------------------------------------------------- - // create an wxImage object - int width = bitmap.GetWidth(); - int height = bitmap.GetHeight(); - Create( width, height ); - /* - unsigned char *data = GetData(); - if( !data ) - { - wxFAIL_MSG( "could not allocate data for image" ); - return; - } +void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); - // calc the number of bytes per scanline and padding in the DIB - int bytePerLine = width*3; - int sizeDWORD = sizeof( DWORD ); - div_t lineBoundary = div( bytePerLine, sizeDWORD ); - int padding = 0; - if( lineBoundary.rem > 0 ) - { - padding = sizeDWORD - lineBoundary.rem; - bytePerLine += padding; - } + AllocExclusive(); - // create a DIB header - int headersize = sizeof(BITMAPINFOHEADER); - LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); - if( !lpDIBh ) - { - wxFAIL_MSG( "could not allocate data for DIB header" ); - free( data ); - return; - } - // Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = width; - lpDIBh->bmiHeader.biHeight = -height; - lpDIBh->bmiHeader.biSizeImage = bytePerLine * height; - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - // These seem not really needed for our purpose here. - lpDIBh->bmiHeader.biClrImportant = 0; - lpDIBh->bmiHeader.biXPelsPerMeter = 0; - lpDIBh->bmiHeader.biYPelsPerMeter = 0; - // memory for DIB data - unsigned char *lpBits; - lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage ); - if( !lpBits ) - { - wxFAIL_MSG( "could not allocate data for DIB" ); - free( data ); - free( lpDIBh ); - return; - } + M_IMGDATA->m_maskRed = r; + M_IMGDATA->m_maskGreen = g; + M_IMGDATA->m_maskBlue = b; + M_IMGDATA->m_hasMask = true; +} - // copy data from the device-dependent bitmap to the DIB - HDC hdc = ::GetDC(NULL); - HBITMAP hbitmap; - hbitmap = (HBITMAP) bitmap.GetHBITMAP(); - ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); +bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const +{ + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); - // copy DIB data into the wxImage object - int i, j; - unsigned char *ptdata = data; - unsigned char *ptbits = lpBits; - for( i=0; im_hasMask) { - for( j=0; jGetMaskBitmap() ) - { - hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap(); - // memory DC created, color set, data copied, and memory DC deleted - HDC memdc = ::CreateCompatibleDC( hdc ); - ::SetTextColor( memdc, RGB( 0, 0, 0 ) ); - ::SetBkColor( memdc, RGB( 255, 255, 255 ) ); - ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); - ::DeleteDC( memdc ); - // background color set to RGB(16,16,16) in consistent with wxGTK - unsigned char r=16, g=16, b=16; - ptdata = data; - ptbits = lpBits; - for( i=0; im_maskRed; + if (g) *g = M_IMGDATA->m_maskGreen; + if (b) *b = M_IMGDATA->m_maskBlue; + return true; } else { - SetMask( FALSE ); + FindFirstUnusedColour(r, g, b); + return false; } - // free allocated resources - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); - */ } -#endif +unsigned char wxImage::GetMaskRed() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); -//----------------------------------------------------------------------------- -// GTK conversion routines -//----------------------------------------------------------------------------- + return M_IMGDATA->m_maskRed; +} -#ifdef __WXGTK__ +unsigned char wxImage::GetMaskGreen() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); -#include -#include -#include + return M_IMGDATA->m_maskGreen; +} -#if (GTK_MINOR_VERSION > 0) -#include -#endif +unsigned char wxImage::GetMaskBlue() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_maskBlue; +} + +void wxImage::SetMask( bool mask ) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); + + AllocExclusive(); -extern GtkWidget *wxRootWindow; + M_IMGDATA->m_hasMask = mask; +} -wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) +bool wxImage::HasMask() const { - wxBitmap bitmap; + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); - wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); + return M_IMGDATA->m_hasMask; +} - int width = GetWidth(); - int height = GetHeight(); +bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const +{ + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") ); - bitmap.SetHeight( height ); - bitmap.SetWidth( 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; + } + } - bitmap.SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) ); + // then check alpha + if ( M_IMGDATA->m_alpha ) + { + if ( M_IMGDATA->m_alpha[pos] < threshold ) + { + // transparent enough + return true; + } + } - bitmap.SetDepth( 1 ); + // not transparent + return false; +} - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); +bool wxImage::SetMaskFromImage(const wxImage& mask, + unsigned char mr, unsigned char mg, unsigned char mb) +{ + // check that the images are the same size + if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) ) + { + wxLogError( _("Image and mask have different sizes.") ); + return false; + } - // Create picture image + // find unused colour + unsigned char r,g,b ; + if (!FindFirstUnusedColour(&r, &g, &b)) + { + wxLogError( _("No unused colour in image being masked.") ); + return false ; + } + + AllocExclusive(); + + unsigned char *imgdata = GetData(); + unsigned char *maskdata = mask.GetData(); + + const int w = GetWidth(); + const int h = GetHeight(); - unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + for (int j = 0; j < h; j++) + { + for (int i = 0; i < w; i++) + { + if ((maskdata[0] == mr) && (maskdata[1] == mg) && (maskdata[2] == mb)) + { + imgdata[0] = r; + imgdata[1] = g; + imgdata[2] = b; + } + imgdata += 3; + maskdata += 3; + } + } - GdkImage *data_image = - gdk_image_new_bitmap( visual, data_data, width, height ); + SetMaskColour(r, g, b); + SetMask(true); - // Create mask image + return true; +} - GdkImage *mask_image = (GdkImage*) NULL; +bool wxImage::ConvertAlphaToMask(unsigned char threshold) +{ + if (!HasAlpha()) + return true; - if (HasMask()) + unsigned char mr, mg, mb; + if (!FindFirstUnusedColour(&mr, &mg, &mb)) { - unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); - - mask_image = gdk_image_new_bitmap( visual, mask_data, width, height ); + wxLogError( _("No unused colour in image being masked.") ); + return false; + } - wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 ); + AllocExclusive(); - bitmap.SetMask( mask ); - } + SetMask(true); + SetMaskColour(mr, mg, mb); - int r_mask = GetMaskRed(); - int g_mask = GetMaskGreen(); - int b_mask = GetMaskBlue(); + unsigned char *imgdata = GetData(); + unsigned char *alphadata = GetAlpha(); - unsigned char* data = GetData(); + int w = GetWidth(); + int h = GetHeight(); - int index = 0; - for (int y = 0; y < height; y++) + for (int y = 0; y < h; y++) { - for (int x = 0; x < width; x++) + for (int x = 0; x < w; x++, imgdata += 3, alphadata++) { - int r = data[index]; - index++; - int g = data[index]; - index++; - int b = data[index]; - index++; - - if (HasMask()) + if (*alphadata < threshold) { - if ((r == r_mask) && (b == b_mask) && (g == g_mask)) - gdk_image_put_pixel( mask_image, x, y, 1 ); - else - gdk_image_put_pixel( mask_image, x, y, 0 ); + imgdata[0] = mr; + imgdata[1] = mg; + imgdata[2] = mb; } + } + } - if ((r == red) && (b == blue) && (g == green)) - gdk_image_put_pixel( data_image, x, y, 1 ); - else - gdk_image_put_pixel( data_image, x, y, 0 ); - - } // for - } // for - - // Blit picture - - GdkGC *data_gc = gdk_gc_new( bitmap.GetBitmap() ); + free(M_IMGDATA->m_alpha); + M_IMGDATA->m_alpha = NULL; - gdk_draw_image( bitmap.GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height ); + return true; +} - gdk_image_destroy( data_image ); - gdk_gc_unref( data_gc ); +// ---------------------------------------------------------------------------- +// Palette functions +// ---------------------------------------------------------------------------- - // Blit mask +#if wxUSE_PALETTE - if (HasMask()) - { - GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() ); +bool wxImage::HasPalette() const +{ + if (!Ok()) + return false; - gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height ); + return M_IMGDATA->m_palette.Ok(); +} - gdk_image_destroy( mask_image ); - gdk_gc_unref( mask_gc ); - } +const wxPalette& wxImage::GetPalette() const +{ + wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") ); - return bitmap; + return M_IMGDATA->m_palette; } - -wxBitmap wxImage::ConvertToBitmap() const +void wxImage::SetPalette(const wxPalette& palette) { - wxBitmap bitmap; + wxCHECK_RET( Ok(), wxT("invalid image") ); - wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); + AllocExclusive(); - int width = GetWidth(); - int height = GetHeight(); + M_IMGDATA->m_palette = palette; +} - bitmap.SetHeight( height ); - bitmap.SetWidth( width ); +#endif // wxUSE_PALETTE - bitmap.SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) ); +// ---------------------------------------------------------------------------- +// Option functions (arbitrary name/value mapping) +// ---------------------------------------------------------------------------- - // Retrieve depth +void wxImage::SetOption(const wxString& name, const wxString& value) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); + AllocExclusive(); - int bpp = visual->depth; + int idx = M_IMGDATA->m_optionNames.Index(name, false); + if (idx == wxNOT_FOUND) + { + M_IMGDATA->m_optionNames.Add(name); + M_IMGDATA->m_optionValues.Add(value); + } + else + { + M_IMGDATA->m_optionNames[idx] = name; + M_IMGDATA->m_optionValues[idx] = value; + } +} - bitmap.SetDepth( bpp ); +void wxImage::SetOption(const wxString& name, int value) +{ + wxString valStr; + valStr.Printf(wxT("%d"), value); + SetOption(name, valStr); +} - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; - if (bpp < 8) bpp = 8; +wxString wxImage::GetOption(const wxString& name) const +{ + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") ); -#if (GTK_MINOR_VERSION > 0) + int idx = M_IMGDATA->m_optionNames.Index(name, false); + if (idx == wxNOT_FOUND) + return wxEmptyString; + else + return M_IMGDATA->m_optionValues[idx]; +} - if (!HasMask() && (bpp > 8)) - { - static bool s_hasInitialized = FALSE; +int wxImage::GetOptionInt(const wxString& name) const +{ + return wxAtoi(GetOption(name)); +} - if (!s_hasInitialized) - { - gdk_rgb_init(); - s_hasInitialized = TRUE; - } +bool wxImage::HasOption(const wxString& name) const +{ + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); - GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() ); + return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND); +} - gdk_draw_rgb_image( bitmap.GetPixmap(), - gc, - 0, 0, - width, height, - GDK_RGB_DITHER_NONE, - GetData(), - width*3 ); +// ---------------------------------------------------------------------------- +// image I/O +// ---------------------------------------------------------------------------- - gdk_gc_unref( gc ); +bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + long WXUNUSED_UNLESS_STREAMS(type), + int WXUNUSED_UNLESS_STREAMS(index) ) +{ +#if HAS_FILE_STREAMS + if (wxFileExists(filename)) + { + wxImageFileInputStream stream(filename); + wxBufferedInputStream bstream( stream ); + return LoadFile(bstream, type, index); + } + else + { + wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() ); - return bitmap; + return false; } +#else // !HAS_FILE_STREAMS + return false; +#endif // HAS_FILE_STREAMS +} -#endif +bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + const wxString& WXUNUSED_UNLESS_STREAMS(mimetype), + int WXUNUSED_UNLESS_STREAMS(index) ) +{ +#if HAS_FILE_STREAMS + if (wxFileExists(filename)) + { + wxImageFileInputStream stream(filename); + wxBufferedInputStream bstream( stream ); + return LoadFile(bstream, mimetype, index); + } + else + { + wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() ); - // Create picture image + return false; + } +#else // !HAS_FILE_STREAMS + return false; +#endif // HAS_FILE_STREAMS +} - GdkImage *data_image = - gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height ); - // Create mask image - GdkImage *mask_image = (GdkImage*) NULL; +bool wxImage::SaveFile( const wxString& filename ) const +{ + wxString ext = filename.AfterLast('.').Lower(); - if (HasMask()) + wxImageHandler * pHandler = FindHandler(ext, -1); + if (pHandler) { - unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + SaveFile(filename, pHandler->GetType()); + return true; + } - mask_image = gdk_image_new_bitmap( visual, mask_data, width, height ); + wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str()); - wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 ); + return false; +} - bitmap.SetMask( mask ); - } +bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + int WXUNUSED_UNLESS_STREAMS(type) ) const +{ +#if HAS_FILE_STREAMS + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); - // Render + ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); - enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; - byte_order b_o = RGB; + wxImageFileOutputStream stream(filename); - if (bpp >= 24) + if ( stream.IsOk() ) { - if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB; - else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RGB; - else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG; - else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR; - else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask)) b_o = GRB; - else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask)) b_o = GBR; + wxBufferedOutputStream bstream( stream ); + return SaveFile(bstream, type); } +#endif // HAS_FILE_STREAMS + + return false; +} + +bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const +{ +#if HAS_FILE_STREAMS + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); - int r_mask = GetMaskRed(); - int g_mask = GetMaskGreen(); - int b_mask = GetMaskBlue(); + ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); - unsigned char* data = GetData(); + wxImageFileOutputStream stream(filename); - int index = 0; - for (int y = 0; y < height; y++) + if ( stream.IsOk() ) { - for (int x = 0; x < width; x++) - { - int r = data[index]; - index++; - int g = data[index]; - index++; - int b = data[index]; - index++; - - if (HasMask()) - { - if ((r == r_mask) && (b == b_mask) && (g == g_mask)) - gdk_image_put_pixel( mask_image, x, y, 1 ); - else - gdk_image_put_pixel( mask_image, x, y, 0 ); - } + wxBufferedOutputStream bstream( stream ); + return SaveFile(bstream, mimetype); + } +#endif // HAS_FILE_STREAMS - switch (bpp) - { - case 8: - { - int pixel = -1; - if (wxTheApp->m_colorCube) - { - pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; - } - else - { - GdkColormap *cmap = gtk_widget_get_default_colormap(); - GdkColor *colors = cmap->colors; - int max = 3 * (65536); + return false; +} - for (int i = 0; i < cmap->size; i++) - { - int rdiff = (r << 8) - colors[i].red; - int gdiff = (g << 8) - colors[i].green; - int bdiff = (b << 8) - colors[i].blue; - int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); - if (sum < max) { pixel = i; max = sum; } - } - } +bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) ) +{ +#if HAS_FILE_STREAMS + wxImageFileInputStream stream(name); + return CanRead(stream); +#else + return false; +#endif +} - gdk_image_put_pixel( data_image, x, y, pixel ); +int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), + long WXUNUSED_UNLESS_STREAMS(type) ) +{ +#if HAS_FILE_STREAMS + wxImageFileInputStream stream(name); + if (stream.Ok()) + return GetImageCount(stream, type); +#endif - break; - } - case 15: - { - guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); - gdk_image_put_pixel( data_image, x, y, pixel ); - break; - } - case 16: - { - guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); - gdk_image_put_pixel( data_image, x, y, pixel ); - break; - } - case 32: - case 24: - { - guint32 pixel = 0; - switch (b_o) - { - case RGB: pixel = (r << 16) | (g << 8) | b; break; - case RBG: pixel = (r << 16) | (b << 8) | g; break; - case BRG: pixel = (b << 16) | (r << 8) | g; break; - case BGR: pixel = (b << 16) | (g << 8) | r; break; - case GRB: pixel = (g << 16) | (r << 8) | b; break; - case GBR: pixel = (g << 16) | (b << 8) | r; break; - } - gdk_image_put_pixel( data_image, x, y, pixel ); - } - default: break; - } - } // for - } // for + return 0; +} - // Blit picture +#if wxUSE_STREAMS - GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() ); +bool wxImage::CanRead( wxInputStream &stream ) +{ + const wxList& list = GetHandlers(); - gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height ); + for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() ) + { + wxImageHandler *handler=(wxImageHandler*)node->GetData(); + if (handler->CanRead( stream )) + return true; + } - gdk_image_destroy( data_image ); - gdk_gc_unref( data_gc ); + return false; +} - // Blit mask +int wxImage::GetImageCount( wxInputStream &stream, long type ) +{ + wxImageHandler *handler; - if (HasMask()) + if ( type == wxBITMAP_TYPE_ANY ) { - GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() ); + wxList &list=GetHandlers(); + + for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) + { + handler=(wxImageHandler*)node->GetData(); + if ( handler->CanRead(stream) ) + return handler->GetImageCount(stream); - gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height ); + } - gdk_image_destroy( mask_image ); - gdk_gc_unref( mask_gc ); + wxLogWarning(_("No handler found for image type.")); + return 0; } - return bitmap; -} - -wxImage::wxImage( const wxBitmap &bitmap ) -{ - wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") ); + handler = FindHandler(type); - GdkImage *gdk_image = (GdkImage*) NULL; - if (bitmap.GetPixmap()) + if ( !handler ) { - gdk_image = gdk_image_get( bitmap.GetPixmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); - } else - if (bitmap.GetBitmap()) + wxLogWarning(_("No image handler for type %ld defined."), type); + return false; + } + + if ( handler->CanRead(stream) ) { - gdk_image = gdk_image_get( bitmap.GetBitmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); - } else + return handler->GetImageCount(stream); + } + else { - wxFAIL_MSG( wxT("Ill-formed bitmap") ); + wxLogError(_("Image file is not of type %ld."), type); + return 0; } +} - wxCHECK_RET( gdk_image, wxT("couldn't create image") ); +bool wxImage::LoadFile( wxInputStream& stream, long type, int index ) +{ + UnRef(); - Create( bitmap.GetWidth(), bitmap.GetHeight() ); - char unsigned *data = GetData(); + m_refData = new wxImageRefData; - if (!data) - { - gdk_image_destroy( gdk_image ); - wxFAIL_MSG( wxT("couldn't create image") ); - return; - } + wxImageHandler *handler; - GdkImage *gdk_image_mask = (GdkImage*) NULL; - if (bitmap.GetMask()) + if ( type == wxBITMAP_TYPE_ANY ) { - gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); + wxList &list=GetHandlers(); + + for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() ) + { + handler=(wxImageHandler*)node->GetData(); + if ( handler->CanRead(stream) ) + return handler->LoadFile(this, stream, true/*verbose*/, index); + + } - SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable + wxLogWarning( _("No handler found for image type.") ); + return false; } - int bpp = -1; - int red_shift_right = 0; - int green_shift_right = 0; - int blue_shift_right = 0; - int red_shift_left = 0; - int green_shift_left = 0; - int blue_shift_left = 0; - bool use_shift = FALSE; + handler = FindHandler(type); - if (bitmap.GetPixmap()) + if (handler == 0) { - GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); - - if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window ); - bpp = visual->depth; - if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec; - red_shift_right = visual->red_shift; - red_shift_left = 8-visual->red_prec; - green_shift_right = visual->green_shift; - green_shift_left = 8-visual->green_prec; - blue_shift_right = visual->blue_shift; - blue_shift_left = 8-visual->blue_prec; + wxLogWarning( _("No image handler for type %ld defined."), type ); - use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR); + return false; } - if (bitmap.GetBitmap()) + + if (stream.IsSeekable() && !handler->CanRead(stream)) { - bpp = 1; + wxLogError(_("Image file is not of type %ld."), type); + return false; } + else + return handler->LoadFile(this, stream, true/*verbose*/, index); +} + +bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index ) +{ + UnRef(); + m_refData = new wxImageRefData; - GdkColormap *cmap = gtk_widget_get_default_colormap(); + wxImageHandler *handler = FindHandlerMime(mimetype); - long pos = 0; - for (int j = 0; j < bitmap.GetHeight(); j++) + if (handler == 0) { - for (int i = 0; i < bitmap.GetWidth(); i++) - { - wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j ); - if (bpp == 1) - { - if (pixel == 0) - { - data[pos] = 0; - data[pos+1] = 0; - data[pos+2] = 0; - } - else - { - data[pos] = 255; - data[pos+1] = 255; - data[pos+2] = 255; - } - } - else if (use_shift) - { - data[pos] = (pixel >> red_shift_right) << red_shift_left; - data[pos+1] = (pixel >> green_shift_right) << green_shift_left; - data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; - } - else if (cmap->colors) - { - data[pos] = cmap->colors[pixel].red >> 8; - data[pos+1] = cmap->colors[pixel].green >> 8; - data[pos+2] = cmap->colors[pixel].blue >> 8; - } - else - { - wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); - } - - if (gdk_image_mask) - { - int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j ); - if (mask_pixel == 0) - { - data[pos] = 16; - data[pos+1] = 16; - data[pos+2] = 16; - } - } + wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); - pos += 3; - } + return false; } - gdk_image_destroy( gdk_image ); - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); + if (stream.IsSeekable() && !handler->CanRead(stream)) + { + wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype); + return false; + } + else + return handler->LoadFile( this, stream, true/*verbose*/, index ); } -#endif - -//----------------------------------------------------------------------------- -// Motif conversion routines -//----------------------------------------------------------------------------- - -#ifdef __WXMOTIF__ -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#include -#ifdef __VMS__ -#pragma message enable nosimpint -#endif -#include "wx/utils.h" -#include +bool wxImage::SaveFile( wxOutputStream& stream, int type ) const +{ + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); -/* + wxImageHandler *handler = FindHandler(type); + if ( !handler ) + { + wxLogWarning( _("No image handler for type %d defined."), type ); -Date: Wed, 05 Jan 2000 11:45:40 +0100 -From: Frits Boel -To: julian.smart@ukonline.co.uk -Subject: Patch for Motif ConvertToBitmap + return false; + } -Hi Julian, + return handler->SaveFile( (wxImage*)this, stream ); +} -I've been working on a wxWin application for image processing. From the -beginning, I was surprised by the (lack of) speed of ConvertToBitmap, -till I looked in the source code of image.cpp. I saw that converting a -wxImage to a bitmap with 8-bit pixels is done with comparing every pixel -to the 256 colors of the palet. A very time-consuming piece of code! +bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const +{ + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); -Because I wanted a faster application, I've made a 'patch' for this. In -short: every pixel of the image is compared to a sorted list with -colors. If the color is found in the list, the palette entry is -returned; if the color is not found, the color palette is searched and -then the palette entry is returned and the color added to the sorted -list. + wxImageHandler *handler = FindHandlerMime(mimetype); + if ( !handler ) + { + wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); -Maybe there is another method for this, namely changing the palette -itself (if the colors are known, as is the case with tiffs with a -colormap). I did not look at this, maybe someone else did? + return false; + } -The code of the patch is attached, have a look on it, and maybe you will -ship it with the next release of wxMotif? + return handler->SaveFile( (wxImage*)this, stream ); +} +#endif // wxUSE_STREAMS -Regards, +// ---------------------------------------------------------------------------- +// image I/O handlers +// ---------------------------------------------------------------------------- -Frits Boel -Software engineer at Hubrecht Laboratory, The Netherlands. +void wxImage::AddHandler( wxImageHandler *handler ) +{ + // Check for an existing handler of the type being added. + if (FindHandler( handler->GetType() ) == 0) + { + sm_handlers.Append( handler ); + } + else + { + // This is not documented behaviour, merely the simplest 'fix' + // for preventing duplicate additions. If someone ever has + // a good reason to add and remove duplicate handlers (and they + // may) we should probably refcount the duplicates. + // also an issue in InsertHandler below. -*/ + wxLogDebug( _T("Adding duplicate image handler for '%s'"), + handler->GetName().c_str() ); + delete handler; + } +} -class wxSearchColor +void wxImage::InsertHandler( wxImageHandler *handler ) { -public: - wxSearchColor( void ); - wxSearchColor( int size, XColor *colors ); - ~wxSearchColor( void ); + // Check for an existing handler of the type being added. + if (FindHandler( handler->GetType() ) == 0) + { + sm_handlers.Insert( handler ); + } + else + { + // see AddHandler for additional comments. + wxLogDebug( _T("Inserting duplicate image handler for '%s'"), + handler->GetName().c_str() ); + delete handler; + } +} - int SearchColor( int r, int g, int b ); -private: - int AddColor( unsigned int value, int pos ); +bool wxImage::RemoveHandler( const wxString& name ) +{ + wxImageHandler *handler = FindHandler(name); + if (handler) + { + sm_handlers.DeleteObject(handler); + delete handler; + return true; + } + else + return false; +} - int size; - XColor *colors; - unsigned int *color; - int *entry; +wxImageHandler *wxImage::FindHandler( const wxString& name ) +{ + wxList::compatibility_iterator node = sm_handlers.GetFirst(); + while (node) + { + wxImageHandler *handler = (wxImageHandler*)node->GetData(); + if (handler->GetName().Cmp(name) == 0) return handler; - int bottom; - int top; -}; + node = node->GetNext(); + } + return 0; +} -wxSearchColor::wxSearchColor( void ) +wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType ) { - size = 0; - colors = (XColor*) NULL; - color = (unsigned int *) NULL; - entry = (int*) NULL; + 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; + node = node->GetNext(); + } + return 0; +} - bottom = 0; - top = 0; +wxImageHandler *wxImage::FindHandler( long bitmapType ) +{ + wxList::compatibility_iterator node = sm_handlers.GetFirst(); + while (node) + { + wxImageHandler *handler = (wxImageHandler *)node->GetData(); + if (handler->GetType() == bitmapType) return handler; + node = node->GetNext(); + } + return 0; } -wxSearchColor::wxSearchColor( int size_, XColor *colors_ ) +wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype ) { - int i; - size = size_; - colors = colors_; - color = new unsigned int[size]; - entry = new int [size]; - - for (i = 0; i < size; i++ ) { - entry[i] = -1; + wxList::compatibility_iterator node = sm_handlers.GetFirst(); + while (node) + { + wxImageHandler *handler = (wxImageHandler *)node->GetData(); + if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler; + node = node->GetNext(); } - - bottom = top = ( size >> 1 ); + return 0; } -wxSearchColor::~wxSearchColor( void ) +void wxImage::InitStandardHandlers() { - if ( color ) delete color; - if ( entry ) delete entry; +#if wxUSE_STREAMS + AddHandler(new wxBMPHandler); +#endif // wxUSE_STREAMS } -int wxSearchColor::SearchColor( int r, int g, int b ) +void wxImage::CleanUpHandlers() { - unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b; - int begin = bottom; - int end = top; - int middle; - - while ( begin <= end ) { - - middle = ( begin + end ) >> 1; - - if ( value == color[middle] ) { - return( entry[middle] ); - } else if ( value < color[middle] ) { - end = middle - 1; - } else { - begin = middle + 1; + wxList::compatibility_iterator node = sm_handlers.GetFirst(); + while (node) + { + wxImageHandler *handler = (wxImageHandler *)node->GetData(); + wxList::compatibility_iterator next = node->GetNext(); + delete handler; + node = next; } - } - - return AddColor( value, middle ); + sm_handlers.Clear(); } -int wxSearchColor::AddColor( unsigned int value, int pos ) +wxString wxImage::GetImageExtWildcard() { - int i; - int pixel = -1; - int max = 3 * (65536); - for ( i = 0; i < 256; i++ ) { - int rdiff = ((value >> 8) & 0xFF00 ) - colors[i].red; - int gdiff = ((value ) & 0xFF00 ) - colors[i].green; - int bdiff = ((value << 8) & 0xFF00 ) - colors[i].blue; - int sum = abs (rdiff) + abs (gdiff) + abs (bdiff); - if (sum < max) { pixel = i; max = sum; } - } - - if ( entry[pos] < 0 ) { - color[pos] = value; - entry[pos] = pixel; - } else if ( value < color[pos] ) { - - if ( bottom > 0 ) { - for ( i = bottom; i < pos; i++ ) { - color[i-1] = color[i]; - entry[i-1] = entry[i]; - } - bottom--; - color[pos-1] = value; - entry[pos-1] = pixel; - } else if ( top < size-1 ) { - for ( i = top; i >= pos; i-- ) { - color[i+1] = color[i]; - entry[i+1] = entry[i]; - } - top++; - color[pos] = value; - entry[pos] = pixel; - } + wxString fmts; - } else { - - if ( top < size-1 ) { - for ( i = top; i > pos; i-- ) { - color[i+1] = color[i]; - entry[i+1] = entry[i]; - } - top++; - color[pos+1] = value; - entry[pos+1] = pixel; - } else if ( bottom > 0 ) { - for ( i = bottom; i < pos; i++ ) { - color[i-1] = color[i]; - entry[i-1] = entry[i]; - } - bottom--; - color[pos] = value; - entry[pos] = pixel; + wxList& Handlers = wxImage::GetHandlers(); + wxList::compatibility_iterator Node = Handlers.GetFirst(); + while ( Node ) + { + wxImageHandler* Handler = (wxImageHandler*)Node->GetData(); + fmts += wxT("*.") + Handler->GetExtension(); + Node = Node->GetNext(); + if ( Node ) fmts += wxT(";"); } - } - - return( pixel ); + return wxT("(") + fmts + wxT(")|") + fmts; } -wxBitmap wxImage::ConvertToBitmap() const +wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb) { - wxBitmap bitmap; - - wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); - - int width = GetWidth(); - int height = GetHeight(); - - bitmap.SetHeight( height ); - bitmap.SetWidth( width ); - - Display *dpy = (Display*) wxGetDisplay(); - Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); - int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) ); - - // Create image + const double red = rgb.red / 255.0, + green = rgb.green / 255.0, + blue = rgb.blue / 255.0; - XImage *data_image = XCreateImage( dpy, vis, bpp, ZPixmap, 0, 0, width, height, 32, 0 ); - data_image->data = (char*) malloc( data_image->bytes_per_line * data_image->height ); + // 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; - bitmap.Create( width, height, bpp ); - - // Create mask - - XImage *mask_image = (XImage*) NULL; - if (HasMask()) + enum { RED, GREEN, BLUE } chMax = RED; + double maximumRGB = red; + if ( green > maximumRGB ) { - mask_image = XCreateImage( dpy, vis, 1, ZPixmap, 0, 0, width, height, 32, 0 ); - mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height ); + chMax = GREEN; + maximumRGB = green; } - - // Retrieve depth info - - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = vis; - vinfo_template.visualid = XVisualIDFromVisual( vis ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - - wxCHECK_MSG( vi, wxNullBitmap, wxT("no visual") ); - - XFree( vi ); - - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; - if (bpp < 8) bpp = 8; - - // Render - - enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; - byte_order b_o = RGB; - - if (bpp >= 24) + if ( blue > maximumRGB ) { - if ((vi->red_mask > vi->green_mask) && (vi->green_mask > vi->blue_mask)) b_o = RGB; - else if ((vi->red_mask > vi->blue_mask) && (vi->blue_mask > vi->green_mask)) b_o = RGB; - else if ((vi->blue_mask > vi->red_mask) && (vi->red_mask > vi->green_mask)) b_o = BRG; - else if ((vi->blue_mask > vi->green_mask) && (vi->green_mask > vi->red_mask)) b_o = BGR; - else if ((vi->green_mask > vi->red_mask) && (vi->red_mask > vi->blue_mask)) b_o = GRB; - else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask)) b_o = GBR; + chMax = BLUE; + maximumRGB = blue; } - int r_mask = GetMaskRed(); - int g_mask = GetMaskGreen(); - int b_mask = GetMaskBlue(); + const double value = maximumRGB; - XColor colors[256]; - if (bpp == 8) + double hue = 0.0, saturation; + const double deltaRGB = maximumRGB - minimumRGB; + if ( wxIsNullDouble(deltaRGB) ) { - Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy ); - - for (int i = 0; i < 256; i++) colors[i].pixel = i; - XQueryColors( dpy, cmap, colors, 256 ); + // Gray has no color + hue = 0.0; + saturation = 0.0; } - - wxSearchColor scolor( 256, colors ); - unsigned char* data = GetData(); - - bool hasMask = HasMask(); - - int index = 0; - for (int y = 0; y < height; y++) + else { - for (int x = 0; x < width; x++) + switch ( chMax ) { - int r = data[index]; - index++; - int g = data[index]; - index++; - int b = data[index]; - index++; - - if (hasMask) - { - if ((r == r_mask) && (b == b_mask) && (g == g_mask)) - XPutPixel( mask_image, x, y, 0 ); - else - XPutPixel( mask_image, x, y, 1 ); - } - - switch (bpp) - { - case 8: - { -#if 0 // Old, slower code - int pixel = -1; - /* - if (wxTheApp->m_colorCube) - { - pixel = wxTheApp->m_colorCube - [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; - } - else - { - */ - int max = 3 * (65536); - for (int i = 0; i < 256; i++) - { - int rdiff = (r << 8) - colors[i].red; - int gdiff = (g << 8) - colors[i].green; - int bdiff = (b << 8) - colors[i].blue; - int sum = abs (rdiff) + abs (gdiff) + abs (bdiff); - if (sum < max) { pixel = i; max = sum; } - } - /* - } - */ -#endif - - // And this is all to get the 'right' color... - int pixel = scolor.SearchColor( r, g, b ); - XPutPixel( data_image, x, y, pixel ); - break; - } - case 15: - { - int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); - XPutPixel( data_image, x, y, pixel ); - break; - } - case 16: - { - int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); - XPutPixel( data_image, x, y, pixel ); - break; - } - case 32: - case 24: - { - int pixel = 0; - switch (b_o) - { - case RGB: pixel = (r << 16) | (g << 8) | b; break; - case RBG: pixel = (r << 16) | (b << 8) | g; break; - case BRG: pixel = (b << 16) | (r << 8) | g; break; - case BGR: pixel = (b << 16) | (g << 8) | r; break; - case GRB: pixel = (g << 16) | (r << 8) | b; break; - case GBR: pixel = (g << 16) | (b << 8) | r; break; - } - XPutPixel( data_image, x, y, pixel ); - } - default: break; - } - } // for - } // for - - // Blit picture - - XGCValues gcvalues; - gcvalues.foreground = BlackPixel( dpy, DefaultScreen( dpy ) ); - GC gc = XCreateGC( dpy, RootWindow ( dpy, DefaultScreen(dpy) ), GCForeground, &gcvalues ); - XPutImage( dpy, (Drawable)bitmap.GetPixmap(), gc, data_image, 0, 0, 0, 0, width, height ); + case RED: + hue = (green - blue) / deltaRGB; + break; - XDestroyImage( data_image ); - XFreeGC( dpy, gc ); + case GREEN: + hue = 2.0 + (blue - red) / deltaRGB; + break; - // Blit mask - if (HasMask()) - { - wxBitmap maskBitmap(width, height, 1); + case BLUE: + hue = 4.0 + (red - green) / deltaRGB; + break; - GC gcMask = XCreateGC( dpy, (Pixmap) maskBitmap.GetPixmap(), (XtGCMask) 0, (XGCValues*)NULL ); - XPutImage( dpy, (Drawable)maskBitmap.GetPixmap(), gcMask, mask_image, 0, 0, 0, 0, width, height ); - - XDestroyImage( mask_image ); - XFreeGC( dpy, gcMask ); + default: + wxFAIL_MSG(wxT("hue not specified")); + break; + } - wxMask* mask = new wxMask; - mask->SetPixmap(maskBitmap.GetPixmap()); + hue /= 6.0; - bitmap.SetMask(mask); + if ( hue < 0.0 ) + hue += 1.0; - maskBitmap.SetPixmapNull(); + saturation = deltaRGB / maximumRGB; } - return bitmap; + return HSVValue(hue, saturation, value); } -wxImage::wxImage( const wxBitmap &bitmap ) +wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv) { - wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") ); + double red, green, blue; - Display *dpy = (Display*) wxGetDisplay(); - Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); - int bpp = DefaultDepth( dpy, DefaultScreen( dpy ) ); - - XImage *ximage = XGetImage( dpy, - (Drawable)bitmap.GetPixmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight(), - AllPlanes, ZPixmap ); - - wxCHECK_RET( ximage, wxT("couldn't create image") ); - - Create( bitmap.GetWidth(), bitmap.GetHeight() ); - char unsigned *data = GetData(); - - if (!data) + if ( wxIsNullDouble(hsv.saturation) ) { - XDestroyImage( ximage ); - wxFAIL_MSG( wxT("couldn't create image") ); - return; + // Grey + red = hsv.value; + green = hsv.value; + blue = hsv.value; } - - /* - GdkImage *gdk_image_mask = (GdkImage*) NULL; - if (bitmap.GetMask()) + else // not grey { - gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); - - SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable - } - */ - - // Retrieve depth info + 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); - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = vis; - vinfo_template.visualid = XVisualIDFromVisual( vis ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); + 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; + } + } - wxCHECK_RET( vi, wxT("no visual") ); + return RGBValue((unsigned char)(red * 255.0), + (unsigned char)(green * 255.0), + (unsigned char)(blue * 255.0)); +} - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; +/* + * 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(); - XFree( vi ); + unsigned char *srcBytePtr; + unsigned char *dstBytePtr; + unsigned long count; + wxImage::HSVValue hsv; + wxImage::RGBValue rgb; - XColor colors[256]; - if (bpp == 8) + wxASSERT (angle >= -1.0 && angle <= 1.0); + count = M_IMGDATA->m_width * M_IMGDATA->m_height; + if ( count > 0 && !wxIsNullDouble(angle) ) { - Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy ); + srcBytePtr = M_IMGDATA->m_data; + dstBytePtr = srcBytePtr; + do + { + rgb.red = *srcBytePtr++; + rgb.green = *srcBytePtr++; + rgb.blue = *srcBytePtr++; + hsv = RGBtoHSV(rgb); - for (int i = 0; i < 256; i++) colors[i].pixel = i; - XQueryColors( dpy, cmap, colors, 256 ); + 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); } +} - long pos = 0; - for (int j = 0; j < bitmap.GetHeight(); j++) - { - for (int i = 0; i < bitmap.GetWidth(); i++) - { - int pixel = XGetPixel( ximage, i, j ); - if (bpp <= 8) - { - data[pos] = colors[pixel].red >> 8; - data[pos+1] = colors[pixel].green >> 8; - data[pos+2] = colors[pixel].blue >> 8; - } else if (bpp == 15) - { - data[pos] = (pixel >> 7) & 0xf8; - data[pos+1] = (pixel >> 2) & 0xf8; - data[pos+2] = (pixel << 3) & 0xf8; - } else if (bpp == 16) - { - data[pos] = (pixel >> 8) & 0xf8; - data[pos+1] = (pixel >> 3) & 0xfc; - data[pos+2] = (pixel << 3) & 0xf8; - } else - { - data[pos] = (pixel >> 16) & 0xff; - data[pos+1] = (pixel >> 8) & 0xff; - data[pos+2] = pixel & 0xff; - } +//----------------------------------------------------------------------------- +// wxImageHandler +//----------------------------------------------------------------------------- - /* - if (gdk_image_mask) - { - int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j ); - if (mask_pixel == 0) - { - data[pos] = 16; - data[pos+1] = 16; - data[pos+2] = 16; - } - } - */ +IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject) - pos += 3; - } - } +#if wxUSE_STREAMS +bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) ) +{ + return false; +} - XDestroyImage( ximage ); - /* - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); - */ +bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) ) +{ + return false; } -#endif -#ifdef __WXPM__ -// OS/2 Presentation manager conversion routings +int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) ) +{ + return 1; +} -wxBitmap wxImage::ConvertToBitmap() const +bool wxImageHandler::CanRead( const wxString& name ) { - if ( !Ok() ) - return wxNullBitmap; - wxBitmap bitmap; // remove -// TODO: -/* - int sizeLimit = 1024*768*3; - - // width and height of the device-dependent bitmap - int width = GetWidth(); - int bmpHeight = GetHeight(); - - // calc the number of bytes per scanline and padding - int bytePerLine = width*3; - int sizeDWORD = sizeof( DWORD ); - int lineBoundary = bytePerLine % sizeDWORD; - int padding = 0; - if( lineBoundary > 0 ) - { - padding = sizeDWORD - lineBoundary; - bytePerLine += padding; - } - // calc the number of DIBs and heights of DIBs - int numDIB = 1; - int hRemain = 0; - int height = sizeLimit/bytePerLine; - if( height >= bmpHeight ) - height = bmpHeight; - else + if (wxFileExists(name)) { - numDIB = bmpHeight / height; - hRemain = bmpHeight % height; - if( hRemain >0 ) numDIB++; - } - - // set bitmap parameters - wxBitmap bitmap; - wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); - bitmap.SetWidth( width ); - bitmap.SetHeight( bmpHeight ); - bitmap.SetDepth( wxDisplayDepth() ); - - // create a DIB header - int headersize = sizeof(BITMAPINFOHEADER); - LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); - wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") ); - // Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = (DWORD)width; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - // the general formula for biSizeImage: - // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height; - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - // These seem not really needed for our purpose here. - lpDIBh->bmiHeader.biClrImportant = 0; - lpDIBh->bmiHeader.biXPelsPerMeter = 0; - lpDIBh->bmiHeader.biYPelsPerMeter = 0; - // memory for DIB data - unsigned char *lpBits; - lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage ); - if( !lpBits ) - { - wxFAIL_MSG( wxT("could not allocate memory for DIB") ); - free( lpDIBh ); - return bitmap; - } - - // create and set the device-dependent bitmap - HDC hdc = ::GetDC(NULL); - HDC memdc = ::CreateCompatibleDC( hdc ); - HBITMAP hbitmap; - hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight ); - ::SelectObject( memdc, hbitmap); - - // copy image data into DIB data and then into DDB (in a loop) - unsigned char *data = GetData(); - int i, j, n; - int origin = 0; - unsigned char *ptdata = data; - unsigned char *ptbits; + wxImageFileInputStream stream(name); + return CanRead(stream); + } - for( n=0; n 1 && n == numDIB-1 && hRemain > 0 ) - { - // redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - height = hRemain; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - } - ptbits = lpBits; + wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() ); - for( j=0; jbmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS ); - // The above line is equivalent to the following two lines. - // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); - // ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS); - // or the following lines - // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); - // HDC memdc = ::CreateCompatibleDC( hdc ); - // ::SelectObject( memdc, hbitmap); - // ::SetDIBitsToDevice( memdc, 0, 0, width, height, - // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS); - // ::SelectObject( memdc, 0 ); - // ::DeleteDC( memdc ); - } - bitmap.SetHBITMAP( (WXHBITMAP) hbitmap ); - - // similarly, created an mono-bitmap for the possible mask - if( HasMask() ) - { - hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL ); - ::SelectObject( memdc, hbitmap); - if( numDIB == 1 ) height = bmpHeight; - else height = sizeLimit/bytePerLine; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - origin = 0; - unsigned char r = GetMaskRed(); - unsigned char g = GetMaskGreen(); - unsigned char b = GetMaskBlue(); - unsigned char zero = 0, one = 255; - ptdata = data; - for( n=0; n 1 && n == numDIB - 1 && hRemain > 0 ) - { - // redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - height = hRemain; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - } - ptbits = lpBits; - for( int j=0; jSetMaskBitmap( (WXHBITMAP) hbitmap ); - bitmap.SetMask( mask ); - } - - // free allocated resources - ::SelectObject( memdc, 0 ); - ::DeleteDC( memdc ); - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); - - // check the wxBitmap object - if( bitmap.GetHBITMAP() ) - bitmap.SetOk( TRUE ); - else - bitmap.SetOk( FALSE ); -*/ - return bitmap; + return false; } -wxImage::wxImage( const wxBitmap &bitmap ) +bool wxImageHandler::CallDoCanRead(wxInputStream& stream) { - // check the bitmap - if( !bitmap.Ok() ) + wxFileOffset posOld = stream.TellI(); + if ( posOld == wxInvalidOffset ) { - wxFAIL_MSG( wxT("invalid bitmap") ); - return; + // can't test unseekable stream + return false; } - // create an wxImage object - int width = bitmap.GetWidth(); - int height = bitmap.GetHeight(); - Create( width, height ); - unsigned char *data = GetData(); - if( !data ) - { - wxFAIL_MSG( wxT("could not allocate data for image") ); - return; - } + bool ok = DoCanRead(stream); - // calc the number of bytes per scanline and padding in the DIB - int bytePerLine = width*3; - int sizeDWORD = sizeof( DWORD ); - int lineBoundary = bytePerLine % sizeDWORD; - int padding = 0; - if( lineBoundary > 0 ) - { - padding = sizeDWORD - lineBoundary; - bytePerLine += padding; - } -// TODO: -/* - // create a DIB header - int headersize = sizeof(BITMAPINFOHEADER); - LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); - if( !lpDIBh ) + // restore the old position to be able to test other formats and so on + if ( stream.SeekI(posOld) == wxInvalidOffset ) { - wxFAIL_MSG( wxT("could not allocate data for DIB header") ); - free( data ); - return; - } - // Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = width; - lpDIBh->bmiHeader.biHeight = -height; - lpDIBh->bmiHeader.biSizeImage = bytePerLine * height; - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - // These seem not really needed for our purpose here. - lpDIBh->bmiHeader.biClrImportant = 0; - lpDIBh->bmiHeader.biXPelsPerMeter = 0; - lpDIBh->bmiHeader.biYPelsPerMeter = 0; - // memory for DIB data - unsigned char *lpBits; - lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage ); - if( !lpBits ) - { - wxFAIL_MSG( wxT("could not allocate data for DIB") ); - free( data ); - free( lpDIBh ); - return; + wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!")); + + // reading would fail anyhow as we're not at the right position + return false; } - // copy data from the device-dependent bitmap to the DIB - HDC hdc = ::GetDC(NULL); - HBITMAP hbitmap; - hbitmap = (HBITMAP) bitmap.GetHBITMAP(); - ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); + return ok; +} + +#endif // wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// image histogram stuff +// ---------------------------------------------------------------------------- - // copy DIB data into the wxImage object - int i, j; - unsigned char *ptdata = data; - unsigned char *ptbits = lpBits; - for( i=0; iGetMaskBitmap() ) - { - hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap(); - // memory DC created, color set, data copied, and memory DC deleted - HDC memdc = ::CreateCompatibleDC( hdc ); - ::SetTextColor( memdc, RGB( 0, 0, 0 ) ); - ::SetBkColor( memdc, RGB( 255, 255, 255 ) ); - ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); - ::DeleteDC( memdc ); - // background color set to RGB(16,16,16) in consistent with wxGTK - unsigned char r=16, g=16, b=16; - ptdata = data; - ptbits = lpBits; - for( i=0; i= 255 ) { - for( j=0; j= 255 ) { - if( *ptbits != 0 ) - ptdata += 3; - else + g2 = 0; + b2++; + if ( b2 >= 255 ) { - *(ptdata++) = r; - *(ptdata++) = g; - *(ptdata++) = b; + wxLogError(_("No unused colour in image.") ); + return false; } - ptbits += 3; } - ptbits += padding; } - SetMaskColour( r, g, b ); - SetMask( TRUE ); - } - else - { - SetMask( FALSE ); + + key = MakeKey(r2, g2, b2); } - // free allocated resources - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); -*/ -} -#endif + if ( r ) + *r = r2; + if ( g ) + *g = g2; + if ( b ) + *b = b2; -// A module to allow wxImage initialization/cleanup -// without calling these functions from app.cpp or from -// the user's application. + return true; +} -class wxImageModule: public wxModule +bool +wxImage::FindFirstUnusedColour(unsigned char *r, + unsigned char *g, + unsigned char *b, + unsigned char r2, + unsigned char b2, + unsigned char g2) const { -DECLARE_DYNAMIC_CLASS(wxImageModule) -public: - wxImageModule() {} - bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; }; - void OnExit() { wxImage::CleanUpHandlers(); }; -}; + wxImageHistogram histogram; -IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule) + ComputeHistogram(histogram); + + return histogram.FindFirstUnusedColour(r, g, b, r2, g2, b2); +} -//----------------------------------------------------------------------------- // GRG, Dic/99 // Counts and returns the number of different colours. Optionally stops @@ -2601,11 +2722,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule) // less, in this case it would be invoked as CountColours(256)). Default // value for stopafter is -1 (don't care). // -unsigned long wxImage::CountColours( unsigned long stopafter ) +unsigned long wxImage::CountColours( unsigned long stopafter ) const { wxHashTable h; wxObject dummy; - unsigned char r, g, b, *p; + unsigned char r, g, b; + unsigned char *p; unsigned long size, nentries, key; p = GetData(); @@ -2617,7 +2739,7 @@ unsigned long wxImage::CountColours( unsigned long stopafter ) r = *(p++); g = *(p++); b = *(p++); - key = (r << 16) | (g << 8) | b; + key = wxImageHistogram::MakeKey(r, g, b); if (h.Get(key) == NULL) { @@ -2630,42 +2752,26 @@ unsigned long wxImage::CountColours( unsigned long stopafter ) } -// GRG, Dic/99 -// Computes the histogram of the image and fills a hash table, indexed -// with integer keys built as 0xRRGGBB, containing wxHNode objects. Each -// wxHNode contains an 'index' (useful to build a palette with the image -// colours) and a 'value', which is the number of pixels in the image with -// that colour. -// -unsigned long wxImage::ComputeHistogram( wxHashTable &h ) +unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const { - unsigned char r, g, b, *p; - unsigned long size, nentries, key; - wxHNode *hnode; + unsigned char *p = GetData(); + unsigned long nentries = 0; - p = GetData(); - size = GetWidth() * GetHeight(); - nentries = 0; + h.clear(); - for (unsigned long j = 0; j < size; j++) - { - r = *(p++); - g = *(p++); - b = *(p++); - key = (r << 16) | (g << 8) | b; + const unsigned long size = GetWidth() * GetHeight(); - hnode = (wxHNode *) h.Get(key); + unsigned char r, g, b; + for ( unsigned long n = 0; n < size; n++ ) + { + r = *p++; + g = *p++; + b = *p++; - if (hnode) - hnode->value++; - else - { - hnode = new wxHNode(); - hnode->index = nentries++; - hnode->value = 1; + wxImageHistogramEntry& entry = h[wxImageHistogram::MakeKey(r, g, b)]; - h.Put(key, (wxObject *)hnode); - } + if ( entry.value++ == 0 ) + entry.index = nentries++; } return nentries; @@ -2710,14 +2816,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i int i; angle = -angle; // screen coordinates are a mirror image of "real" coordinates + bool has_alpha = HasAlpha(); + // Create pointer-based array to accelerate access to wxImage's data unsigned char ** data = new unsigned char * [GetHeight()]; - data[0] = GetData(); - for (i = 1; i < GetHeight(); i++) data[i] = data[i - 1] + (3 * GetWidth()); + // Same for alpha channel + unsigned char ** alpha = NULL; + if (has_alpha) + { + alpha = new unsigned char * [GetHeight()]; + alpha[0] = GetAlpha(); + for (i = 1; i < GetHeight(); i++) + alpha[i] = alpha[i - 1] + GetWidth(); + } + // precompute coefficients for rotation formula // (sine and cosine of the angle) const double cos_angle = cos(angle); @@ -2734,16 +2850,20 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0); wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), 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))); - wxImage rotated (x2 - x1 + 1, y2 - y1 + 1); + // Create rotated image + 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 @@ -2752,6 +2872,10 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i // unsigned char * dst = rotated.GetData(); + unsigned char * alpha_dst = NULL; + if (has_alpha) + alpha_dst = rotated.GetAlpha(); + // GRG: if the original image has a mask, use its RGB values // as the blank pixel, else, fall back to default (black). // @@ -2781,7 +2905,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i { for (x = 0; x < rotated.GetWidth(); x++) { - wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + wxRealPoint src = rotated_point (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) @@ -2789,8 +2913,6 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i // 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) @@ -2837,28 +2959,40 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i unsigned char *p = data[y1] + (3 * x1); *(dst++) = *(p++); *(dst++) = *(p++); - *(dst++) = *(p++); + *(dst++) = *p; + + if (has_alpha) + *(alpha_dst++) = *(alpha[y1] + x1); } else if (d2 < gs_Epsilon) { unsigned char *p = data[y1] + (3 * x2); *(dst++) = *(p++); *(dst++) = *(p++); - *(dst++) = *(p++); + *(dst++) = *p; + + if (has_alpha) + *(alpha_dst++) = *(alpha[y1] + x2); } else if (d3 < gs_Epsilon) { unsigned char *p = data[y2] + (3 * x2); *(dst++) = *(p++); *(dst++) = *(p++); - *(dst++) = *(p++); + *(dst++) = *p; + + if (has_alpha) + *(alpha_dst++) = *(alpha[y2] + x2); } else if (d4 < gs_Epsilon) { unsigned char *p = data[y2] + (3 * x1); *(dst++) = *(p++); *(dst++) = *(p++); - *(dst++) = *(p++); + *(dst++) = *p; + + if (has_alpha) + *(alpha_dst++) = *(alpha[y2] + x1); } else { @@ -2881,9 +3015,22 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i w3 * *(v3++) + w4 * *(v4++)) / (w1 + w2 + w3 + w4) ); *(dst++) = (unsigned char) - ( (w1 * *(v1++) + w2 * *(v2++) + - w3 * *(v3++) + w4 * *(v4++)) / + ( (w1 * *v1 + w2 * *v2 + + w3 * *v3 + w4 * *v4) / (w1 + w2 + w3 + w4) ); + + if (has_alpha) + { + v1 = alpha[y1] + (x1); + v2 = alpha[y1] + (x2); + v3 = alpha[y2] + (x2); + v4 = alpha[y2] + (x1); + + *(alpha_dst++) = (unsigned char) + ( (w1 * *v1 + w2 * *v2 + + w3 * *v3 + w4 * *v4) / + (w1 + w2 + w3 + w4) ); + } } } else @@ -2891,6 +3038,9 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i *(dst++) = blank_r; *(dst++) = blank_g; *(dst++) = blank_b; + + if (has_alpha) + *(alpha_dst++) = 0; } } } @@ -2901,7 +3051,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i { for (x = 0; x < rotated.GetWidth(); x++) { - wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + wxRealPoint src = rotated_point (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 @@ -2912,13 +3062,19 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i unsigned char *p = data[ys] + (3 * xs); *(dst++) = *(p++); *(dst++) = *(p++); - *(dst++) = *(p++); + *(dst++) = *p; + + if (has_alpha) + *(alpha_dst++) = *(alpha[ys] + (xs)); } else { *(dst++) = blank_r; *(dst++) = blank_g; *(dst++) = blank_b; + + if (has_alpha) + *(alpha_dst++) = 255; } } } @@ -2926,6 +3082,30 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i delete [] data; + if (has_alpha) + delete [] alpha; + return rotated; } + + + + +// A module to allow wxImage initialization/cleanup +// without calling these functions from app.cpp or from +// the user's application. + +class wxImageModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxImageModule) +public: + wxImageModule() {} + bool OnInit() { wxImage::InitStandardHandlers(); return true; }; + void OnExit() { wxImage::CleanUpHandlers(); }; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule) + + +#endif // wxUSE_IMAGE