X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac57418f39e9671c18b99942180563146625d3ae..33754c4d83c59b7523a6da0c4fb21079cb60301c:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index ab13cbfbd4..ee46631c93 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -15,17 +15,31 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#include "wx/defs.h" + +#if wxUSE_IMAGE + #include "wx/image.h" #include "wx/bitmap.h" #include "wx/debug.h" #include "wx/log.h" -#ifdef wxUSE_LIBPNG -#include "../png/png.h" -#endif +#include "wx/app.h" #include "wx/filefn.h" +#include "wx/wfstream.h" +#include "wx/intl.h" +#include "wx/module.h" + +// For memcpy +#include +#include + +#ifdef __SALFORDC__ + #undef FAR +#endif + //----------------------------------------------------------------------------- // wxImage @@ -33,20 +47,25 @@ class wxImageRefData: public wxObjectRefData { - public: - wxImageRefData(void); - ~wxImageRefData(void); - - int m_width; - int m_height; - unsigned char *m_data; - bool m_hasMask; - unsigned char m_maskRed,m_maskGreen,m_maskBlue; - bool m_ok; + wxImageRefData(); + ~wxImageRefData(); + + int m_width; + int m_height; + unsigned char *m_data; + bool m_hasMask; + unsigned char m_maskRed,m_maskGreen,m_maskBlue; + bool m_ok; + bool m_static; +#if wxUSE_PALETTE + wxPalette m_palette; +#endif // wxUSE_PALETTE + wxArrayString m_optionNames; + wxArrayString m_optionValues; }; -wxImageRefData::wxImageRefData(void) +wxImageRefData::wxImageRefData() { m_width = 0; m_height = 0; @@ -56,22 +75,24 @@ wxImageRefData::wxImageRefData(void) m_maskGreen = 0; m_maskBlue = 0; m_hasMask = FALSE; + m_static = FALSE; } -wxImageRefData::~wxImageRefData(void) +wxImageRefData::~wxImageRefData() { - if (m_data) free( m_data ); + if (m_data && !m_static) + free( m_data ); } wxList wxImage::sm_handlers; +wxImage wxNullImage; + //----------------------------------------------------------------------------- #define M_IMGDATA ((wxImageRefData *)m_refData) -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) -#endif wxImage::wxImage() { @@ -82,33 +103,77 @@ wxImage::wxImage( int width, int height ) Create( width, height ); } +wxImage::wxImage( int width, int height, unsigned char* data, bool static_data ) +{ + Create( width, height, data, static_data ); +} + wxImage::wxImage( const wxString& name, long type ) { LoadFile( name, type ); } -wxImage::wxImage( const wxImage& image ) -{ - Ref(image); +wxImage::wxImage( const wxString& name, const wxString& mimetype ) +{ + LoadFile( name, mimetype ); +} + +#if wxUSE_STREAMS +wxImage::wxImage( wxInputStream& stream, long type ) +{ + LoadFile( stream, type ); +} + +wxImage::wxImage( wxInputStream& stream, const wxString& mimetype ) +{ + LoadFile( stream, mimetype ); +} +#endif // wxUSE_STREAMS + +wxImage::wxImage( const wxImage& image ) +{ + Ref(image); } -wxImage::wxImage( const wxImage* image ) -{ - if (image) Ref(*image); +wxImage::wxImage( const wxImage* image ) +{ + if (image) Ref(*image); } void wxImage::Create( int width, int height ) { + 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 + { + UnRef(); + } +} + +void wxImage::Create( int width, int height, unsigned char* data, bool static_data ) +{ + UnRef(); + + m_refData = new wxImageRefData(); + + M_IMGDATA->m_data = data; + if (M_IMGDATA->m_data) + { M_IMGDATA->m_width = width; M_IMGDATA->m_height = height; M_IMGDATA->m_ok = TRUE; + M_IMGDATA->m_static = static_data; } else { @@ -121,223 +186,906 @@ void wxImage::Destroy() UnRef(); } -wxImage wxImage::Scale( int width, int height ) +wxImage wxImage::Copy() const { wxImage image; - - wxCHECK_MSG( Ok(), image, "invlaid image" ); - - wxCHECK_MSG( (width > 0) && (height > 0), image, "invalid image size" ); - + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height ); + + char unsigned *data = image.GetData(); + + wxCHECK_MSG( data, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) + image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + + memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 ); + + return image; +} + +wxImage wxImage::Scale( int width, int height ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + // can't scale to/from 0 size + wxCHECK_MSG( (width > 0) && (height > 0), image, + wxT("invalid new image size") ); + + 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") ); + image.Create( width, height ); - + char unsigned *data = image.GetData(); - - wxCHECK_MSG( data, image, "unable to create image" ); - + + wxCHECK_MSG( data, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) + { + image.SetMaskColour( M_IMGDATA->m_maskRed, + M_IMGDATA->m_maskGreen, + M_IMGDATA->m_maskBlue ); + } + + char unsigned *source_data = M_IMGDATA->m_data; + char unsigned *target_data = data; + +#if 0 + // This is nonsense, RR. + + // We do (x, y) -> (x, y)*oldSize/newSize but the valid values of x and y + // are from 0 to size-1, hence all decrement the sizes + long old_old_width = old_width; + old_height--; + old_width--; + height--; + width--; + for ( long j = 0; j <= height; j++ ) + { + // don't crash for images with height == 1 + long y_offset = height ? (j * old_height / height)* old_old_width : 0; + + for ( long i = 0; i <= width; i++ ) + { + long x_offset = width ? (i * old_width) / width : 0; + + memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 ); + target_data += 3; + } + } +#else + for (long j = 0; j < height; j++) + { + 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; + } + } +#endif + + return image; +} + +wxImage wxImage::Rotate90( bool clockwise ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width ); + + char unsigned *data = image.GetData(); + + wxCHECK_MSG( data, image, wxT("unable to create image") ); + if (M_IMGDATA->m_hasMask) image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); - - double xscale = (double)width / (double)M_IMGDATA->m_width; - double yscale = (double)height / (double)M_IMGDATA->m_height; - - for (int j = 0; j < height; j++) + + long height = M_IMGDATA->m_height; + long width = M_IMGDATA->m_width; + + char unsigned *source_data = M_IMGDATA->m_data; + char unsigned *target_data; + + for (long j = 0; j < height; j++) { - for (int i = 0; i < width; i++) - { - int new_pos = 3*(j*width + i); - int old_pos = 3*((long)(j/yscale)*M_IMGDATA->m_width + (long)(i/xscale)); - data[ new_pos ] = M_IMGDATA->m_data[ old_pos ]; - data[ new_pos+1 ] = M_IMGDATA->m_data[ old_pos+1 ]; - data[ new_pos+2 ] = M_IMGDATA->m_data[ old_pos+2 ]; - } + for (long i = 0; i < width; i++) + { + if (clockwise) + target_data = data + (((i+1)*height) - j - 1)*3; + else + target_data = data + ((height*(width-1)) + j - (i*height))*3; + memcpy( target_data, source_data, 3 ); + source_data += 3; + } } - + return image; } - + +wxImage wxImage::Mirror( bool horizontally ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height ); + + char unsigned *data = image.GetData(); + + wxCHECK_MSG( data, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) + image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + + long height = M_IMGDATA->m_height; + long width = M_IMGDATA->m_width; + + char unsigned *source_data = M_IMGDATA->m_data; + char unsigned *target_data; + + if (horizontally) + { + 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; + } + } + } + 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 image; +} + +wxImage wxImage::GetSubImage( const wxRect &rect ) const +{ + 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") ); + + int subwidth=rect.GetWidth(); + const int subheight=rect.GetHeight(); + + image.Create( subwidth, subheight ); + + char unsigned *subdata = image.GetData(), *data=GetData(); + + wxCHECK_MSG( subdata, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) + image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + + const int subleft=3*rect.GetLeft(); + const int width=3*GetWidth(); + subwidth*=3; + + data+=rect.GetTop()*width+subleft; + + for (long j = 0; j < subheight; ++j) + { + memcpy( subdata, data, subwidth); + subdata+=subwidth; + data+=width; + } + + return image; +} + +void wxImage::Paste( const wxImage &image, int x, int y ) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( image.Ok(), wxT("invalid image") ); + + int xx = 0; + int yy = 0; + int width = image.GetWidth(); + int height = image.GetHeight(); + + if (x < 0) + { + xx = -x; + width += x; + } + if (y < 0) + { + yy = -y; + height += y; + } + + 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() && + (GetMaskRed()==image.GetMaskRed()) && + (GetMaskGreen()==image.GetMaskGreen()) && + (GetMaskBlue()==image.GetMaskBlue())))) + { + 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; + } + + if (!HasMask() && image.HasMask()) + { + unsigned char r = image.GetMaskRed(); + unsigned char g = image.GetMaskGreen(); + unsigned char b = image.GetMaskBlue(); + + 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; + } + } +} + +void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, + unsigned char r2, unsigned char g2, unsigned char b2 ) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); + + char unsigned *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; + } +} + +wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height ); + + char unsigned *data = image.GetData(); + + wxCHECK_MSG( data, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) + { + 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 ); + } + + long size = M_IMGDATA->m_height * M_IMGDATA->m_width; + + char unsigned *srcd = M_IMGDATA->m_data; + char unsigned *tard = image.GetData(); + + 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; +} + void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), "invalid image" ); - + wxCHECK_RET( Ok(), wxT("invalid image") ); + int w = M_IMGDATA->m_width; int h = M_IMGDATA->m_height; - - wxCHECK_RET( (x>=0) && (y>=0) && (x=0) && (y>=0) && (xm_data[ pos ] = r; M_IMGDATA->m_data[ pos+1 ] = g; M_IMGDATA->m_data[ pos+2 ] = b; } -unsigned char wxImage::GetRed( int x, int y ) +unsigned char wxImage::GetRed( int x, int y ) const { - wxCHECK_MSG( Ok(), 0, "invalid image" ); - + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + int w = M_IMGDATA->m_width; int h = M_IMGDATA->m_height; - - wxCHECK_MSG( (x>=0) && (y>=0) && (x=0) && (y>=0) && (xm_data[pos]; } -unsigned char wxImage::GetGreen( int x, int y ) +unsigned char wxImage::GetGreen( int x, int y ) const { - wxCHECK_MSG( Ok(), 0, "invalid image" ); - + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + int w = M_IMGDATA->m_width; int h = M_IMGDATA->m_height; + + wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data[pos+1]; +} + +unsigned char wxImage::GetBlue( int x, int y ) const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + int w = M_IMGDATA->m_width; + int h = M_IMGDATA->m_height; + + wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data[pos+2]; +} + +bool wxImage::Ok() 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; +} + +char unsigned *wxImage::GetData() const +{ + wxCHECK_MSG( Ok(), (char unsigned *)NULL, wxT("invalid image") ); + + return M_IMGDATA->m_data; +} + +void wxImage::SetData( char unsigned *data ) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); + + wxImageRefData *newRefData = new wxImageRefData(); + + 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; + + UnRef(); + + m_refData = newRefData; +} + +void wxImage::SetData( char unsigned *data, int new_width, int new_height ) +{ + wxImageRefData *newRefData = new wxImageRefData(); + + if (m_refData) + { + newRefData->m_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 + { + newRefData->m_width = new_width; + newRefData->m_height = new_height; + newRefData->m_data = data; + newRefData->m_ok = TRUE; + } + + UnRef(); + + m_refData = newRefData; +} + +void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) +{ + 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; +} + +unsigned char wxImage::GetMaskRed() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_maskRed; +} + +unsigned char wxImage::GetMaskGreen() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_maskGreen; +} + +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") ); + + M_IMGDATA->m_hasMask = mask; +} + +bool wxImage::HasMask() const +{ + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + + return M_IMGDATA->m_hasMask; +} + +int wxImage::GetWidth() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_width; +} + +int wxImage::GetHeight() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return M_IMGDATA->m_height; +} + + +bool wxImage::FindFirstUnusedColour( + unsigned char *r, unsigned char *g, unsigned char *b, + unsigned char startR, unsigned char startG, unsigned char startB) +{ + wxHashTable hTable; + unsigned long key; + + ComputeHistogram( hTable ); - wxCHECK_MSG( (x>=0) && (y>=0) && (x= 255 ) + { + r2 = 0; + g2++; + if ( g2 >= 255 ) + { + g2 = 0; + b2++; + if ( b2 >= 255 ) + { + wxLogError( _("GetUnusedColour:: No Unused Color in image ") ); + return FALSE; + } + } + } + + key = (r2 << 16) | (g2 << 8) | b2; + } - return M_IMGDATA->m_data[pos+1]; + if (r) *r = r2; + if (g) *g = g2; + if (b) *b = b2; + + return TRUE; +} + + +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; + } + + // find unused colour + unsigned char r,g,b ; + if (!FindFirstUnusedColour(&r, &g, &b)) + { + wxLogError( _("No Unused Color in image being masked") ); + return FALSE ; + } + + char unsigned *imgdata = GetData(); + char unsigned *maskdata = mask.GetData(); + + const int w = GetWidth(); + const int h = GetHeight(); + + 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; + } + } + + SetMaskColour(r, g, b); + SetMask(TRUE); + + return TRUE; +} + +#if wxUSE_PALETTE + +// Palette functions + +bool wxImage::HasPalette() const +{ + if (!Ok()) + return FALSE; + + return M_IMGDATA->m_palette.Ok(); +} + +const wxPalette& wxImage::GetPalette() const +{ + wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") ); + + return M_IMGDATA->m_palette; +} + +void wxImage::SetPalette(const wxPalette& palette) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); + + M_IMGDATA->m_palette = palette; +} + +#endif // wxUSE_PALETTE + +// Option functions (arbitrary name/value mapping) +void wxImage::SetOption(const wxString& name, const wxString& value) +{ + wxCHECK_RET( Ok(), wxT("invalid image") ); + + 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; + } } -unsigned char wxImage::GetBlue( int x, int y ) +void wxImage::SetOption(const wxString& name, int value) { - wxCHECK_MSG( Ok(), 0, "invalid image" ); - - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; - - wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data[pos+2]; -} - -bool wxImage::Ok() const -{ - return (M_IMGDATA && M_IMGDATA->m_ok); + wxString valStr; + valStr.Printf(wxT("%d"), value); + SetOption(name, valStr); } -char unsigned *wxImage::GetData() const +wxString wxImage::GetOption(const wxString& name) const { - wxCHECK_MSG( Ok(), (char unsigned *)NULL, "invalid image" ); - - return M_IMGDATA->m_data; + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") ); + + int idx = M_IMGDATA->m_optionNames.Index(name, FALSE); + if (idx == wxNOT_FOUND) + return wxEmptyString; + else + return M_IMGDATA->m_optionValues[idx]; } -void wxImage::SetData( char unsigned *WXUNUSED(data) ) +int wxImage::GetOptionInt(const wxString& name) const { - wxCHECK_RET( Ok(), "invalid image" ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + + return wxAtoi(GetOption(name)); } -void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) +bool wxImage::HasOption(const wxString& name) const { - wxCHECK_RET( Ok(), "invalid image" ); - - M_IMGDATA->m_maskRed = r; - M_IMGDATA->m_maskGreen = g; - M_IMGDATA->m_maskBlue = b; - M_IMGDATA->m_hasMask = TRUE; + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + + return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND); } -unsigned char wxImage::GetMaskRed() const +bool wxImage::LoadFile( const wxString& filename, long type ) { - wxCHECK_MSG( Ok(), 0, "invalid image" ); - - return M_IMGDATA->m_maskRed; +#if wxUSE_STREAMS + if (wxFileExists(filename)) + { + wxFileInputStream stream(filename); + wxBufferedInputStream bstream( stream ); + return LoadFile(bstream, type); + } + else + { + wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() ); + + return FALSE; + } +#else // !wxUSE_STREAMS + return FALSE; +#endif // wxUSE_STREAMS } -unsigned char wxImage::GetMaskGreen() const +bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype ) { - wxCHECK_MSG( Ok(), 0, "invalid image" ); - - return M_IMGDATA->m_maskGreen; +#if wxUSE_STREAMS + if (wxFileExists(filename)) + { + 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() ); + + return FALSE; + } +#else // !wxUSE_STREAMS + return FALSE; +#endif // wxUSE_STREAMS } -unsigned char wxImage::GetMaskBlue() const +bool wxImage::SaveFile( const wxString& filename, int type ) { - wxCHECK_MSG( Ok(), 0, "invalid image" ); - - return M_IMGDATA->m_maskBlue; +#if wxUSE_STREAMS + wxFileOutputStream stream(filename); + + if ( stream.LastError() == wxStream_NOERROR ) + { + wxBufferedOutputStream bstream( stream ); + return SaveFile(bstream, type); + } +#endif // wxUSE_STREAMS + + return FALSE; } - -void wxImage::SetMask( bool mask ) + +bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) { - wxCHECK_RET( Ok(), "invalid image" ); - - M_IMGDATA->m_hasMask = mask; +#if wxUSE_STREAMS + wxFileOutputStream stream(filename); + + if ( stream.LastError() == wxStream_NOERROR ) + { + wxBufferedOutputStream bstream( stream ); + return SaveFile(bstream, mimetype); + } +#endif // wxUSE_STREAMS + + return FALSE; } -bool wxImage::HasMask() const +bool wxImage::CanRead( const wxString &name ) { - wxCHECK_MSG( Ok(), FALSE, "invalid image" ); - - return M_IMGDATA->m_hasMask; +#if wxUSE_STREAMS + wxFileInputStream stream(name); + return CanRead(stream); +#else + return FALSE; +#endif } -int wxImage::GetWidth() const -{ - wxCHECK_MSG( Ok(), 0, "invalid image" ); - - return M_IMGDATA->m_width; -} +#if wxUSE_STREAMS -int wxImage::GetHeight() const -{ - wxCHECK_MSG( Ok(), 0, "invalid image" ); - - return M_IMGDATA->m_height; +bool wxImage::CanRead( wxInputStream &stream ) +{ + wxList &list=GetHandlers(); + + for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() ) + { + wxImageHandler *handler=(wxImageHandler*)node->GetData(); + if (handler->CanRead( stream )) + return TRUE; + } + + return FALSE; } -bool wxImage::LoadFile( const wxString& filename, long type ) +bool wxImage::LoadFile( wxInputStream& stream, long type ) { UnRef(); - - if (!wxFileExists(filename)) + + m_refData = new wxImageRefData; + + wxImageHandler *handler; + + if (type==wxBITMAP_TYPE_ANY) + { + wxList &list=GetHandlers(); + + for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() ) + { + handler=(wxImageHandler*)node->GetData(); + if (handler->CanRead( stream )) + return handler->LoadFile( this, stream ); + + } + + wxLogWarning( _("No handler found for image type.") ); + return FALSE; + } + + handler = FindHandler(type); + + if (handler == NULL) { - wxLogWarning( "Image file does not exist." ); + wxLogWarning( _("No image handler for type %d defined."), type ); return FALSE; } + return handler->LoadFile( this, stream ); +} + +bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype ) +{ + UnRef(); + m_refData = new wxImageRefData; - wxImageHandler *handler = FindHandler(type); + wxImageHandler *handler = FindHandlerMime(mimetype); - if (handler == NULL) + if (handler == NULL) { - wxLogWarning( "No image handler for type %d defined.", type ); + wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); return FALSE; } - return handler->LoadFile( this, filename ); + return handler->LoadFile( this, stream ); } -bool wxImage::SaveFile( const wxString& filename, int type ) +bool wxImage::SaveFile( wxOutputStream& stream, int type ) { - wxCHECK_MSG( Ok(), FALSE, "invalid image" ); - + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + wxImageHandler *handler = FindHandler(type); - if (handler == NULL) + if (handler == NULL) + { + wxLogWarning( _("No image handler for type %d defined."), type ); + + return FALSE; + } + + return handler->SaveFile( this, stream ); +} + +bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) +{ + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); + + wxImageHandler *handler = FindHandlerMime(mimetype); + + if (handler == NULL) { - wxLogWarning( "No image handler for type %d defined.", type ); + wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); - return FALSE; + return FALSE; } - return handler->SaveFile( this, filename ); + return handler->SaveFile( this, stream ); } +#endif // wxUSE_STREAMS void wxImage::AddHandler( wxImageHandler *handler ) { + // make sure that the memory will be freed at the program end + sm_handlers.DeleteContents(TRUE); + sm_handlers.Append( handler ); } void wxImage::InsertHandler( wxImageHandler *handler ) { + // make sure that the memory will be freed at the program end + sm_handlers.DeleteContents(TRUE); + sm_handlers.Insert( handler ); } @@ -359,7 +1107,8 @@ wxImageHandler *wxImage::FindHandler( const wxString& name ) while (node) { wxImageHandler *handler = (wxImageHandler*)node->Data(); - if (handler->GetName() == name) return handler; + if (handler->GetName().Cmp(name) == 0) return handler; + node = node->Next(); } return (wxImageHandler *)NULL; @@ -371,9 +1120,9 @@ wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType while (node) { wxImageHandler *handler = (wxImageHandler*)node->Data(); - if ( handler->GetExtension() == extension && + if ( (handler->GetExtension().Cmp(extension) == 0) && (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; + return handler; node = node->Next(); } return (wxImageHandler*)NULL; @@ -391,11 +1140,23 @@ wxImageHandler *wxImage::FindHandler( long bitmapType ) return NULL; } +wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype ) +{ + wxNode *node = sm_handlers.First(); + while (node) + { + wxImageHandler *handler = (wxImageHandler *)node->Data(); + if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler; + node = node->Next(); + } + return NULL; +} + void wxImage::InitStandardHandlers() { - AddHandler( new wxBMPHandler ); -#ifdef wxUSE_LIBPNG - AddHandler( new wxPNGHandler ); + AddHandler(new wxBMPHandler); +#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__) + AddHandler(new wxXPMHandler); #endif } @@ -416,1091 +1177,427 @@ void wxImage::CleanUpHandlers() // wxImageHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxImageHandler,wxObject) -#endif +IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject) -bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), const wxString& WXUNUSED(name) ) +#if wxUSE_STREAMS +bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) ) { return FALSE; } -bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), const wxString& WXUNUSED(name) ) +bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) ) { return FALSE; } -//----------------------------------------------------------------------------- -// wxPNGHandler -//----------------------------------------------------------------------------- - -#ifdef wxUSE_LIBPNG - -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) -#endif - -bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name ) -{ - FILE *f; - png_structp png_ptr; - png_infop info_ptr; - unsigned char *ptr, **lines, *ptr2; - int transp,bit_depth,color_type,interlace_type; - png_uint_32 width, height; - unsigned int i; - - image->Destroy(); - - transp = 0; - png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if (!png_ptr) return FALSE; - - info_ptr = png_create_info_struct( png_ptr ); - if (!info_ptr) - { - png_destroy_read_struct( &png_ptr, NULL, NULL ); - return FALSE; - } - - if (setjmp(png_ptr->jmpbuf)) - { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - - f = fopen( name, "rb" ); - png_init_io( png_ptr, f ); - - png_read_info( png_ptr, info_ptr ); - png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL ); - - if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_expand( png_ptr ); - - png_set_strip_16( png_ptr ); - png_set_packing( png_ptr ); - if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_expand( png_ptr ); - png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); - - image->Create( width, height ); - - if (!image->Ok()) - { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - - lines = (unsigned char **)malloc( height * sizeof(unsigned char *) ); - if (lines == NULL) - { - image->Destroy(); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - - for (i = 0; i < height; i++) - { - if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL) - { - image->Destroy(); - for (unsigned int n = 0; n < i; n++) free( lines[n] ); - free( lines ); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - } - - png_read_image( png_ptr, lines ); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - ptr = image->GetData(); - if ((color_type == PNG_COLOR_TYPE_GRAY) || - (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) - { - for (unsigned int y = 0; y < height; y++) - { - ptr2 = lines[y]; - for (unsigned int x = 0; x < width; x++) - { - unsigned char r = *ptr2++; - unsigned char a = *ptr2++; - if (a < 128) - { - *ptr++ = 255; - *ptr++ = 0; - *ptr++ = 255; - transp = 1; - } - else - { - *ptr++ = r; - *ptr++ = r; - *ptr++ = r; - } - } - } - } - else - { - for (unsigned int y = 0; y < height; y++) - { - ptr2 = lines[y]; - for (unsigned int x = 0; x < width; x++) - { - unsigned char r = *ptr2++; - unsigned char g = *ptr2++; - unsigned char b = *ptr2++; - unsigned char a = *ptr2++; - if (a < 128) - { - *ptr++ = 255; - *ptr++ = 0; - *ptr++ = 255; - transp = 1; - } - else - { - if ((r == 255) && (g == 0) && (b == 255)) r = 254; - *ptr++ = r; - *ptr++ = g; - *ptr++ = b; - } - } - } - } - for (i = 0; i < height; i++) free( lines[i] ); - free( lines ); - if (transp) - image->SetMaskColour( 255, 0, 255 ); - else - image->SetMask( FALSE ); - - return TRUE; +int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) ) +{ + return 1; } - -bool wxPNGHandler::SaveFile( wxImage *image, const wxString& name ) +bool wxImageHandler::CanRead( const wxString& name ) { - FILE *f = fopen( name, "wb" ); - if (f) - { - png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - { - fclose( f ); - return FALSE; - } - - png_infop info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - { - fclose(f); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; - } - - if (setjmp(png_ptr->jmpbuf)) - { - fclose( f ); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; - } - - png_init_io( png_ptr, f ); - png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), 8, - PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - png_color_8 sig_bit; - sig_bit.red = 8; - sig_bit.green = 8; - sig_bit.blue = 8; - sig_bit.alpha = 8; - png_set_sBIT( png_ptr, info_ptr, &sig_bit ); - png_write_info( png_ptr, info_ptr ); - png_set_shift( png_ptr, &sig_bit ); - png_set_packing( png_ptr ); - - unsigned char *data = (unsigned char *)malloc( image->GetWidth()*4 ); - if (!data) - { - fclose( f ); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; - } - - for (int y = 0; y < image->GetHeight(); y++) + if (wxFileExists(name)) { - unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3); - for (int x = 0; x < image->GetWidth(); x++) - { - data[(x << 2) + 0] = *ptr++; - data[(x << 2) + 1] = *ptr++; - data[(x << 2) + 2] = *ptr++; - if ((data[(x << 2) + 0] == image->GetMaskRed()) && - (data[(x << 2) + 1] == image->GetMaskGreen()) && - (data[(x << 2) + 2] == image->GetMaskBlue())) - data[(x << 2) + 3] = 0; - else - data[(x << 2) + 3] = 255; - } - png_bytep row_ptr = data; - png_write_rows( png_ptr, &row_ptr, 1 ); + wxFileInputStream stream(name); + return CanRead(stream); } - free(data); - png_write_end( png_ptr, info_ptr ); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - fclose(f); - } - return TRUE; + else { + wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() ); + + return FALSE; + } +// return FALSE; } -#endif +#endif // wxUSE_STREAMS + - // wxUSE_LIBPNG //----------------------------------------------------------------------------- -// wxBMPHandler +// wxBitmap convertion routines //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler) -#endif - -bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name ) -{ - FILE *file; - unsigned char *data, *ptr; - int done, i, bpp, planes, comp, ncolors, line, column, - linesize, linepos, rshift = 0, gshift = 0, bshift = 0; - unsigned char aByte; - short int word; - long int dbuf[4], dword, rmask = 0, gmask = 0, bmask = 0, offset, - size; - signed char bbuf[4]; - struct _cmap - { - unsigned char r, g, b; - } - *cmap = NULL; -#ifndef BI_RGB -#define BI_RGB 0 -#define BI_RLE8 1 -#define BI_RLE4 2 -#endif - -#ifndef BI_BITFIELDS -#define BI_BITFIELDS 3 -#endif +#if wxUSE_GUI - image->Destroy(); - - file = fopen(name, "r"); - if (!file) - return NULL; - - done = 0; - /* - * Reading the bmp header - */ - - fread(&bbuf, 1, 2, file); - - fread(dbuf, 4, 4, file); - - size = dbuf[0]; - offset = dbuf[2]; - - fread(dbuf, 4, 2, file); - int width = (int)dbuf[0]; - int height = (int)dbuf[1]; - if (width > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); - fclose(file); - return FALSE; - } - if (height > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); - fclose(file); - return FALSE; - } - fread(&word, 2, 1, file); - planes = (int)word; - fread(&word, 2, 1, file); - bpp = (int)word; - if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32) - { - fprintf(stderr, "IMLIB ERROR: unknown bitdepth in file\n"); - fclose(file); - return FALSE; - } - fread(dbuf, 4, 4, file); - comp = (int)dbuf[0]; - if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS) - { - fprintf(stderr, "IMLIB ERROR: unknown encoding in Windows BMP file\n"); - fclose(file); - return FALSE; - } - fread(dbuf, 4, 2, file); - ncolors = (int)dbuf[0]; - if (ncolors == 0) - ncolors = 1 << bpp; - /* some more sanity checks */ - if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32))) - { - fprintf(stderr, "IMLIB ERROR: encoding of BMP doesn't match bitdepth\n"); - fclose(file); - return FALSE; - } - if (bpp < 16) - { - cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors); - - if (!cmap) - { - fprintf(stderr, "IMLIB ERROR: Cannot allocate RAM for color map in BMP file\n"); - fclose(file); - return FALSE; - } - } - else - cmap = NULL; - - image->Create( width, height ); - ptr = image->GetData(); - if (!ptr) - { - fprintf(stderr, "IMLIB ERROR: Cannot allocate RAM for RGB data in file\n"); - fclose(file); - if (cmap) - free(cmap); - return FALSE; - } - - /* - * Reading the palette, if it exists. - */ - if (bpp < 16 && ncolors != 0) - { - for (i = 0; i < ncolors; i++) - { - fread(bbuf, 1, 4, file); - cmap[i].b = bbuf[0]; - cmap[i].g = bbuf[1]; - cmap[i].r = bbuf[2]; - } - } - else if (bpp == 16 || bpp == 32) - { - if (comp == BI_BITFIELDS) - { - int bit = 0; - - fread(dbuf, 4, 3, file); - bmask = dbuf[0]; - gmask = dbuf[1]; - rmask = dbuf[2]; - /* find shift amount.. ugly, but i can't think of a better way */ - for (bit = 0; bit < bpp; bit++) - { - if (bmask & (1 << bit)) - bshift = bit; - if (gmask & (1 << bit)) - gshift = bit; - if (rmask & (1 << bit)) - rshift = bit; - } - } - else if (bpp == 16) - { - rmask = 0x7C00; - gmask = 0x03E0; - bmask = 0x001F; - rshift = 10; - gshift = 5; - bshift = 0; - } - else if (bpp == 32) - { - rmask = 0x00FF0000; - gmask = 0x0000FF00; - bmask = 0x000000FF; - rshift = 16; - gshift = 8; - bshift = 0; - } - } - - /* - * REading the image data - */ - fseek(file, offset, SEEK_SET); - data = ptr; - - /* set the whole image to the background color */ - if (bpp < 16 && (comp == BI_RLE4 || comp == BI_RLE8)) - { - for (i = 0; i < width * height; i++) - { - *ptr++ = cmap[0].r; - *ptr++ = cmap[0].g; - *ptr++ = cmap[0].b; - } - ptr = data; - } - line = 0; - column = 0; -#define poffset (line * width * 3 + column * 3) - - /* - * BMPs are stored upside down... hmmmmmmmmmm.... - */ - - linesize = ((width * bpp + 31) / 32) * 4; - for (line = (height - 1); line >= 0; line--) - { - linepos = 0; - for (column = 0; column < width;) - { - if (bpp < 16) - { - int index; - - linepos++; - aByte = getc(file); - if (bpp == 1) - { - int bit = 0; - - for (bit = 0; bit < 8; bit++) - { - index = ((aByte & (0x80 >> bit)) ? 1 : 0); - ptr[poffset] = cmap[index].r; - ptr[poffset + 1] = cmap[index].g; - ptr[poffset + 2] = cmap[index].b; - column++; - } - } - else if (bpp == 4) - { - if (comp == BI_RLE4) - { - fprintf(stderr, "can't deal with 4bit encoded yet.\n"); - image->Destroy(); - free(cmap); - return FALSE; - } - else - { - int nibble = 0; - - for (nibble = 0; nibble < 2; nibble++) - { - index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4)); - if (index >= 16) - index = 15; - ptr[poffset] = cmap[index].r; - ptr[poffset + 1] = cmap[index].g; - ptr[poffset + 2] = cmap[index].b; - column++; - } - } - } - else if (bpp == 8) - { - if (comp == BI_RLE8) - { - unsigned char first; - - first = aByte; - aByte = getc(file); - if (first == 0) - { - if (aByte == 0) - { -/* column = width; */ - } - else if (aByte == 1) - { - column = width; - line = -1; - } - else if (aByte == 2) - { - aByte = getc(file); - column += aByte; - linepos = column * bpp / 8; - aByte = getc(file); - line += aByte; - } - else - { - int absolute = aByte; - - for (i = 0; i < absolute; i++) - { - linepos++; - aByte = getc(file); - ptr[poffset] = cmap[aByte].r; - ptr[poffset + 1] = cmap[aByte].g; - ptr[poffset + 2] = cmap[aByte].b; - column++; - } - if (absolute & 0x01) - aByte = getc(file); - } - } - else - { - for (i = 0; i < first; i++) - { - ptr[poffset] = cmap[aByte].r; - ptr[poffset + 1] = cmap[aByte].g; - ptr[poffset + 2] = cmap[aByte].b; - column++; - linepos++; - } - } - } - else - { - ptr[poffset] = cmap[aByte].r; - ptr[poffset + 1] = cmap[aByte].g; - ptr[poffset + 2] = cmap[aByte].b; - column++; - linepos += size; - } - } - } - else if (bpp == 24) - { - linepos += fread(&bbuf, 1, 3, file); - ptr[poffset] = (unsigned char)bbuf[2]; - ptr[poffset + 1] = (unsigned char)bbuf[1]; - ptr[poffset + 2] = (unsigned char)bbuf[0]; - column++; - } - else if (bpp == 16) - { - unsigned char temp; - - linepos += fread(&word, 2, 1, file); - temp = (word & rmask) >> rshift; - ptr[poffset] = temp; - temp = (word & gmask) >> gshift; - ptr[poffset + 1] = temp; - temp = (word & bmask) >> gshift; - ptr[poffset + 2] = temp; - column++; - } - else - { - unsigned char temp; - - linepos += fread(&dword, 4, 1, file); - temp = (dword & rmask) >> rshift; - ptr[poffset] = temp; - temp = (dword & gmask) >> gshift; - ptr[poffset + 1] = temp; - temp = (dword & bmask) >> bshift; - ptr[poffset + 2] = temp; - column++; - } - } - while ((linepos < linesize) && (comp != 1) && (comp != 2)) - { - int temp = fread(&aByte, 1, 1, file); - - linepos += temp; - if (!temp) - break; - } - } - if (cmap) free(cmap); - - image->SetMask( FALSE ); - - fclose(file); - return TRUE; +#ifdef __WXGTK__ +wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const +{ + wxImage mono = this->ConvertToMono( red, green, blue ); + wxBitmap bitmap( mono, 1 ); + return bitmap; } - -#ifdef __WXMSW__ +#endif wxBitmap wxImage::ConvertToBitmap() const { - - wxBitmap bitmap; - wxCHECK_MSG( Ok(), bitmap, "invalid image" ); - int width = GetWidth(); - int height = GetHeight(); - bitmap.SetWidth( width ); - bitmap.SetHeight( height ); - bitmap.SetDepth( wxDisplayDepth() ); - - int headersize = sizeof(BITMAPINFOHEADER); - LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); - wxCHECK_MSG( lpDIBh, bitmap, "could not allocate memory for DIB header" ); - -// Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = width; - lpDIBh->bmiHeader.biHeight = -height; - lpDIBh->bmiHeader.biSizeImage = width * height * 3; - - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - -// These seem not needed for our purpose here. -// lpDIBh->bmiHeader.biClrImportant = 0; -// lpDIBh->bmiHeader.biXPelsPerMeter = 0; -// lpDIBh->bmiHeader.biYPelsPerMeter = 0; - - unsigned char *lpBits = (unsigned char *) malloc( width*height*3 ); - if( !lpBits ) - { - wxFAIL_MSG( "could not allocate memory for DIB" ); - free( lpDIBh ); - return bitmap; - } - - unsigned char *data = GetData(); - - unsigned char *ptdata = data, *ptbits = lpBits; - for( int i=0; ibmiHeader), 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 ); - - if( HasMask() ) - { - unsigned char r = GetMaskRed(); - unsigned char g = GetMaskGreen(); - unsigned char b = GetMaskBlue(); - unsigned char zero = 0, one = 255; - ptdata = data; - ptbits = lpBits; - for( int i=0; iSetMaskBitmap( (WXHBITMAP) hbitmap ); - bitmap.SetMask( mask ); - -/* 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 ); -*/ - } - - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); - - if( bitmap.GetHBITMAP() ) - bitmap.SetOk( TRUE ); - else - bitmap.SetOk( FALSE ); - - return bitmap; + wxBitmap bitmap( *this ); + return bitmap; } - wxImage::wxImage( const wxBitmap &bitmap ) { - if( !bitmap.Ok() ) - { - wxFAIL_MSG( "invalid bitmap" ); - return; - } - - 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; - } - - 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 = width * height * 3; - - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - -// These seem not needed for our purpose here. -// lpDIBh->bmiHeader.biClrImportant = 0; -// lpDIBh->bmiHeader.biXPelsPerMeter = 0; -// lpDIBh->bmiHeader.biYPelsPerMeter = 0; - - unsigned char *lpBits = (unsigned char *) malloc( width*height*3 ); - if( !lpBits ) - { - wxFAIL_MSG( "could not allocate data for DIB" ); - free( data ); - free( lpDIBh ); - return; - } - - HBITMAP hbitmap; - hbitmap = (HBITMAP) bitmap.GetHBITMAP(); - HDC hdc = ::GetDC(NULL); - ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); - - unsigned char *ptdata = data, *ptbits = lpBits; - for( int i=0; iGetMaskBitmap() ) - { - hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap(); - 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 ); - unsigned char r=16, g=16, b=16; // background set to RGB(16,16,16) - ptdata = data; - ptbits = lpBits; - for( int i=0; i> 3)+8) * height ); + r = *(p++); + g = *(p++); + b = *(p++); + key = (r << 16) | (g << 8) | b; - mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); + hnode = (wxHNode *) h.Get(key); - wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); + if (hnode) + hnode->value++; + else + { + hnode = new wxHNode(); + hnode->index = nentries++; + hnode->value = 1; - bitmap.SetMask( mask ); + h.Put(key, (wxObject *)hnode); + } } - // Retrieve depth + return nentries; +} - GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); - if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); - int bpp = visual->depth; - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; - if (bpp < 8) bpp = 8; +/* + * Rotation code by Carlos Moreno + */ - // Render +// GRG: I've removed wxRotationPoint - we already have wxRealPoint which +// does exactly the same thing. And I also got rid of wxRotationPixel +// bacause of potential problems in architectures where alignment +// is an issue, so I had to rewrite parts of the code. - enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; - byte_order b_o = RGB; +static const double gs_Epsilon = 1e-10; - if (bpp >= 24) - { - GdkVisual *visual = gdk_visual_get_system(); - 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; - } +static inline int wxCint (double x) +{ + return (x > 0) ? (int) (x + 0.5) : (int) (x - 0.5); +} - int r_mask = GetMaskRed(); - int g_mask = GetMaskGreen(); - int b_mask = GetMaskBlue(); - unsigned char* data = GetData(); +// Auxiliary function to rotate a point (x,y) with respect to point p0 +// make it inline and use a straight return to facilitate optimization +// also, the function receives the sine and cosine of the angle to avoid +// repeating the time-consuming calls to these functions -- sin/cos can +// be computed and stored in the calling function. - int index = 0; - for (int y = 0; y < height; y++) - { - 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 ); - } - - switch (bpp) - { - case 8: - { - GdkColormap *cmap = gtk_widget_get_default_colormap(); - GdkColor *colors = cmap->colors; - int max = 3 * (65536); - int index = -1; - - 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) { index = i; max = sum; } - } +inline wxRealPoint rotated_point (const wxRealPoint & p, double cos_angle, double sin_angle, const wxRealPoint & p0) +{ + return wxRealPoint (p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle, + p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle); +} - gdk_image_put_pixel( data_image, x, y, index ); - - 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 - - // Blit picture - - GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() ); - - gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height ); - - gdk_image_destroy( data_image ); - gdk_gc_unref( data_gc ); - - // Blit mask +inline wxRealPoint rotated_point (double x, double y, double cos_angle, double sin_angle, const wxRealPoint & p0) +{ + return rotated_point (wxRealPoint(x,y), cos_angle, sin_angle, p0); +} - if (HasMask()) - { - GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() ); +wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool interpolating, wxPoint * offset_after_rotation) const +{ + int i; + angle = -angle; // screen coordinates are a mirror image of "real" coordinates - gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height ); + // Create pointer-based array to accelerate access to wxImage's data + unsigned char ** data = new unsigned char * [GetHeight()]; - gdk_image_destroy( mask_image ); - gdk_gc_unref( mask_gc ); - } + data[0] = GetData(); - return bitmap; -} + for (i = 1; i < GetHeight(); i++) + data[i] = data[i - 1] + (3 * GetWidth()); -wxImage::wxImage( const wxBitmap &bitmap ) -{ - wxCHECK_RET( bitmap.Ok(), "invalid bitmap" ); + // precompute coefficients for rotation formula + // (sine and cosine of the angle) + const double cos_angle = cos(angle); + const double sin_angle = sin(angle); - GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); + // Create new Image to store the result + // First, find rectangle that covers the rotated image; to do that, + // rotate the four corners - wxCHECK_RET( gdk_image, "couldn't create image" ); + const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y); - Create( bitmap.GetWidth(), bitmap.GetHeight() ); - char unsigned *data = GetData(); + wxRealPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0); + wxRealPoint p2 = rotated_point (0, GetHeight(), cos_angle, sin_angle, p0); + wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0); + wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), cos_angle, sin_angle, p0); - if (!data) + 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))); + + wxImage rotated (x2 - x1 + 1, y2 - y1 + 1); + + if (offset_after_rotation != NULL) { - gdk_image_destroy( gdk_image ); - wxFAIL_MSG( "couldn't create image" ); - return; + *offset_after_rotation = wxPoint (x1, y1); } - GdkImage *gdk_image_mask = (GdkImage*) NULL; - if (bitmap.GetMask()) - { - gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); + // GRG: The rotated (destination) image is always accessed + // sequentially, so there is no need for a pointer-based + // array here (and in fact it would be slower). + // + unsigned char * dst = rotated.GetData(); + + // GRG: if the original image has a mask, use its RGB values + // as the blank pixel, else, fall back to default (black). + // + unsigned char blank_r = 0; + unsigned char blank_g = 0; + unsigned char blank_b = 0; - SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable + if (HasMask()) + { + blank_r = GetMaskRed(); + blank_g = GetMaskGreen(); + blank_b = GetMaskBlue(); + rotated.SetMaskColour( blank_r, blank_g, blank_b ); } - GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); - if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); - int bpp = visual->depth; - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + // Now, for each point of the rotated image, find where it came from, by + // performing an inverse rotation (a rotation of -angle) and getting the + // pixel at those coordinates - GdkColormap *cmap = gtk_widget_get_default_colormap(); + // GRG: I've taken the (interpolating) test out of the loops, so that + // it is done only once, instead of repeating it for each pixel. - long pos = 0; - for (int j = 0; j < bitmap.GetHeight(); j++) + int x; + if (interpolating) { - for (int i = 0; i < bitmap.GetWidth(); i++) + for (int y = 0; y < rotated.GetHeight(); y++) { - int pixel = gdk_image_get_pixel( gdk_image, i, j ); - if (bpp <= 8) - { - data[pos] = cmap->colors[pixel].red >> 8; - data[pos+1] = cmap->colors[pixel].green >> 8; - data[pos+2] = cmap->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) + for (x = 0; x < rotated.GetWidth(); x++) { - data[pos] = (pixel >> 8) & 0xf8; - data[pos+1] = (pixel >> 3) & 0xfc; - data[pos+2] = (pixel << 3) & 0xf8; - } else + wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + + if (-0.25 < src.x && src.x < GetWidth() - 0.75 && + -0.25 < src.y && src.y < GetHeight() - 0.75) + { + // interpolate using the 4 enclosing grid-points. Those + // points can be obtained using floor and ceiling of the + // exact coordinates of the point + // C.M. 2000-02-17: when the point is near the border, special care is required. + + int x1, y1, x2, y2; + + if (0 < src.x && src.x < GetWidth() - 1) + { + x1 = wxCint(floor(src.x)); + x2 = wxCint(ceil(src.x)); + } + else // else means that x is near one of the borders (0 or width-1) + { + x1 = x2 = wxCint (src.x); + } + + if (0 < src.y && src.y < GetHeight() - 1) + { + y1 = wxCint(floor(src.y)); + y2 = wxCint(ceil(src.y)); + } + else + { + y1 = y2 = wxCint (src.y); + } + + // get four points and the distances (square of the distance, + // for efficiency reasons) for the interpolation formula + + // GRG: Do not calculate the points until they are + // really needed -- this way we can calculate + // just one, instead of four, if d1, d2, d3 + // or d4 are < gs_Epsilon + + const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1); + const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1); + const double d3 = (src.x - x2) * (src.x - x2) + (src.y - y2) * (src.y - y2); + const double d4 = (src.x - x1) * (src.x - x1) + (src.y - y2) * (src.y - y2); + + // Now interpolate as a weighted average of the four surrounding + // points, where the weights are the distances to each of those points + + // If the point is exactly at one point of the grid of the source + // image, then don't interpolate -- just assign the pixel + + if (d1 < gs_Epsilon) // d1,d2,d3,d4 are positive -- no need for abs() + { + unsigned char *p = data[y1] + (3 * x1); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else if (d2 < gs_Epsilon) + { + unsigned char *p = data[y1] + (3 * x2); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else if (d3 < gs_Epsilon) + { + unsigned char *p = data[y2] + (3 * x2); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else if (d4 < gs_Epsilon) + { + unsigned char *p = data[y2] + (3 * x1); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else + { + // weights for the weighted average are proportional to the inverse of the distance + unsigned char *v1 = data[y1] + (3 * x1); + unsigned char *v2 = data[y1] + (3 * x2); + unsigned char *v3 = data[y2] + (3 * x2); + unsigned char *v4 = data[y2] + (3 * x1); + + const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4; + + // GRG: Unrolled. + + *(dst++) = (unsigned char) + ( (w1 * *(v1++) + w2 * *(v2++) + + w3 * *(v3++) + w4 * *(v4++)) / + (w1 + w2 + w3 + w4) ); + *(dst++) = (unsigned char) + ( (w1 * *(v1++) + w2 * *(v2++) + + w3 * *(v3++) + w4 * *(v4++)) / + (w1 + w2 + w3 + w4) ); + *(dst++) = (unsigned char) + ( (w1 * *(v1++) + w2 * *(v2++) + + w3 * *(v3++) + w4 * *(v4++)) / + (w1 + w2 + w3 + w4) ); + } + } + else + { + *(dst++) = blank_r; + *(dst++) = blank_g; + *(dst++) = blank_b; + } + } + } + } + else // not interpolating + { + for (int y = 0; y < rotated.GetHeight(); y++) + { + for (x = 0; x < rotated.GetWidth(); x++) { - data[pos] = (pixel >> 16) & 0xff; - data[pos+1] = (pixel >> 8) & 0xff; - data[pos+2] = pixel & 0xff; + wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + + const int xs = wxCint (src.x); // wxCint rounds to the + const int ys = wxCint (src.y); // closest integer + + if (0 <= xs && xs < GetWidth() && + 0 <= ys && ys < GetHeight()) + { + unsigned char *p = data[ys] + (3 * xs); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else + { + *(dst++) = blank_r; + *(dst++) = blank_g; + *(dst++) = blank_b; + } } - - 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; - } - } - - pos += 3; } } - gdk_image_destroy( gdk_image ); - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); + delete [] data; + + return rotated; } -#endif +#endif // wxUSE_IMAGE