#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#include "wx/image.h"
#include "wx/debug.h"
#include "wx/log.h"
#include "wx/app.h"
-#ifdef wxUSE_LIBPNG
-#include "../png/png.h"
-#endif
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
+#include "wx/module.h"
+
+// For memcpy
+#include <string.h>
+
+#ifdef __SALFORDC__
+ #undef FAR
+#endif
#ifdef __WXMSW__
-#include <windows.h>
+ #include "wx/msw/private.h"
#endif
//-----------------------------------------------------------------------------
{
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;
};
-wxImageRefData::wxImageRefData(void)
+wxImageRefData::wxImageRefData()
{
m_width = 0;
m_height = 0;
m_hasMask = FALSE;
}
-wxImageRefData::~wxImageRefData(void)
+wxImageRefData::~wxImageRefData()
{
if (m_data) free( m_data );
}
#define M_IMGDATA ((wxImageRefData *)m_refData)
#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
+ IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
#endif
wxImage::wxImage()
LoadFile( name, type );
}
+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);
UnRef();
}
-wxImage wxImage::Scale( int width, int height )
+wxImage wxImage::Scale( int width, int height ) const
{
wxImage image;
- wxCHECK_MSG( Ok(), image, "invlaid image" );
+ wxCHECK_MSG( Ok(), image, _T("invalid image") );
- wxCHECK_MSG( (width > 0) && (height > 0), image, "invalid image size" );
+ wxCHECK_MSG( (width > 0) && (height > 0), image, _T("invalid image size") );
image.Create( width, height );
char unsigned *data = image.GetData();
- wxCHECK_MSG( data, image, "unable to create image" );
+ wxCHECK_MSG( data, image, _T("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;
+ long old_height = M_IMGDATA->m_height;
+ long old_width = M_IMGDATA->m_width;
+
+ char unsigned *source_data = M_IMGDATA->m_data;
+ char unsigned *target_data = data;
- for (int j = 0; j < height; j++)
+ for (long j = 0; j < height; j++)
{
- for (int i = 0; i < width; i++)
+ long y_offset = (j * old_height / height) * old_width;
+
+ for (long 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 ];
+ memcpy( target_data,
+ source_data + 3*(y_offset + ((i * old_width )/ width)),
+ 3 );
+ target_data += 3;
}
}
return image;
}
+wxImage wxImage::GetSubImage( const wxRect &rect ) const
+{
+ wxImage image;
+
+ wxCHECK_MSG( Ok(), image, _T("invalid image") );
+
+ wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight())
+ , image, _T("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, _T("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::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
{
- wxCHECK_RET( Ok(), "invalid image" );
+ wxCHECK_RET( Ok(), _T("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" );
+ wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), _T("invalid image index") );
long pos = (y * w + x) * 3;
unsigned char wxImage::GetRed( int x, int y )
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("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" );
+ wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );
long pos = (y * w + x) * 3;
unsigned char wxImage::GetGreen( int x, int y )
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("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" );
+ wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );
long pos = (y * w + x) * 3;
unsigned char wxImage::GetBlue( int x, int y )
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("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" );
+ wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );
long pos = (y * w + x) * 3;
char unsigned *wxImage::GetData() const
{
- wxCHECK_MSG( Ok(), (char unsigned *)NULL, "invalid image" );
+ wxCHECK_MSG( Ok(), (char unsigned *)NULL, _T("invalid image") );
return M_IMGDATA->m_data;
}
-void wxImage::SetData( char unsigned *WXUNUSED(data) )
+void wxImage::SetData( char unsigned *data )
{
- wxCHECK_RET( Ok(), "invalid image" );
+ wxCHECK_RET( Ok(), _T("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::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
{
- wxCHECK_RET( Ok(), "invalid image" );
+ wxCHECK_RET( Ok(), _T("invalid image") );
M_IMGDATA->m_maskRed = r;
M_IMGDATA->m_maskGreen = g;
unsigned char wxImage::GetMaskRed() const
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("invalid image") );
return M_IMGDATA->m_maskRed;
}
unsigned char wxImage::GetMaskGreen() const
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("invalid image") );
return M_IMGDATA->m_maskGreen;
}
unsigned char wxImage::GetMaskBlue() const
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("invalid image") );
return M_IMGDATA->m_maskBlue;
}
void wxImage::SetMask( bool mask )
{
- wxCHECK_RET( Ok(), "invalid image" );
+ wxCHECK_RET( Ok(), _T("invalid image") );
M_IMGDATA->m_hasMask = mask;
}
bool wxImage::HasMask() const
{
- wxCHECK_MSG( Ok(), FALSE, "invalid image" );
+ wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
return M_IMGDATA->m_hasMask;
}
int wxImage::GetWidth() const
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("invalid image") );
return M_IMGDATA->m_width;
}
int wxImage::GetHeight() const
{
- wxCHECK_MSG( Ok(), 0, "invalid image" );
+ wxCHECK_MSG( Ok(), 0, _T("invalid image") );
return M_IMGDATA->m_height;
}
bool wxImage::LoadFile( const wxString& filename, long type )
{
+#if wxUSE_STREAMS
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
}
else {
- wxLogWarning( "Image file does not exist." );
+ wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
+ return FALSE;
+ }
+#else // !wxUSE_STREAMS
+ return FALSE;
+#endif // wxUSE_STREAMS
+}
+
+bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
+{
+#if wxUSE_STREAMS
+ if (wxFileExists(filename))
+ {
+ wxFileInputStream stream(filename);
+ return LoadFile(stream, mimetype);
+ }
+
+ else {
+ wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );
return FALSE;
}
+#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 )
+ return SaveFile(stream, type);
+ else
+#endif // wxUSE_STREAMS
+ return FALSE;
+}
+
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
+{
+#if wxUSE_STREAMS
+ wxFileOutputStream stream(filename);
+
+ if ( stream.LastError() == wxStream_NOERROR )
+ return SaveFile(stream, mimetype);
+ else
+#endif // wxUSE_STREAMS
+ return FALSE;
}
+#if wxUSE_STREAMS
+
bool wxImage::LoadFile( wxInputStream& stream, long type )
{
UnRef();
m_refData = new wxImageRefData;
- wxImageHandler *handler = FindHandler(type);
+ 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( _T("No handler found for this image.") );
+ return FALSE;
+ }
+
+ handler = FindHandler(type);
if (handler == NULL)
{
- wxLogWarning( "No image handler for type %d defined.", type );
+ wxLogWarning( _T("No image handler for type %d defined."), type );
return FALSE;
}
return handler->LoadFile( this, stream );
}
-bool wxImage::SaveFile( const wxString& filename, int type )
+bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
{
- wxFileOutputStream stream(filename);
+ UnRef();
+
+ m_refData = new wxImageRefData;
+
+ wxImageHandler *handler = FindHandlerMime(mimetype);
+
+ if (handler == NULL)
+ {
+ wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );
- if ( stream.LastError() == wxStream_NOERROR )
- return SaveFile(stream, type);
- else
return FALSE;
+ }
+
+ return handler->LoadFile( this, stream );
}
bool wxImage::SaveFile( wxOutputStream& stream, int type )
{
- wxCHECK_MSG( Ok(), FALSE, "invalid image" );
+ wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
wxImageHandler *handler = FindHandler(type);
if (handler == NULL)
{
- wxLogWarning( "No image handler for type %d defined.", type );
+ wxLogWarning( _T("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, _T("invalid image") );
+
+ wxImageHandler *handler = FindHandlerMime(mimetype);
+
+ if (handler == NULL)
+ {
+ wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );
- return FALSE;
+ return FALSE;
}
return handler->SaveFile( this, stream );
}
+#endif // wxUSE_STREAMS
void wxImage::AddHandler( wxImageHandler *handler )
{
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;
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;
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 );
-#endif
+ AddHandler( new wxBMPHandler );
}
void wxImage::CleanUpHandlers()
IMPLEMENT_DYNAMIC_CLASS(wxImageHandler,wxObject)
#endif
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream) )
+#if wxUSE_STREAMS
+bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
{
return FALSE;
}
-bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream) )
+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
-
-
-static void _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length )
-{
- ((wxInputStream*) png_get_io_ptr( png_ptr )) -> Read(data, length);
-}
-
-static void _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length )
+bool wxImageHandler::CanRead( wxInputStream& stream )
{
- ((wxOutputStream*) png_get_io_ptr( png_ptr )) -> Write(data, length);
+ return FALSE;
}
-bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
+bool wxImageHandler::CanRead( const wxString& name )
{
- // VZ: as this function uses setjmp() the only fool proof error handling
- // method is to use goto (setjmp is not really C++ dtors friendly...)
- image->Destroy();
-
- unsigned int i;
- unsigned char **lines = NULL;
- png_infop info_ptr = NULL;
-
- png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING,
- (voidp) NULL,
- (png_error_ptr) NULL,
- (png_error_ptr) NULL );
- if (!png_ptr)
- goto error;
+#if wxUSE_STREAMS
+ if (wxFileExists(name))
+ {
+ wxFileInputStream stream(name);
+ return CanRead(stream);
+ }
- info_ptr = png_create_info_struct( png_ptr );
- if (!info_ptr)
- goto error;
+ else {
+ wxLogError( _T("Can't check image format of file '%s': file does not exist."), name.c_str() );
- if (setjmp(png_ptr->jmpbuf))
- goto error;
+ return FALSE;
+ }
+#else // !wxUSE_STREAMS
+ return FALSE;
+#endif // wxUSE_STREAMS
+}
- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
- goto error;
- png_set_read_fn( png_ptr, &stream, _PNG_stream_reader);
- png_uint_32 width,height;
- int bit_depth,color_type,interlace_type;
+#endif // wxUSE_STREAMS
- png_read_info( png_ptr, info_ptr );
- png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, (int*) NULL, (int*) NULL );
+//-----------------------------------------------------------------------------
+// MSW conversion routines
+//-----------------------------------------------------------------------------
- if (color_type == PNG_COLOR_TYPE_PALETTE)
- png_set_expand( png_ptr );
+#ifdef __WXMSW__
- 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 );
+wxBitmap wxImage::ConvertToBitmap() const
+{
+ if ( !Ok() )
+ return wxNullBitmap;
- image->Create( width, height );
+ // sizeLimit is the MS upper limit for the DIB size
+#ifdef WIN32
+ int sizeLimit = 1024*768*3;
+#else
+ int sizeLimit = 0x7fff ;
+#endif
- if (!image->Ok())
- goto error;
+ // width and height of the device-dependent bitmap
+ int width = GetWidth();
+ int bmpHeight = GetHeight();
+
+ // calc the number of bytes per scanline and padding
+ int bytePerLine = width*3;
+ int sizeDWORD = sizeof( DWORD );
+ int lineBoundary = bytePerLine % sizeDWORD;
+ int padding = 0;
+ if( lineBoundary > 0 )
+ {
+ padding = sizeDWORD - lineBoundary;
+ bytePerLine += padding;
+ }
+ // calc the number of DIBs and heights of DIBs
+ int numDIB = 1;
+ int hRemain = 0;
+ int height = sizeLimit/bytePerLine;
+ if( height >= bmpHeight )
+ height = bmpHeight;
+ else
+ {
+ numDIB = bmpHeight / height;
+ hRemain = bmpHeight % height;
+ if( hRemain >0 ) numDIB++;
+ }
- lines = (unsigned char **)malloc( height * sizeof(unsigned char *) );
- if (lines == NULL)
- goto error;
+ // set bitmap parameters
+ wxBitmap bitmap;
+ wxCHECK_MSG( Ok(), bitmap, _T("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, _T("could not allocate memory for DIB header") );
+ // Fill in the DIB header
+ lpDIBh->bmiHeader.biSize = headersize;
+ lpDIBh->bmiHeader.biWidth = (DWORD)width;
+ lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ // the general formula for biSizeImage:
+ // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
+ lpDIBh->bmiHeader.biPlanes = 1;
+ lpDIBh->bmiHeader.biBitCount = 24;
+ lpDIBh->bmiHeader.biCompression = BI_RGB;
+ lpDIBh->bmiHeader.biClrUsed = 0;
+ // These seem not really needed for our purpose here.
+ lpDIBh->bmiHeader.biClrImportant = 0;
+ lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+ lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+ // memory for DIB data
+ unsigned char *lpBits;
+ lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
+ if( !lpBits )
+ {
+ wxFAIL_MSG( _T("could not allocate memory for DIB") );
+ free( lpDIBh );
+ return bitmap;
+ }
- for (i = 0; i < height; i++)
+ // 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++ )
{
- if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL)
+ if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
{
- for ( unsigned int n = 0; n < i; n++ )
- free( lines[n] );
- goto error;
+ // 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;
- // loaded successfully!
- {
- int transp = 0;
- png_read_image( png_ptr, lines );
- png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
- unsigned char *ptr = image->GetData();
- if ((color_type == PNG_COLOR_TYPE_GRAY) ||
- (color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+ for( j=0; j<height; j++ )
{
- for (unsigned int y = 0; y < height; y++)
+ for( i=0; i<width; i++ )
{
- unsigned char *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;
- }
- }
+ *(ptbits++) = *(ptdata+2);
+ *(ptbits++) = *(ptdata+1);
+ *(ptbits++) = *(ptdata );
+ ptdata += 3;
}
+ for( i=0; i< padding; i++ ) *(ptbits++) = 0;
}
- else
+ ::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 );
+ }
+ bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
+
+ // similarly, created an mono-bitmap for the possible mask
+ if( HasMask() )
+ {
+ hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
+ ::SelectObject( memdc, hbitmap);
+ if( numDIB == 1 ) height = bmpHeight;
+ else height = sizeLimit/bytePerLine;
+ lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ origin = 0;
+ unsigned char r = GetMaskRed();
+ unsigned char g = GetMaskGreen();
+ unsigned char b = GetMaskBlue();
+ unsigned char zero = 0, one = 255;
+ ptdata = data;
+ for( n=0; n<numDIB; n++ )
{
- for (unsigned int y = 0; y < height; y++)
+ 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++ )
{
- unsigned char *ptr2 = lines[y];
- for (unsigned int x = 0; x < width; x++)
+ for(i=0; i<width; i++ )
{
- unsigned char r = *ptr2++;
- unsigned char g = *ptr2++;
- unsigned char b = *ptr2++;
- unsigned char a = *ptr2++;
- if (a < 128)
+ if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
{
- *ptr++ = 255;
- *ptr++ = 0;
- *ptr++ = 255;
- transp = 1;
+ *(ptbits++) = one;
+ *(ptbits++) = one;
+ *(ptbits++) = one;
}
else
{
- if ((r == 255) && (g == 0) && (b == 255)) r = 254;
- *ptr++ = r;
- *ptr++ = g;
- *ptr++ = b;
+ *(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;
}
-
- for ( unsigned int j = 0; j < height; j++ )
- free( lines[j] );
- free( lines );
-
- if (transp)
- {
- image->SetMaskColour( 255, 0, 255 );
- }
- else
- {
- image->SetMask( FALSE );
- }
+ // 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 );
+ */
}
- return TRUE;
+ // free allocated resources
+ ::SelectObject( memdc, 0 );
+ ::DeleteDC( memdc );
+ ::ReleaseDC(NULL, hdc);
+ free(lpDIBh);
+ free(lpBits);
-error:
- wxLogError(_("Couldn't load a PNG image - probably file is corrupted."));
+ // check the wxBitmap object
+ if( bitmap.GetHBITMAP() )
+ bitmap.SetOk( TRUE );
+ else
+ bitmap.SetOk( FALSE );
- if ( image->Ok() )
- {
- image->Destroy();
- }
+ return bitmap;
+}
- if ( lines )
+wxImage::wxImage( const wxBitmap &bitmap )
+{
+ // check the bitmap
+ if( !bitmap.Ok() )
{
- free( lines );
+ wxFAIL_MSG( _T("invalid bitmap") );
+ return;
}
- if ( png_ptr )
+ // create an wxImage object
+ int width = bitmap.GetWidth();
+ int height = bitmap.GetHeight();
+ Create( width, height );
+ unsigned char *data = GetData();
+ if( !data )
{
- if ( info_ptr )
- {
- png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
- free(info_ptr);
- }
- else
- png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
+ wxFAIL_MSG( _T("could not allocate data for image") );
+ return;
}
- return FALSE;
-}
-
-bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
-{
- {
- png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (!png_ptr)
+ // calc the number of bytes per scanline and padding in the DIB
+ int bytePerLine = width*3;
+ int sizeDWORD = sizeof( DWORD );
+ int lineBoundary = bytePerLine % sizeDWORD;
+ int padding = 0;
+ if( lineBoundary > 0 )
{
- return FALSE;
+ padding = sizeDWORD - lineBoundary;
+ bytePerLine += padding;
}
- png_infop info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL)
+ // create a DIB header
+ int headersize = sizeof(BITMAPINFOHEADER);
+ LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+ if( !lpDIBh )
{
- png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
- return FALSE;
+ wxFAIL_MSG( _T("could not allocate data for DIB header") );
+ free( data );
+ return;
}
-
- if (setjmp(png_ptr->jmpbuf))
+ // 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 )
{
- png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
- return FALSE;
+ wxFAIL_MSG( _T("could not allocate data for DIB") );
+ free( data );
+ free( lpDIBh );
+ return;
}
- png_set_write_fn( png_ptr, &stream, _PNG_stream_writer, NULL);
-
- 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)
+ // 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++ )
{
- png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
- return FALSE;
+ for( j=0; j<width; j++ )
+ {
+ *(ptdata++) = *(ptbits+2);
+ *(ptdata++) = *(ptbits+1);
+ *(ptdata++) = *(ptbits );
+ ptbits += 3;
+ }
+ ptbits += padding;
}
- for (int y = 0; y < image->GetHeight(); y++)
+ // similarly, set data according to the possible mask bitmap
+ if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
{
- unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3);
- for (int x = 0; x < image->GetWidth(); x++)
+ 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++ )
{
- 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()))
+ for( j=0; j<width; j++ )
{
- data[(x << 2) + 3] = 0;
- }
- else
- {
- data[(x << 2) + 3] = 255;
+ if( *ptbits != 0 )
+ ptdata += 3;
+ else
+ {
+ *(ptdata++) = r;
+ *(ptdata++) = g;
+ *(ptdata++) = b;
+ }
+ ptbits += 3;
}
+ ptbits += padding;
}
- png_bytep row_ptr = data;
- png_write_rows( png_ptr, &row_ptr, 1 );
+ SetMaskColour( r, g, b );
+ SetMask( TRUE );
}
-
- free(data);
- png_write_end( png_ptr, info_ptr );
- png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr );
- }
- return TRUE;
+ else
+ {
+ SetMask( FALSE );
+ }
+ // free allocated resources
+ ::ReleaseDC(NULL, hdc);
+ free(lpDIBh);
+ free(lpBits);
}
#endif
- // wxUSE_LIBPNG
-
//-----------------------------------------------------------------------------
-// wxBMPHandler
+// GTK conversion routines
//-----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
-#endif
+#ifdef __WXGTK__
-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
- {
- unsigned char r, g, b;
- }
- *cmap = NULL;
-#ifndef BI_RGB
-#define BI_RGB 0
-#define BI_RLE8 1
-#define BI_RLE4 2
-#endif
+#include "gtk/gtk.h"
+#include "gdk/gdk.h"
+#include "gdk/gdkx.h"
-#ifndef BI_BITFIELDS
-#define BI_BITFIELDS 3
+#if (GTK_MINOR_VERSION > 0)
+#include "gdk/gdkrgb.h"
#endif
- image->Destroy();
+wxBitmap wxImage::ConvertToBitmap() const
+{
+ wxBitmap bitmap;
- done = 0;
- /*
- * Reading the bmp header
- */
+ wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
- stream.Read(&bbuf, 2);
+ int width = GetWidth();
+ int height = GetHeight();
- stream.Read(dbuf, 4 * 4);
+ bitmap.SetHeight( height );
+ bitmap.SetWidth( width );
- size = dbuf[0];
- offset = dbuf[2];
+ bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
- stream.Read(dbuf, 4 * 2);
- int width = (int)dbuf[0];
- int height = (int)dbuf[1];
- if (width > 32767)
- {
- wxLogError( "Image width > 32767 pixels for file\n" );
- return FALSE;
- }
- if (height > 32767)
- {
- wxLogError( "Image height > 32767 pixels for file\n" );
- 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)
- {
- wxLogError( "unknown bitdepth in file\n" );
- return FALSE;
- }
- 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" );
- return FALSE;
- }
- 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)))
- {
- wxLogError( "encoding of BMP doesn't match bitdepth\n" );
- return FALSE;
- }
- if (bpp < 16)
- {
- cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors);
-
- if (!cmap)
- {
- wxLogError( "Cannot allocate RAM for color map in BMP file\n" );
- return FALSE;
- }
- }
- 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);
- return FALSE;
- }
+ // Retrieve depth
- /*
- * Reading the palette, if it exists.
- */
- if (bpp < 16 && ncolors != 0)
- {
- 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];
- }
- }
- else if (bpp == 16 || bpp == 32)
- {
- 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;
- }
- }
+ GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+ if (visual == NULL) visual = gdk_visual_get_system();
+ int bpp = visual->depth;
- /*
- * 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))
- {
- 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....
- */
+ bitmap.SetDepth( bpp );
- 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);
+ if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+ if (bpp < 8) bpp = 8;
- image->SetMask( FALSE );
+#if (GTK_MINOR_VERSION > 0)
- return TRUE;
-}
+ if (!HasMask() && (bpp > 8))
+ {
+ static bool s_hasInitialized = FALSE;
-#ifdef __WXMSW__
+ if (!s_hasInitialized)
+ {
+ gdk_rgb_init();
+ s_hasInitialized = TRUE;
+ }
-wxBitmap wxImage::ConvertToBitmap() const
-{
+ GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() );
- 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; i<width*height; i++ )
- {
- *(ptbits++) = *(ptdata+2);
- *(ptbits++) = *(ptdata+1);
- *(ptbits++) = *(ptdata );
- ptdata += 3;
- }
-
- HDC hdc = ::GetDC(NULL);
-
- HBITMAP hbitmap;
- 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 );
-
- 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; i<width*height; i++ )
- {
- if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
- {
- *(ptbits++) = one;
- *(ptbits++) = one;
- *(ptbits++) = one;
- }
- else
- {
- *(ptbits++) = zero;
- *(ptbits++) = zero;
- *(ptbits++) = zero;
- }
- }
- hbitmap = ::CreateBitmap( (WORD)width, (WORD)height, 1, 1, NULL );
- ::SetDIBits( hdc, hbitmap, 0, (WORD)height, lpBits, lpDIBh, DIB_RGB_COLORS);
- wxMask *mask = new wxMask();
- mask->SetMaskBitmap( (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;
-}
+ gdk_draw_rgb_image( bitmap.GetPixmap(),
+ gc,
+ 0, 0,
+ width, height,
+ GDK_RGB_DITHER_NONE,
+ GetData(),
+ width*3 );
+ gdk_gc_unref( gc );
-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; i<width*height; i++ )
- {
- *(ptdata++) = *(ptbits+2);
- *(ptdata++) = *(ptbits+1);
- *(ptdata++) = *(ptbits );
- ptbits += 3;
- }
-
- if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
- {
- 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<width*height; i++ )
- {
- if( *ptbits != 0 )
- {
- *(ptdata++) = r;
- *(ptdata++) = g;
- *(ptdata++) = b;
- }
- ptbits += 3;
+ return bitmap;
}
- SetMaskColour( r, g, b );
- }
-
- ::ReleaseDC(NULL, hdc);
- free(lpDIBh);
- free(lpBits);
-}
#endif
-#ifdef __WXGTK__
-
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
- wxBitmap bitmap;
-
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
-
- int width = GetWidth();
- int height = GetHeight();
-
- bitmap.SetHeight( height );
- bitmap.SetWidth( width );
-
- // Create picture
+ // Create picture image
GdkImage *data_image =
- gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
+ 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
+ // Create mask image
GdkImage *mask_image = (GdkImage*) NULL;
bitmap.SetMask( mask );
}
- // 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 };
switch (bpp)
{
- case 8:
+ case 8:
{
int pixel = -1;
if (wxTheApp->m_colorCube)
break;
}
- case 15:
+ 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:
+ 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:
+ 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;
+ 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;
+ default: break;
}
} // for
} // for
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+ wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") );
GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
- 0, 0,
- bitmap.GetWidth(), bitmap.GetHeight() );
+ 0, 0,
+ bitmap.GetWidth(), bitmap.GetHeight() );
- wxCHECK_RET( gdk_image, "couldn't create image" );
+ wxCHECK_RET( gdk_image, _T("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" );
+ wxFAIL_MSG( _T("couldn't create image") );
return;
}
if (bitmap.GetMask())
{
gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
- 0, 0,
- bitmap.GetWidth(), bitmap.GetHeight() );
+ 0, 0,
+ bitmap.GetWidth(), bitmap.GetHeight() );
SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
}
{
for (int i = 0; i < bitmap.GetWidth(); i++)
{
- int pixel = gdk_image_get_pixel( gdk_image, i, j );
+ wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j );
+ pixel = wxINT32_SWAP_ON_BE( pixel );
if (bpp <= 8)
{
data[pos] = cmap->colors[pixel].red >> 8;
data[pos] = 16;
data[pos+1] = 16;
data[pos+2] = 16;
- }
+ }
}
pos += 3;
#endif
-// TODO
+//-----------------------------------------------------------------------------
+// Motif conversion routines
+//-----------------------------------------------------------------------------
#ifdef __WXMOTIF__
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+ wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
int width = GetWidth();
int height = GetHeight();
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 = new char[ data_image->bytes_per_line * data_image->height ];
+ 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;
+ GdkImage *mask_image = (GdkImage*) NULL;
- if (HasMask())
- {
+ 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 );
+ 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 );
+ wxMask *mask = new wxMask();
+ mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
- bitmap.SetMask( mask );
- }
-*/
+ 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;
- }
-
+
+ wxCHECK_MSG( vi, wxNullBitmap, _T("no visual") );
+
XFree( vi );
if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask)) b_o = GBR;
}
-/*
+ /*
int r_mask = GetMaskRed();
int g_mask = GetMaskGreen();
int b_mask = GetMaskBlue();
-*/
+ */
XColor colors[256];
if (bpp == 8)
{
- Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy );
-
+ Colormap cmap = (Colormap) wxTheApp->GetMainColormap( dpy );
+
for (int i = 0; i < 256; i++) colors[i].pixel = i;
- XQueryColors( dpy, cmap, colors, 256 );
+ XQueryColors( dpy, cmap, colors, 256 );
}
unsigned char* data = GetData();
for (int x = 0; x < width; x++)
{
int r = data[index];
- index++;
+ index++;
int g = data[index];
- 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:
- {
+ 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:
+ {
int pixel = -1;
-/*
- if (wxTheApp->m_colorCube)
- {
- pixel = wxTheApp->m_colorCube
- [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
- }
+ /*
+ if (wxTheApp->m_colorCube)
+ {
+ pixel = wxTheApp->m_colorCube
+ [ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
+ }
else
- {
-*/
- int max = 3 * (65536);
- for (int i = 0; i < 256; i++)
- {
- int rdiff = (r << 8) - colors[i].red;
- int gdiff = (g << 8) - colors[i].green;
- int bdiff = (b << 8) - colors[i].blue;
- int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
- if (sum < max) { pixel = i; max = sum; }
- }
-/*
- }
-*/
- XPutPixel( data_image, x, y, pixel );
- break;
- }
- case 15:
- {
- int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
- XPutPixel( data_image, x, y, pixel );
- break;
- }
- case 16:
- {
- int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
- XPutPixel( data_image, x, y, pixel );
- break;
- }
- case 32:
- case 24:
- {
- int pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = (r << 16) | (g << 8) | b; break;
- case RBG: pixel = (r << 16) | (b << 8) | g; break;
- case BRG: pixel = (b << 16) | (r << 8) | g; break;
- case BGR: pixel = (b << 16) | (g << 8) | r; break;
- case GRB: pixel = (g << 16) | (r << 8) | b; break;
- case GBR: pixel = (g << 16) | (b << 8) | r; break;
- }
- XPutPixel( data_image, x, y, pixel );
- }
- default: break;
- }
+ {
+ */
+ int max = 3 * (65536);
+ for (int i = 0; i < 256; i++)
+ {
+ int rdiff = (r << 8) - colors[i].red;
+ int gdiff = (g << 8) - colors[i].green;
+ int bdiff = (b << 8) - colors[i].blue;
+ int sum = abs (rdiff) + abs (gdiff) + abs (bdiff);
+ if (sum < max) { pixel = i; max = sum; }
+ }
+ /*
+ }
+ */
+ XPutPixel( data_image, x, y, pixel );
+ break;
+ }
+ case 15:
+ {
+ int pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
+ XPutPixel( data_image, x, y, pixel );
+ break;
+ }
+ case 16:
+ {
+ int pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
+ XPutPixel( data_image, x, y, pixel );
+ break;
+ }
+ case 32:
+ case 24:
+ {
+ int pixel = 0;
+ switch (b_o)
+ {
+ case RGB: pixel = (r << 16) | (g << 8) | b; break;
+ case RBG: pixel = (r << 16) | (b << 8) | g; break;
+ case BRG: pixel = (b << 16) | (r << 8) | g; break;
+ case BGR: pixel = (b << 16) | (g << 8) | r; break;
+ case GRB: pixel = (g << 16) | (r << 8) | b; break;
+ case GBR: pixel = (g << 16) | (b << 8) | r; break;
+ }
+ XPutPixel( data_image, x, y, pixel );
+ }
+ default: break;
+ }
} // for
} // for
XDestroyImage( data_image );
XFreeGC( dpy, gc );
-/*
+ /*
// Blit mask
- if (HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
+ 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 );
- }
-*/
+ gdk_image_destroy( mask_image );
+ gdk_gc_unref( mask_gc );
+ }
+ */
return bitmap;
}
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+ wxCHECK_RET( bitmap.Ok(), _T("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 );
+ (Drawable)bitmap.GetPixmap(),
+ 0, 0,
+ bitmap.GetWidth(), bitmap.GetHeight(),
+ AllPlanes, ZPixmap );
- wxCHECK_RET( ximage, "couldn't create image" );
+ wxCHECK_RET( ximage, _T("couldn't create image") );
Create( bitmap.GetWidth(), bitmap.GetHeight() );
char unsigned *data = GetData();
if (!data)
{
XDestroyImage( ximage );
- wxFAIL_MSG( "couldn't create image" );
+ wxFAIL_MSG( _T("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() );
+ gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
+ 0, 0,
+ bitmap.GetWidth(), bitmap.GetHeight() );
- SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
- }
-*/
+ 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;
- }
-
+
+ wxCHECK_RET( vi, _T("no visual") );
+
if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
-
+
XFree( vi );
XColor colors[256];
if (bpp == 8)
{
- Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy );
-
+ Colormap cmap = (Colormap)wxTheApp->GetMainColormap( dpy );
+
for (int i = 0; i < 256; i++) colors[i].pixel = i;
- XQueryColors( dpy, cmap, colors, 256 );
+ XQueryColors( dpy, cmap, colors, 256 );
}
long pos = 0;
{
for (int i = 0; i < bitmap.GetWidth(); i++)
{
- int pixel = XGetPixel( ximage, i, j );
+ int pixel = XGetPixel( ximage, i, j );
if (bpp <= 8)
{
data[pos] = colors[pixel].red >> 8;
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;
- }
+ 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;
}
}
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(); };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
projects / wxWidgets.git / blobdiff