#include "wx/debug.h"
#include "wx/log.h"
#include "wx/app.h"
-#if wxUSE_LIBPNG
-#include "../png/png.h"
-#endif
-#if wxUSE_LIBJPEG
-extern "C" {
-#include <jpeglib.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__
#ifdef FAR
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 )
{
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 );
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") );
+
+ memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3);
}
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;
}
wxFileInputStream stream(filename);
return LoadFile(stream, type);
}
+
+ 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::LoadFile( const wxString& filename, const wxString& mimetype )
+{
+#if wxUSE_STREAMS
+ if (wxFileExists(filename))
+ {
+ wxFileInputStream stream(filename);
+ return LoadFile(stream, mimetype);
+ }
else {
- wxLogError( "Can't load image from file '%s': file does not exist.", filename.c_str() );
+ wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );
return FALSE;
}
{
#if wxUSE_STREAMS
wxFileOutputStream stream(filename);
-
+
if ( stream.LastError() == wxStream_NOERROR )
return SaveFile(stream, type);
else
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 )
{
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::LoadFile( wxInputStream& stream, const wxString& mimetype )
+{
+ UnRef();
+
+ m_refData = new wxImageRefData;
+
+ wxImageHandler *handler = FindHandlerMime(mimetype);
+
+ if (handler == NULL)
+ {
+ wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );
+
+ 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 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 );
-#if wxUSE_LIBPNG
- AddHandler( new wxPNGHandler );
-#endif
}
void wxImage::CleanUpHandlers()
}
#endif // wxUSE_STREAMS
-//-----------------------------------------------------------------------------
-// wxPNGHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBPNG
-
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
-#endif
-
-
-#if wxUSE_STREAMS
-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 )
-{
- ((wxOutputStream*) png_get_io_ptr( png_ptr )) -> Write(data, length);
-}
-
-bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
-{
- // VZ: as this function uses setjmp() the only fool proof error handling
- // method is to use goto (setjmp is not really C++ dtors friendly...)
-
- unsigned char **lines = (unsigned char **) NULL;
- unsigned int i;
- png_infop info_ptr = (png_infop) NULL;
-
- image->Destroy();
-
- 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;
-
- info_ptr = png_create_info_struct( png_ptr );
- if (!info_ptr)
- goto error;
-
- if (setjmp(png_ptr->jmpbuf))
- goto error;
-
- 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;
-
- 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 );
-
- if (color_type == PNG_COLOR_TYPE_PALETTE)
- png_set_expand( png_ptr );
-
- png_set_strip_16( png_ptr );
- png_set_packing( png_ptr );
- if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS))
- png_set_expand( png_ptr );
- png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER );
-
- image->Create( width, height );
-
- if (!image->Ok())
- goto error;
-
- lines = (unsigned char **)malloc( height * sizeof(unsigned char *) );
- if (lines == NULL)
- goto error;
-
- for (i = 0; i < height; i++)
- {
- if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL)
- {
- for ( unsigned int n = 0; n < i; n++ )
- free( lines[n] );
- goto error;
- }
- }
-
- // 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 (unsigned int y = 0; y < height; y++)
- {
- 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;
- }
- }
- }
- }
- else
- {
- for (unsigned int y = 0; y < height; y++)
- {
- unsigned char *ptr2 = lines[y];
- for (unsigned int x = 0; x < width; x++)
- {
- unsigned char r = *ptr2++;
- unsigned char g = *ptr2++;
- unsigned char b = *ptr2++;
- unsigned char a = *ptr2++;
- if (a < 128)
- {
- *ptr++ = 255;
- *ptr++ = 0;
- *ptr++ = 255;
- transp = 1;
- }
- else
- {
- if ((r == 255) && (g == 0) && (b == 255)) r = 254;
- *ptr++ = r;
- *ptr++ = g;
- *ptr++ = b;
- }
- }
- }
- }
-
- for ( unsigned int j = 0; j < height; j++ )
- free( lines[j] );
- free( lines );
-
- if (transp)
- {
- image->SetMaskColour( 255, 0, 255 );
- }
- else
- {
- image->SetMask( FALSE );
- }
- }
-
- return TRUE;
-
-error:
- wxLogError(_("Couldn't load a PNG image - probably file is corrupted."));
-
- if ( image->Ok() )
- {
- image->Destroy();
- }
-
- if ( lines )
- {
- free( lines );
- }
-
- if ( png_ptr )
- {
- 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 );
- }
- 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)
- {
- return FALSE;
- }
-
- png_infop info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL)
- {
- png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
- return FALSE;
- }
-
- if (setjmp(png_ptr->jmpbuf))
- {
- png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
- return FALSE;
- }
-
- 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)
- {
- png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
- return FALSE;
- }
-
- for (int y = 0; y < image->GetHeight(); y++)
- {
- unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3);
- for (int x = 0; x < image->GetWidth(); x++)
- {
- data[(x << 2) + 0] = *ptr++;
- data[(x << 2) + 1] = *ptr++;
- data[(x << 2) + 2] = *ptr++;
- if ((data[(x << 2) + 0] == image->GetMaskRed()) &&
- (data[(x << 2) + 1] == image->GetMaskGreen()) &&
- (data[(x << 2) + 2] == image->GetMaskBlue()))
- {
- data[(x << 2) + 3] = 0;
- }
- else
- {
- data[(x << 2) + 3] = 255;
- }
- }
- png_bytep row_ptr = data;
- png_write_rows( png_ptr, &row_ptr, 1 );
- }
-
- free(data);
- png_write_end( png_ptr, info_ptr );
- png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr );
- }
- return TRUE;
-}
-#endif // wxUSE_STREAMS
-
-#endif
-
-// wxUSE_LIBPNG
-
-
-//-----------------------------------------------------------------------------
-// wxJPEGHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBJPEG
-
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
-#endif
-
-#if wxUSE_STREAMS
-
-
-//------------- JPEG Data Source Manager
-
-typedef struct {
- struct jpeg_source_mgr pub; /* public fields */
-
- JOCTET* buffer; /* start of buffer */
-} my_source_mgr;
-
-typedef my_source_mgr * my_src_ptr;
-
-METHODDEF(void) my_init_source ( j_decompress_ptr cinfo )
-{
-}
-
-METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo )
-{
- return TRUE;
-}
-
-METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
-{
- my_src_ptr src = (my_src_ptr) cinfo->src;
-
- src->pub.next_input_byte += (size_t) num_bytes;
- src->pub.bytes_in_buffer -= (size_t) num_bytes;
-}
-
-METHODDEF(void) my_term_source ( j_decompress_ptr cinfo )
-{
- my_src_ptr src = (my_src_ptr) cinfo->src;
-
- free (src->buffer);
-}
-
-void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile )
-{
- my_src_ptr src;
-
- if (cinfo->src == NULL) { /* first time for this JPEG object? */
- cinfo->src = (struct jpeg_source_mgr *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
- sizeof(my_source_mgr));
- src = (my_src_ptr) cinfo->src;
- }
- src = (my_src_ptr) cinfo->src;
- src->pub.bytes_in_buffer = infile.StreamSize(); /* forces fill_input_buffer on first read */
- src->buffer = (JOCTET *) malloc (infile.StreamSize());
- src->pub.next_input_byte = src->buffer; /* until buffer loaded */
- infile.Read(src->buffer, infile.StreamSize());
-
- src->pub.init_source = my_init_source;
- src->pub.fill_input_buffer = my_fill_input_buffer;
- src->pub.skip_input_data = my_skip_input_data;
- src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
- src->pub.term_source = my_term_source;
-}
-
-
-
-bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream )
-{
- struct jpeg_decompress_struct cinfo;
- struct jpeg_error_mgr jerr;
- JSAMPARRAY tempbuf;
- unsigned char *ptr;
- unsigned stride;
-
- image->Destroy();
- cinfo.err = jpeg_std_error( &jerr );
- jpeg_create_decompress( &cinfo );
- jpeg_wxio_src( &cinfo, stream );
- jpeg_read_header( &cinfo, TRUE );
- cinfo.out_color_space = JCS_RGB;
- jpeg_start_decompress( &cinfo );
-
- image->Create( cinfo.image_width, cinfo.image_height );
- if (!image->Ok()) {
- jpeg_finish_decompress( &cinfo );
- jpeg_destroy_decompress( &cinfo );
- return FALSE;
- }
- image->SetMask( FALSE );
- ptr = image->GetData();
- stride = cinfo.output_width * 3;
- tempbuf = (*cinfo.mem->alloc_sarray)
- ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );
-
- while ( cinfo.output_scanline < cinfo.output_height ) {
- jpeg_read_scanlines( &cinfo, tempbuf, 1 );
- memcpy( ptr, tempbuf[0], stride );
- ptr += stride;
- }
- jpeg_finish_decompress( &cinfo );
- jpeg_destroy_decompress( &cinfo );
- return TRUE;
-}
-
-
-
-
-
-typedef struct {
- struct jpeg_destination_mgr pub;
-
- wxOutputStream *stream;
- JOCTET * buffer;
-} my_destination_mgr;
-
-typedef my_destination_mgr * my_dest_ptr;
-
-#define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */
-
-METHODDEF(void) init_destination (j_compress_ptr cinfo)
-{
- my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
- /* Allocate the output buffer --- it will be released when done with image */
- dest->buffer = (JOCTET *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
- OUTPUT_BUF_SIZE * sizeof(JOCTET));
- dest->pub.next_output_byte = dest->buffer;
- dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-}
-
-METHODDEF(boolean) empty_output_buffer (j_compress_ptr cinfo)
-{
- my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
- dest->stream->Write(dest->buffer, OUTPUT_BUF_SIZE);
- dest->pub.next_output_byte = dest->buffer;
- dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
- return TRUE;
-}
-
-METHODDEF(void) term_destination (j_compress_ptr cinfo)
-{
- my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
- size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
- /* Write any data remaining in the buffer */
- if (datacount > 0)
- dest->stream->Write(dest->buffer, datacount);
-}
-
-GLOBAL(void) jpeg_wxio_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
-{
- my_dest_ptr dest;
-
- if (cinfo->dest == NULL) { /* first time for this JPEG object? */
- cinfo->dest = (struct jpeg_destination_mgr *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
- sizeof(my_destination_mgr));
- }
-
- dest = (my_dest_ptr) cinfo->dest;
- dest->pub.init_destination = init_destination;
- dest->pub.empty_output_buffer = empty_output_buffer;
- dest->pub.term_destination = term_destination;
- dest->stream = &outfile;
-}
-
-
-
-bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
-{
- struct jpeg_compress_struct cinfo;
- struct jpeg_error_mgr jerr;
- JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
- JSAMPLE *image_buffer;
- int stride; /* physical row width in image buffer */
-
- cinfo.err = jpeg_std_error(&jerr);
- jpeg_create_compress(&cinfo);
- jpeg_wxio_dest(&cinfo, stream);
-
- cinfo.image_width = image->GetWidth();
- cinfo.image_height = image->GetHeight();
- cinfo.input_components = 3;
- cinfo.in_color_space = JCS_RGB;
- jpeg_set_defaults(&cinfo);
- jpeg_start_compress(&cinfo, TRUE);
-
- stride = cinfo.image_width * 3; /* JSAMPLEs per row in image_buffer */
- image_buffer = image->GetData();
- while (cinfo.next_scanline < cinfo.image_height) {
- row_pointer[0] = &image_buffer[cinfo.next_scanline * stride];
- jpeg_write_scanlines( &cinfo, row_pointer, 1 );
- }
- jpeg_finish_compress(&cinfo);
- jpeg_destroy_compress(&cinfo);
-
- return TRUE;
-}
-#endif // wxUSE_STREAMS
-
-#endif
-
-// wxUSE_LIBJPEG
-
-
-
//-----------------------------------------------------------------------------
// wxBMPHandler
//-----------------------------------------------------------------------------
int height = (int)dbuf[1];
if (width > 32767)
{
- wxLogError( "Image width > 32767 pixels for file\n" );
+ wxLogError( _T("Image width > 32767 pixels for file\n") );
return FALSE;
}
if (height > 32767)
{
- wxLogError( "Image height > 32767 pixels for file\n" );
+ wxLogError( _T("Image height > 32767 pixels for file\n") );
return FALSE;
}
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" );
+ wxLogError( _T("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" );
+ wxLogError( _T("unknown encoding in Windows BMP file\n") );
return FALSE;
}
stream.Read(dbuf, 4 * 2);
/* 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" );
+ wxLogError( _T("encoding of BMP doesn't match bitdepth\n") );
return FALSE;
}
if (bpp < 16)
if (!cmap)
{
- wxLogError( "Cannot allocate RAM for color map in BMP file\n" );
+ wxLogError( _T("Cannot allocate RAM for color map in BMP file\n") );
return FALSE;
}
}
ptr = image->GetData();
if (!ptr)
{
- wxLogError( "Cannot allocate RAM for RGB data in file\n" );
+ wxLogError( _T("Cannot allocate RAM for RGB data in file\n") );
if (cmap)
free(cmap);
return FALSE;
{
if (comp == BI_RLE4)
{
- wxLogError( "can't deal with 4bit encoded yet.\n");
+ wxLogError( _T("can't deal with 4bit encoded yet.\n") );
image->Destroy();
free(cmap);
return FALSE;
// set bitmap parameters
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+ 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, "could not allocate memory for DIB header" );
+ 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;
lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
if( !lpBits )
{
- wxFAIL_MSG( "could not allocate memory for DIB" );
+ wxFAIL_MSG( _T("could not allocate memory for DIB") );
free( lpDIBh );
return bitmap;
}
// check the bitmap
if( !bitmap.Ok() )
{
- wxFAIL_MSG( "invalid bitmap" );
+ wxFAIL_MSG( _T("invalid bitmap") );
return;
}
unsigned char *data = GetData();
if( !data )
{
- wxFAIL_MSG( "could not allocate data for image" );
+ wxFAIL_MSG( _T("could not allocate data for image") );
return;
}
LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
if( !lpDIBh )
{
- wxFAIL_MSG( "could not allocate data for DIB header" );
+ wxFAIL_MSG( _T("could not allocate data for DIB header") );
free( data );
return;
}
lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
if( !lpBits )
{
- wxFAIL_MSG( "could not allocate data for DIB" );
+ wxFAIL_MSG( _T("could not allocate data for DIB") );
free( data );
free( lpDIBh );
return;
#include "gdk/gdk.h"
#include "gdk/gdkx.h"
+#if (GTK_MINOR_VERSION > 0)
+#include "gdk/gdkrgb.h"
+#endif
+
wxBitmap wxImage::ConvertToBitmap() const
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+ wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
int width = GetWidth();
int height = GetHeight();
bitmap.SetHeight( height );
bitmap.SetWidth( width );
- // Create picture
+ bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
+
+ // 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;
+
+#if (GTK_MINOR_VERSION > 0)
+
+ if (!HasMask() && (bpp > 8))
+ {
+ static bool s_hasInitialized = FALSE;
+
+ if (!s_hasInitialized)
+ {
+ gdk_rgb_init();
+ s_hasInitialized = TRUE;
+ }
+
+ GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() );
+
+ gdk_draw_rgb_image( bitmap.GetPixmap(),
+ gc,
+ 0, 0,
+ width, height,
+ GDK_RGB_DITHER_NONE,
+ GetData(),
+ width*3 );
+
+ gdk_gc_unref( gc );
+
+ return bitmap;
+ }
+
+#endif
+
+ // Create picture image
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
+ // 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 };
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() );
- 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;
}
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, "invalid image" );
-
+ wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
+
int width = GetWidth();
int height = GetHeight();
// 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
}
XFree( vi );
-
+
if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
if (bpp < 8) bpp = 8;
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 ) );
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;
}
*/
}
#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