#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"
// For memcpy
#include <string.h>
+#include <math.h>
#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
+ #undef FAR
#endif
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
//-----------------------------------------------------------------------------
// wxImage
class wxImageRefData: public wxObjectRefData
{
-
public:
- wxImageRefData(void);
- ~wxImageRefData(void);
-
+ 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;
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()
{
Create( width, height );
}
-wxImage::wxImage( const wxString& name, long type )
+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, int index )
+{
+ LoadFile( name, type, index );
+}
+
+wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )
{
- LoadFile( name, type );
+ 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, int index )
+{
+ LoadFile( stream, mimetype, index );
}
#endif // wxUSE_STREAMS
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
{
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" );
-
- image.Create( width, height );
-
+
+ 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, "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 );
-
- long old_height = M_IMGDATA->m_height;
- long old_width = M_IMGDATA->m_width;
-
+
+ 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, 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)),
+ memcpy( target_data,
+ source_data + 3*(y_offset + ((i * old_width )/ width)),
3 );
target_data += 3;
}
}
-
+#endif
+
return image;
}
-void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
+wxImage wxImage::Rotate90( bool clockwise ) const
{
- wxCHECK_RET( Ok(), "invalid image" );
-
- int w = M_IMGDATA->m_width;
- int h = M_IMGDATA->m_height;
-
- wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), "invalid image index" );
-
- long pos = (y * w + x) * 3;
-
- M_IMGDATA->m_data[ pos ] = r;
- M_IMGDATA->m_data[ pos+1 ] = g;
- M_IMGDATA->m_data[ pos+2 ] = b;
-}
+ wxImage image;
-unsigned char wxImage::GetRed( int x, int y )
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- int w = M_IMGDATA->m_width;
- int h = M_IMGDATA->m_height;
-
- wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, "invalid image index" );
-
- long pos = (y * w + x) * 3;
-
- return M_IMGDATA->m_data[pos];
-}
+ wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-unsigned char wxImage::GetGreen( int x, int y )
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- int w = M_IMGDATA->m_width;
- int h = M_IMGDATA->m_height;
-
- wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, "invalid image index" );
-
- long pos = (y * w + x) * 3;
-
- return M_IMGDATA->m_data[pos+1];
-}
+ image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
-unsigned char wxImage::GetBlue( int x, int y )
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- int w = M_IMGDATA->m_width;
- int h = M_IMGDATA->m_height;
-
- wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, "invalid image index" );
-
- long pos = (y * w + x) * 3;
-
- return M_IMGDATA->m_data[pos+2];
-}
+ char unsigned *data = image.GetData();
-bool wxImage::Ok() const
-{
- return (M_IMGDATA && M_IMGDATA->m_ok);
-}
+ wxCHECK_MSG( data, image, wxT("unable to create image") );
-char unsigned *wxImage::GetData() const
-{
- wxCHECK_MSG( Ok(), (char unsigned *)NULL, "invalid image" );
-
- return M_IMGDATA->m_data;
-}
+ if (M_IMGDATA->m_hasMask)
+ image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-void wxImage::SetData( char unsigned *data )
-{
- wxCHECK_RET( Ok(), "invalid image" );
+ long height = M_IMGDATA->m_height;
+ long width = M_IMGDATA->m_width;
- memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3);
-}
+ char unsigned *source_data = M_IMGDATA->m_data;
+ char unsigned *target_data;
-void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
-{
- 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;
-}
+ for (long j = 0; j < height; j++)
+ {
+ for (long i = 0; i < width; i++)
+ {
+ if (clockwise)
+ target_data = data + (((i+1)*height) - j - 1)*3;
+ else
+ target_data = data + ((height*(width-1)) + j - (i*height))*3;
+ memcpy( target_data, source_data, 3 );
+ source_data += 3;
+ }
+ }
-unsigned char wxImage::GetMaskRed() const
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- return M_IMGDATA->m_maskRed;
+ return image;
}
-unsigned char wxImage::GetMaskGreen() const
+wxImage wxImage::Mirror( bool horizontally ) const
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- return M_IMGDATA->m_maskGreen;
-}
+ wxImage image;
-unsigned char wxImage::GetMaskBlue() const
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- return M_IMGDATA->m_maskBlue;
-}
+ wxCHECK_MSG( Ok(), image, wxT("invalid image") );
-void wxImage::SetMask( bool mask )
-{
- wxCHECK_RET( Ok(), "invalid image" );
-
- M_IMGDATA->m_hasMask = mask;
-}
+ image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
-bool wxImage::HasMask() const
-{
- wxCHECK_MSG( Ok(), FALSE, "invalid image" );
-
- return M_IMGDATA->m_hasMask;
-}
+ char unsigned *data = image.GetData();
-int wxImage::GetWidth() const
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- return M_IMGDATA->m_width;
-}
+ wxCHECK_MSG( data, image, wxT("unable to create image") );
-int wxImage::GetHeight() const
-{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
-
- return M_IMGDATA->m_height;
-}
+ if (M_IMGDATA->m_hasMask)
+ image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-bool wxImage::LoadFile( const wxString& filename, long type )
-{
-#if wxUSE_STREAMS
- if (wxFileExists(filename))
+ 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)
{
- wxFileInputStream stream(filename);
- return LoadFile(stream, type);
+ 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 {
- wxLogError( "Can't load image from file '%s': file does not exist.", filename.c_str() );
-
- return FALSE;
+ 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;
+ }
}
-#else // !wxUSE_STREAMS
- return FALSE;
-#endif // wxUSE_STREAMS
+
+ return image;
}
-bool wxImage::SaveFile( const wxString& filename, int type )
+wxImage wxImage::GetSubImage( const wxRect &rect ) const
{
-#if wxUSE_STREAMS
- wxFileOutputStream stream(filename);
-
- if ( stream.LastError() == wxStream_NOERROR )
- return SaveFile(stream, type);
- else
-#endif // wxUSE_STREAMS
- return FALSE;
+ 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;
}
-#if wxUSE_STREAMS
-bool wxImage::LoadFile( wxInputStream& stream, long type )
+void wxImage::Paste( const wxImage &image, int x, int y )
{
- UnRef();
-
- m_refData = new wxImageRefData;
-
- wxImageHandler *handler = FindHandler(type);
-
- if (handler == NULL)
+ 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)
{
- wxLogWarning( "No image handler for type %d defined.", type );
-
- return FALSE;
+ 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;
+ }
}
-
- return handler->LoadFile( this, stream );
}
-bool wxImage::SaveFile( wxOutputStream& stream, int type )
+void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
+ unsigned char r2, unsigned char g2, unsigned char b2 )
{
- wxCHECK_MSG( Ok(), FALSE, "invalid image" );
-
- wxImageHandler *handler = FindHandler(type);
-
- if (handler == NULL)
+ 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)
{
- wxLogWarning( "No image handler for type %d defined.", type );
-
- return FALSE;
+ 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 );
}
-
- return handler->SaveFile( this, stream );
+
+ 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;
}
-#endif // wxUSE_STREAMS
-void wxImage::AddHandler( wxImageHandler *handler )
+void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
{
- // make sure that the memory will be freed at the program end
- sm_handlers.DeleteContents(TRUE);
-
- sm_handlers.Append( handler );
+ 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<w) && (y<h), wxT("invalid image index") );
+
+ long pos = (y * w + x) * 3;
+
+ M_IMGDATA->m_data[ pos ] = r;
+ M_IMGDATA->m_data[ pos+1 ] = g;
+ M_IMGDATA->m_data[ pos+2 ] = b;
}
-void wxImage::InsertHandler( wxImageHandler *handler )
+unsigned char wxImage::GetRed( int x, int y ) const
{
- // make sure that the memory will be freed at the program end
- sm_handlers.DeleteContents(TRUE);
-
- sm_handlers.Insert( handler );
+ 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<w) && (y<h), 0, wxT("invalid image index") );
+
+ long pos = (y * w + x) * 3;
+
+ return M_IMGDATA->m_data[pos];
}
-bool wxImage::RemoveHandler( const wxString& name )
+unsigned char wxImage::GetGreen( int x, int y ) const
{
- wxImageHandler *handler = FindHandler(name);
- if (handler)
+ 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<w) && (y<h), 0, wxT("invalid image index") );
+
+ long pos = (y * w + x) * 3;
+
+ return M_IMGDATA->m_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) && (x<w) && (y<h), 0, wxT("invalid image index") );
+
+ long pos = (y * w + x) * 3;
+
+ return M_IMGDATA->m_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)
{
- sm_handlers.DeleteObject(handler);
- return TRUE;
+ 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
- return FALSE;
+ {
+ newRefData->m_width = new_width;
+ newRefData->m_height = new_height;
+ newRefData->m_data = data;
+ newRefData->m_ok = TRUE;
+ }
+
+ UnRef();
+
+ m_refData = newRefData;
}
-wxImageHandler *wxImage::FindHandler( const wxString& name )
+void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
{
- wxNode *node = sm_handlers.First();
- while (node)
- {
- wxImageHandler *handler = (wxImageHandler*)node->Data();
- if (handler->GetName().Cmp(name) == 0) return handler;
-
- node = node->Next();
- }
- return (wxImageHandler *)NULL;
+ 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;
}
-wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
+unsigned char wxImage::GetMaskRed() const
{
- 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_MSG( Ok(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_maskRed;
}
-wxImageHandler *wxImage::FindHandler( long bitmapType )
+unsigned char wxImage::GetMaskGreen() const
{
- wxNode *node = sm_handlers.First();
- while (node)
- {
- wxImageHandler *handler = (wxImageHandler *)node->Data();
- if (handler->GetType() == bitmapType) return handler;
- node = node->Next();
- }
- return NULL;
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_maskGreen;
}
-void wxImage::InitStandardHandlers()
+unsigned char wxImage::GetMaskBlue() const
{
- AddHandler( new wxBMPHandler );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_maskBlue;
}
-void wxImage::CleanUpHandlers()
+void wxImage::SetMask( bool mask )
{
- wxNode *node = sm_handlers.First();
- while (node)
- {
- wxImageHandler *handler = (wxImageHandler *)node->Data();
- wxNode *next = node->Next();
- delete handler;
- delete node;
- node = next;
- }
+ wxCHECK_RET( Ok(), wxT("invalid image") );
+
+ M_IMGDATA->m_hasMask = mask;
}
-//-----------------------------------------------------------------------------
-// wxImageHandler
-//-----------------------------------------------------------------------------
+bool wxImage::HasMask() const
+{
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxImageHandler,wxObject)
-#endif
+ return M_IMGDATA->m_hasMask;
+}
-#if wxUSE_STREAMS
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream) )
+int wxImage::GetWidth() const
{
- return FALSE;
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_width;
}
-bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream) )
+int wxImage::GetHeight() const
{
- return FALSE;
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+ return M_IMGDATA->m_height;
}
-#endif // wxUSE_STREAMS
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
-#endif
+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 );
+
+ unsigned char r2 = startR;
+ unsigned char g2 = startG;
+ unsigned char b2 = startB;
+
+ key = (r2 << 16) | (g2 << 8) | b2;
-#if wxUSE_STREAMS
-bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
-{
- 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;
- off_t start_offset = stream.TellI();
- signed char bbuf[4];
- struct _cmap
+ while ( (wxHNode *) hTable.Get(key) )
{
- unsigned char r, g, b;
+ // color already used
+ r2++;
+ if ( r2 >= 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;
}
- *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
-
- image->Destroy();
-
- done = 0;
- /*
- * Reading the bmp header
- */
-
- stream.Read(&bbuf, 2);
+ if (r) *r = r2;
+ if (g) *g = g2;
+ if (b) *b = b2;
- stream.Read(dbuf, 4 * 4);
-
- size = dbuf[0];
- offset = dbuf[2];
-
- stream.Read(dbuf, 4 * 2);
- int width = (int)dbuf[0];
- int height = (int)dbuf[1];
- if (width > 32767)
+ 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 width > 32767 pixels for file\n" );
+ wxLogError( _("Image and Mask have different sizes") );
return FALSE;
}
- if (height > 32767)
+
+ // find unused colour
+ unsigned char r,g,b ;
+ if (!FindFirstUnusedColour(&r, &g, &b))
{
- wxLogError( "Image height > 32767 pixels for file\n" );
- return FALSE;
+ wxLogError( _("No Unused Color in image being masked") );
+ return FALSE ;
}
- stream.Read(&word, 2);
- planes = (int)word;
- stream.Read(&word, 2);
- bpp = (int)word;
- if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32)
+
+ char unsigned *imgdata = GetData();
+ char unsigned *maskdata = mask.GetData();
+
+ const int w = GetWidth();
+ const int h = GetHeight();
+
+ for (int j = 0; j < h; j++)
{
- wxLogError( "unknown bitdepth in file\n" );
- return FALSE;
+ 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;
+ }
}
- stream.Read(dbuf, 4 * 4);
- comp = (int)dbuf[0];
- if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
- {
- wxLogError( "unknown encoding in Windows BMP file\n" );
+
+ 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);
}
- stream.Read(dbuf, 4 * 2);
- 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)))
+ else
{
- wxLogError( "encoding of BMP doesn't match bitdepth\n" );
- return FALSE;
+ M_IMGDATA->m_optionNames[idx] = name;
+ M_IMGDATA->m_optionValues[idx] = value;
}
- if (bpp < 16)
+}
+
+void wxImage::SetOption(const wxString& name, int value)
+{
+ wxString valStr;
+ valStr.Printf(wxT("%d"), value);
+ SetOption(name, valStr);
+}
+
+wxString wxImage::GetOption(const wxString& name) const
+{
+ 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];
+}
+
+int wxImage::GetOptionInt(const wxString& name) const
+{
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+ return wxAtoi(GetOption(name));
+}
+
+bool wxImage::HasOption(const wxString& name) const
+{
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+
+ return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
+}
+
+bool wxImage::LoadFile( const wxString& filename, long type, int index )
+{
+#if wxUSE_STREAMS
+ if (wxFileExists(filename))
{
- cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors);
-
- if (!cmap)
- {
- wxLogError( "Cannot allocate RAM for color map in BMP file\n" );
- return FALSE;
- }
+ wxFileInputStream stream(filename);
+ wxBufferedInputStream bstream( stream );
+ return LoadFile(bstream, type, index);
}
else
- cmap = NULL;
-
- image->Create( width, height );
- ptr = image->GetData();
- if (!ptr)
{
- wxLogError( "Cannot allocate RAM for RGB data in file\n" );
- if (cmap)
- free(cmap);
+ wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
return FALSE;
}
-
- /*
- * Reading the palette, if it exists.
- */
- if (bpp < 16 && ncolors != 0)
+#else // !wxUSE_STREAMS
+ return FALSE;
+#endif // wxUSE_STREAMS
+}
+
+bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int index )
+{
+#if wxUSE_STREAMS
+ if (wxFileExists(filename))
{
- for (i = 0; i < ncolors; i++)
- {
- stream.Read(bbuf, 4);
- cmap[i].b = bbuf[0];
- cmap[i].g = bbuf[1];
- cmap[i].r = bbuf[2];
- }
+ wxFileInputStream stream(filename);
+ wxBufferedInputStream bstream( stream );
+ return LoadFile(bstream, mimetype, index);
}
- else if (bpp == 16 || bpp == 32)
+ else
{
- if (comp == BI_BITFIELDS)
- {
- int bit = 0;
-
- stream.Read(dbuf, 4 * 3);
- 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;
- }
+ wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
+ return FALSE;
}
-
- /*
- * Reading the image data
- */
- stream.SeekI(start_offset + offset);
- data = ptr;
-
- /* set the whole image to the background color */
- if (bpp < 16 && (comp == BI_RLE4 || comp == BI_RLE8))
+#else // !wxUSE_STREAMS
+ return FALSE;
+#endif // wxUSE_STREAMS
+}
+
+bool wxImage::SaveFile( const wxString& filename, int type )
+{
+#if wxUSE_STREAMS
+ wxFileOutputStream stream(filename);
+
+ if ( stream.LastError() == wxStream_NOERROR )
{
- for (i = 0; i < width * height; i++)
- {
- *ptr++ = cmap[0].r;
- *ptr++ = cmap[0].g;
- *ptr++ = cmap[0].b;
- }
- ptr = data;
+ wxBufferedOutputStream bstream( stream );
+ return SaveFile(bstream, type);
}
- 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 = stream.GetC();
- 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)
- {
- wxLogError( "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 = stream.GetC();
- if (first == 0)
- {
- if (aByte == 0)
- {
- /* column = width; */
- }
- else if (aByte == 1)
- {
- column = width;
- line = -1;
- }
- else if (aByte == 2)
- {
- aByte = stream.GetC();
- column += aByte;
- linepos = column * bpp / 8;
- aByte = stream.GetC();
- line += aByte;
- }
- else
- {
- int absolute = aByte;
-
- for (i = 0; i < absolute; i++)
- {
- linepos++;
- aByte = stream.GetC();
- ptr[poffset] = cmap[aByte].r;
- ptr[poffset + 1] = cmap[aByte].g;
- ptr[poffset + 2] = cmap[aByte].b;
- column++;
- }
- if (absolute & 0x01)
- aByte = stream.GetC();
- }
- }
- 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)
- {
- stream.Read(&bbuf, 3);
- linepos += 3;
- 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;
-
- stream.Read(&word, 2);
- linepos += 2;
- 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;
-
- stream.Read(&dword, 4);
- linepos += 4;
- 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))
- {
- stream.Read(&aByte, 1);
- linepos += 1;
- if (stream.LastError() != wxStream_NOERROR)
- break;
- }
- }
- if (cmap) free(cmap);
-
- image->SetMask( FALSE );
-
- return TRUE;
-}
#endif // wxUSE_STREAMS
-#ifdef __WXMSW__
+ return FALSE;
+}
-wxBitmap wxImage::ConvertToBitmap() const
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
{
- // sizeLimit is the MS upper limit for the DIB size
- 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 );
- div_t lineBoundary = div( bytePerLine, sizeDWORD );
- int padding = 0;
- if( lineBoundary.rem > 0 )
- {
- padding = sizeDWORD - lineBoundary.rem;
- 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 wxUSE_STREAMS
+ wxFileOutputStream stream(filename);
+
+ if ( stream.LastError() == wxStream_NOERROR )
{
- div_t result = div( bmpHeight, height );
- numDIB = result.quot;
- hRemain = result.rem;
- if( hRemain >0 ) numDIB++;
+ wxBufferedOutputStream bstream( stream );
+ return SaveFile(bstream, mimetype);
}
-
- // set bitmap parameters
- wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, "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, "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 )
+#endif // wxUSE_STREAMS
+
+ return FALSE;
+}
+
+bool wxImage::CanRead( const wxString &name )
+{
+#if wxUSE_STREAMS
+ wxFileInputStream stream(name);
+ return CanRead(stream);
+#else
+ return FALSE;
+#endif
+}
+
+int wxImage::GetImageCount( const wxString &name, long type )
+{
+#if wxUSE_STREAMS
+ wxFileInputStream stream(name);
+ return GetImageCount(stream, type);
+#else
+ return 0;
+#endif
+}
+
+#if wxUSE_STREAMS
+
+bool wxImage::CanRead( wxInputStream &stream )
+{
+ wxList &list=GetHandlers();
+
+ for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
{
- wxFAIL_MSG( "could not allocate memory for DIB" );
- free( lpDIBh );
- return bitmap;
+ wxImageHandler *handler=(wxImageHandler*)node->GetData();
+ if (handler->CanRead( stream ))
+ return TRUE;
}
-
- // 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;
-
- for( n=0; n<numDIB; n++ )
+
+ return FALSE;
+}
+
+int wxImage::GetImageCount( wxInputStream &stream, long type )
+{
+ wxImageHandler *handler;
+
+ if ( type == wxBITMAP_TYPE_ANY )
{
- if( numDIB > 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( j=0; j<height; j++ )
+ wxList &list=GetHandlers();
+
+ for (wxList::Node *node = list.GetFirst(); node; node = node->GetNext())
{
- for( i=0; i<width; i++ )
- {
- *(ptbits++) = *(ptdata+2);
- *(ptbits++) = *(ptdata+1);
- *(ptbits++) = *(ptdata );
- ptdata += 3;
- }
- for( i=0; i< padding; i++ ) *(ptbits++) = 0;
+ handler=(wxImageHandler*)node->GetData();
+ if ( handler->CanRead(stream) )
+ return handler->GetImageCount(stream);
+
}
- ::StretchDIBits( memdc, 0, origin, width, height,\
- 0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
- origin += height;
- // if numDIB = 1, lines below can also be used
- // hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), 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 );
+
+ wxLogWarning(_("No handler found for image type."));
+ return 0;
}
- bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
-
- // similarly, created an mono-bitmap for the possible mask
- if( HasMask() )
+
+ handler = FindHandler(type);
+
+ if ( !handler )
{
- 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<numDIB; n++ )
- {
- if( numDIB > 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; j<height; j++ )
- {
- for(i=0; i<width; i++ )
- {
- if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
- {
- *(ptbits++) = one;
- *(ptbits++) = one;
- *(ptbits++) = one;
- }
- else
- {
- *(ptbits++) = zero;
- *(ptbits++) = zero;
- *(ptbits++) = zero;
- }
- }
- for( i=0; i< padding; i++ ) *(ptbits++) = zero;
- }
- ::StretchDIBits( memdc, 0, origin, width, height,\
- 0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
- origin += height;
- }
- // create a wxMask object
- wxMask *mask = new wxMask();
- mask->SetMaskBitmap( (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 );
- */
+ wxLogWarning(_("No image handler for type %d defined."), type);
+ return FALSE;
+ }
+
+ if ( handler->CanRead(stream) )
+ {
+ return handler->GetImageCount(stream);
}
-
- // 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;
+ {
+ wxLogError(_("Image file is not of type %d."), type);
+ return 0;
+ }
}
-wxImage::wxImage( const wxBitmap &bitmap )
+bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
{
- // check the bitmap
- if( !bitmap.Ok() )
+ UnRef();
+
+ m_refData = new wxImageRefData;
+
+ wxImageHandler *handler;
+
+ if ( type == wxBITMAP_TYPE_ANY )
{
- wxFAIL_MSG( "invalid bitmap" );
- return;
+ 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, TRUE/*verbose*/, index);
+
+ }
+
+ wxLogWarning( _("No handler found for image type.") );
+ return FALSE;
}
-
- // create an wxImage object
- int width = bitmap.GetWidth();
- int height = bitmap.GetHeight();
- Create( width, height );
- unsigned char *data = GetData();
- if( !data )
+
+ handler = FindHandler(type);
+
+ if (handler == NULL)
{
- wxFAIL_MSG( "could not allocate data for image" );
- return;
+ wxLogWarning( _("No image handler for type %d defined."), type );
+
+ return FALSE;
}
-
- // 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 )
+
+ return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+}
+
+bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
+{
+ UnRef();
+
+ m_refData = new wxImageRefData;
+
+ wxImageHandler *handler = FindHandlerMime(mimetype);
+
+ if (handler == NULL)
{
- padding = sizeDWORD - lineBoundary.rem;
- bytePerLine += padding;
+ wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+
+ return FALSE;
}
-
- // create a DIB header
- int headersize = sizeof(BITMAPINFOHEADER);
- LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
- if( !lpDIBh )
+
+ return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
+}
+
+bool wxImage::SaveFile( wxOutputStream& stream, int type )
+{
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+
+ wxImageHandler *handler = FindHandler(type);
+
+ if (handler == NULL)
{
- wxFAIL_MSG( "could not allocate data for DIB header" );
- free( data );
- return;
+ wxLogWarning( _("No image handler for type %d defined."), type );
+
+ return FALSE;
}
- // 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 )
+
+ 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)
{
- wxFAIL_MSG( "could not allocate data for DIB" );
- free( data );
- free( lpDIBh );
- return;
+ wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+
+ 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 );
-
- // copy DIB data into the wxImage object
- int i, j;
- unsigned char *ptdata = data;
- unsigned char *ptbits = lpBits;
- for( i=0; i<height; i++ )
- {
- for( j=0; j<width; j++ )
- {
- *(ptdata++) = *(ptbits+2);
- *(ptdata++) = *(ptbits+1);
- *(ptdata++) = *(ptbits );
- ptbits += 3;
- }
- ptbits += padding;
- }
-
- // similarly, set data according to the possible mask bitmap
- if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
+
+ 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 );
+}
+
+bool wxImage::RemoveHandler( const wxString& name )
+{
+ wxImageHandler *handler = FindHandler(name);
+ if (handler)
{
- 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<height; i++ )
- {
- for( j=0; j<width; j++ )
- {
- if( *ptbits != 0 )
- ptdata += 3;
- else
- {
- *(ptdata++) = r;
- *(ptdata++) = g;
- *(ptdata++) = b;
- }
- ptbits += 3;
- }
- ptbits += padding;
- }
- SetMaskColour( r, g, b );
- SetMask( TRUE );
- }
+ sm_handlers.DeleteObject(handler);
+ return TRUE;
+ }
else
- {
- SetMask( FALSE );
- }
- // free allocated resources
- ::ReleaseDC(NULL, hdc);
- free(lpDIBh);
- free(lpBits);
+ return FALSE;
}
-#endif
+wxImageHandler *wxImage::FindHandler( const wxString& name )
+{
+ wxNode *node = sm_handlers.First();
+ while (node)
+ {
+ wxImageHandler *handler = (wxImageHandler*)node->Data();
+ if (handler->GetName().Cmp(name) == 0) return handler;
-#ifdef __WXGTK__
+ node = node->Next();
+ }
+ return (wxImageHandler *)NULL;
+}
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
+wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
+{
+ 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;
+}
-wxBitmap wxImage::ConvertToBitmap() const
+wxImageHandler *wxImage::FindHandler( long bitmapType )
{
- wxBitmap bitmap;
-
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
-
- int width = GetWidth();
- int height = GetHeight();
-
- bitmap.SetHeight( height );
- bitmap.SetWidth( width );
-
- // Create picture
-
- GdkImage *data_image =
- gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
-
- bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
-
- // Create mask
-
- GdkImage *mask_image = (GdkImage*) NULL;
-
- if (HasMask())
+ wxNode *node = sm_handlers.First();
+ while (node)
{
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
-
- wxMask *mask = new wxMask();
- mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
-
- bitmap.SetMask( mask );
+ wxImageHandler *handler = (wxImageHandler *)node->Data();
+ if (handler->GetType() == bitmapType) return handler;
+ node = node->Next();
}
-
- // Retrieve depth
-
- GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
- if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
- int bpp = visual->depth;
-
- bitmap.SetDepth( bpp );
-
- if ((bpp == 16) && (visual->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)
+ return NULL;
+}
+
+wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
+{
+ wxNode *node = sm_handlers.First();
+ while (node)
{
- 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;
+ wxImageHandler *handler = (wxImageHandler *)node->Data();
+ if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
+ node = node->Next();
}
-
- int r_mask = GetMaskRed();
- int g_mask = GetMaskGreen();
- int b_mask = GetMaskBlue();
-
- unsigned char* data = GetData();
-
- int index = 0;
- for (int y = 0; y < height; y++)
+ return NULL;
+}
+
+void wxImage::InitStandardHandlers()
+{
+ AddHandler(new wxBMPHandler);
+#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
+ AddHandler(new wxXPMHandler);
+#endif
+}
+
+void wxImage::CleanUpHandlers()
+{
+ wxNode *node = sm_handlers.First();
+ while (node)
{
- 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 );
- }
-
- 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:
- {
- 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);
-
- 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; }
- }
- }
-
- gdk_image_put_pixel( data_image, x, y, pixel );
-
- 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
-
- if (HasMask())
+ wxImageHandler *handler = (wxImageHandler *)node->Data();
+ wxNode *next = node->Next();
+ delete handler;
+ delete node;
+ node = next;
+ }
+}
+
+//-----------------------------------------------------------------------------
+// wxImageHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
+
+#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), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
+{
+ return FALSE;
+}
+
+int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
+{
+ return 1;
+}
+
+bool wxImageHandler::CanRead( const wxString& name )
+{
+ if (wxFileExists(name))
{
- GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
-
- 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 );
+ wxFileInputStream stream(name);
+ return CanRead(stream);
}
-
+
+ else {
+ wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
+
+ return FALSE;
+ }
+// return FALSE;
+}
+
+#endif // wxUSE_STREAMS
+
+
+
+//-----------------------------------------------------------------------------
+// wxBitmap convertion routines
+//-----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+
+#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;
+}
+#endif
+
+wxBitmap wxImage::ConvertToBitmap() const
+{
+ wxBitmap bitmap( *this );
return bitmap;
}
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
-
- GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
- 0, 0,
- bitmap.GetWidth(), bitmap.GetHeight() );
-
- wxCHECK_RET( gdk_image, "couldn't create image" );
-
- Create( bitmap.GetWidth(), bitmap.GetHeight() );
- char unsigned *data = GetData();
-
- if (!data)
- {
- gdk_image_destroy( gdk_image );
- wxFAIL_MSG( "couldn't create image" );
- return;
- }
-
- GdkImage *gdk_image_mask = (GdkImage*) NULL;
- if (bitmap.GetMask())
+ *this = bitmap.ConvertToImage();
+}
+
+#endif
+
+
+
+// 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)
+
+
+//-----------------------------------------------------------------------------
+
+// GRG, Dic/99
+// Counts and returns the number of different colours. Optionally stops
+// when it exceeds 'stopafter' different colours. This is useful, for
+// example, to see if the image can be saved as 8-bit (256 colour or
+// 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 )
+{
+ wxHashTable h;
+ wxObject dummy;
+ unsigned char r, g, b;
+ unsigned char *p;
+ unsigned long size, nentries, key;
+
+ p = GetData();
+ size = GetWidth() * GetHeight();
+ nentries = 0;
+
+ for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
{
- gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
- 0, 0,
- bitmap.GetWidth(), bitmap.GetHeight() );
-
- SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
+ r = *(p++);
+ g = *(p++);
+ b = *(p++);
+ key = (r << 16) | (g << 8) | b;
+
+ if (h.Get(key) == NULL)
+ {
+ h.Put(key, &dummy);
+ 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;
-
- GdkColormap *cmap = gtk_widget_get_default_colormap();
-
- long pos = 0;
- for (int j = 0; j < bitmap.GetHeight(); j++)
+
+ return nentries;
+}
+
+
+// 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 char r, g, b;
+ unsigned char *p;
+ unsigned long size, nentries, key;
+ wxHNode *hnode;
+
+ p = GetData();
+ size = GetWidth() * GetHeight();
+ nentries = 0;
+
+ for (unsigned long j = 0; j < size; j++)
{
- for (int i = 0; i < bitmap.GetWidth(); i++)
+ r = *(p++);
+ g = *(p++);
+ b = *(p++);
+ key = (r << 16) | (g << 8) | b;
+
+ hnode = (wxHNode *) h.Get(key);
+
+ if (hnode)
+ hnode->value++;
+ else
{
- 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)
- {
- 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;
- }
-
- 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;
+ hnode = new wxHNode();
+ hnode->index = nentries++;
+ hnode->value = 1;
+
+ h.Put(key, (wxObject *)hnode);
}
}
-
- gdk_image_destroy( gdk_image );
- if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+
+ return nentries;
}
-#endif
+/*
+ * Rotation code by Carlos Moreno
+ */
-#ifdef __WXMOTIF__
+// 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.
-#include <Xm/Xm.h>
-#include "wx/utils.h"
-#include <math.h>
+static const double gs_Epsilon = 1e-10;
-wxBitmap wxImage::ConvertToBitmap() const
+static inline int wxCint (double x)
{
- wxBitmap bitmap;
-
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+ return (x > 0) ? (int) (x + 0.5) : (int) (x - 0.5);
+}
- 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
-
- 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 );
-
- bitmap.Create( width, height, bpp );
- /*
- // Create mask
-
- GdkImage *mask_image = (GdkImage*) NULL;
-
- if (HasMask())
- {
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
-
- wxMask *mask = new wxMask();
- mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
-
- bitmap.SetMask( mask );
- }
- */
-
- // 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 );
-
- if (!vi)
- {
- printf("no visual.\n" );
- return wxNullBitmap;
- }
-
- XFree( vi );
+// 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.
- 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)
+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);
+}
+
+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);
+}
+
+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
+
+ // 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());
+
+ // precompute coefficients for rotation formula
+ // (sine and cosine of the angle)
+ const double cos_angle = cos(angle);
+ const double sin_angle = sin(angle);
+
+ // Create new Image to store the result
+ // First, find rectangle that covers the rotated image; to do that,
+ // rotate the four corners
+
+ const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
+
+ wxRealPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0);
+ wxRealPoint p2 = rotated_point (0, GetHeight(), cos_angle, sin_angle, p0);
+ wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0);
+ wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), cos_angle, sin_angle, p0);
+
+ 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)
{
- 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;
+ *offset_after_rotation = wxPoint (x1, y1);
}
-
- /*
- int r_mask = GetMaskRed();
- int g_mask = GetMaskGreen();
- int b_mask = GetMaskBlue();
- */
-
- XColor colors[256];
- if (bpp == 8)
+
+ // 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;
+
+ if (HasMask())
{
- Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy );
-
- for (int i = 0; i < 256; i++) colors[i].pixel = i;
- XQueryColors( dpy, cmap, colors, 256 );
+ blank_r = GetMaskRed();
+ blank_g = GetMaskGreen();
+ blank_b = GetMaskBlue();
+ rotated.SetMaskColour( blank_r, blank_g, blank_b );
}
-
- unsigned char* data = GetData();
-
- int index = 0;
- for (int y = 0; y < height; y++)
+
+ // 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
+
+ // 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.
+
+ int x;
+ if (interpolating)
{
- for (int x = 0; x < width; x++)
+ for (int y = 0; y < rotated.GetHeight(); y++)
{
- int r = data[index];
- index++;
- int g = data[index];
- index++;
- int b = data[index];
- index++;
-
- /*
- if (HasMask())
+ for (x = 0; x < rotated.GetWidth(); x++)
{
- 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:
+ 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)
{
- int pixel = -1;
- /*
- if (wxTheApp->m_colorCube)
+ // 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)
{
- pixel = wxTheApp->m_colorCube
- [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
- }
+ x1 = x2 = wxCint (src.x);
+ }
+
+ if (0 < src.y && src.y < GetHeight() - 1)
+ {
+ y1 = wxCint(floor(src.y));
+ y2 = wxCint(ceil(src.y));
+ }
else
{
- */
- int max = 3 * (65536);
- for (int i = 0; i < 256; i++)
+ 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()
{
- 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; }
+ 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++);
}
- */
- 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)
+ else if (d3 < gs_Epsilon)
+ {
+ unsigned char *p = data[y2] + (3 * x2);
+ *(dst++) = *(p++);
+ *(dst++) = *(p++);
+ *(dst++) = *(p++);
+ }
+ else if (d4 < gs_Epsilon)
{
- 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;
+ unsigned char *p = data[y2] + (3 * x1);
+ *(dst++) = *(p++);
+ *(dst++) = *(p++);
+ *(dst++) = *(p++);
}
- XPutPixel( data_image, x, y, pixel );
+ 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;
}
- 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 );
-
- XDestroyImage( data_image );
- XFreeGC( dpy, gc );
-
- /*
- // Blit mask
-
- if (HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
-
- 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 );
- }
- */
-
- return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
- wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
-
- 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, "couldn't create image" );
-
- Create( bitmap.GetWidth(), bitmap.GetHeight() );
- char unsigned *data = GetData();
-
- if (!data)
- {
- XDestroyImage( ximage );
- wxFAIL_MSG( "couldn't create image" );
- return;
- }
-
- /*
- GdkImage *gdk_image_mask = (GdkImage*) NULL;
- if (bitmap.GetMask())
- {
- 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
-
- 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 );
-
- if (!vi)
- {
- printf("no visual.\n" );
- return;
- }
-
- if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
-
- XFree( vi );
-
- XColor colors[256];
- if (bpp == 8)
- {
- Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy );
-
- for (int i = 0; i < 256; i++) colors[i].pixel = i;
- XQueryColors( dpy, cmap, colors, 256 );
+ }
}
-
- long pos = 0;
- for (int j = 0; j < bitmap.GetHeight(); j++)
+ else // not interpolating
{
- for (int i = 0; i < bitmap.GetWidth(); i++)
+ for (int y = 0; y < rotated.GetHeight(); y++)
{
- 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
+ for (x = 0; x < rotated.GetWidth(); x++)
{
- data[pos] = (pixel >> 16) & 0xff;
- data[pos+1] = (pixel >> 8) & 0xff;
- data[pos+2] = pixel & 0xff;
- }
-
- /*
- 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;
- }
+ 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;
+ }
}
- */
-
- pos += 3;
}
}
-
- XDestroyImage( ximage );
- /*
- if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
- */
-}
-#endif
-
-// 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(); };
-};
+ delete [] data;
-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+ return rotated;
+}
+#endif // wxUSE_IMAGE
projects / wxWidgets.git / blobdiff