#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#include "wx/image.h"
#include <string.h>
#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
+ #undef FAR
#endif
#ifdef __WXMSW__
-#include <windows.h>
+ #include "wx/msw/private.h"
#endif
//-----------------------------------------------------------------------------
{
public:
- wxImageRefData(void);
- ~wxImageRefData(void);
+ wxImageRefData();
+ ~wxImageRefData();
int m_width;
int m_height;
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()
UnRef();
}
-wxImage wxImage::Scale( int width, int height )
+wxImage wxImage::Scale( int width, int height ) const
{
wxImage image;
- wxCHECK_MSG( Ok(), image, _T("invalid image") );
+ wxCHECK_MSG( Ok(), image, T("invalid image") );
- wxCHECK_MSG( (width > 0) && (height > 0), image, _T("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, _T("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 );
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(), _T("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), _T("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, _T("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, _T("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, _T("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, _T("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, _T("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, _T("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, _T("invalid image") );
+ wxCHECK_MSG( Ok(), (char unsigned *)NULL, T("invalid image") );
return M_IMGDATA->m_data;
}
void wxImage::SetData( char unsigned *data )
{
- wxCHECK_RET( Ok(), _T("invalid image") );
-
- memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3);
+ 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(), _T("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, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, T("invalid image") );
return M_IMGDATA->m_maskRed;
}
unsigned char wxImage::GetMaskGreen() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, T("invalid image") );
return M_IMGDATA->m_maskGreen;
}
unsigned char wxImage::GetMaskBlue() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, T("invalid image") );
return M_IMGDATA->m_maskBlue;
}
void wxImage::SetMask( bool mask )
{
- wxCHECK_RET( Ok(), _T("invalid image") );
+ wxCHECK_RET( Ok(), T("invalid image") );
M_IMGDATA->m_hasMask = mask;
}
bool wxImage::HasMask() const
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+ wxCHECK_MSG( Ok(), FALSE, T("invalid image") );
return M_IMGDATA->m_hasMask;
}
int wxImage::GetWidth() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, T("invalid image") );
return M_IMGDATA->m_width;
}
int wxImage::GetHeight() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, T("invalid image") );
return M_IMGDATA->m_height;
}
}
else {
- wxLogError( _T("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;
}
}
else {
- wxLogError( _T("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
+
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( _T("No image handler for type %d defined."), type );
+ wxLogWarning( T("No image handler for type %d defined."), type );
return FALSE;
}
if (handler == NULL)
{
- wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );
+ wxLogWarning( T("No image handler for type %s defined."), mimetype.GetData() );
return FALSE;
}
bool wxImage::SaveFile( wxOutputStream& stream, int type )
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+ wxCHECK_MSG( Ok(), FALSE, T("invalid image") );
wxImageHandler *handler = FindHandler(type);
if (handler == NULL)
{
- wxLogWarning( _T("No image handler for type %d defined."), type );
+ wxLogWarning( T("No image handler for type %d defined."), type );
return FALSE;
}
bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+ 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() );
+ wxLogWarning( T("No image handler for type %s defined."), mimetype.GetData() );
return FALSE;
}
void wxImage::InitStandardHandlers()
{
- AddHandler( new wxBMPHandler );
+ AddHandler( new wxBMPHandler );
}
void wxImage::CleanUpHandlers()
#endif
#if wxUSE_STREAMS
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream) )
+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;
}
-#endif // wxUSE_STREAMS
-
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
-#endif
-#if wxUSE_STREAMS
-bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
+bool wxImageHandler::CanRead( wxInputStream& WXUNUSED(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
-
-#ifndef BI_BITFIELDS
-#define BI_BITFIELDS 3
-#endif
-
- image->Destroy();
-
- done = 0;
- /*
- * Reading the bmp header
- */
-
- stream.Read(&bbuf, 2);
-
- stream.Read(dbuf, 4 * 4);
-
- size = dbuf[0];
- offset = dbuf[2];
+ return FALSE;
+}
- stream.Read(dbuf, 4 * 2);
- int width = (int)dbuf[0];
- int height = (int)dbuf[1];
- if (width > 32767)
- {
- wxLogError( _T("Image width > 32767 pixels for file.") );
- return FALSE;
- }
- if (height > 32767)
- {
- wxLogError( _T("Image height > 32767 pixels for file.") );
- 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( _T("unknown bitdepth in file.") );
- return FALSE;
- }
- stream.Read(dbuf, 4 * 4);
- comp = (int)dbuf[0];
- if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
+bool wxImageHandler::CanRead( const wxString& name )
+{
+#if wxUSE_STREAMS
+ if (wxFileExists(name))
{
- wxLogError( _T("unknown encoding in Windows BMP file.") );
- return FALSE;
+ wxFileInputStream stream(name);
+ return CanRead(stream);
}
- 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( _T("encoding of BMP doesn't match bitdepth.") );
- return FALSE;
- }
- if (bpp < 16)
- {
- cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors);
- if (!cmap)
- {
- wxLogError( _T("Cannot allocate RAM for color map in BMP file.") );
- return FALSE;
- }
- }
- else
- cmap = NULL;
+ else {
+ wxLogError( T("Can't check image format of file '%s': file does not exist."), name.c_str() );
- image->Create( width, height );
- ptr = image->GetData();
- if (!ptr)
- {
- wxLogError( _T("Cannot allocate RAM for RGB data in file.") );
- if (cmap)
- free(cmap);
return FALSE;
}
+#else // !wxUSE_STREAMS
+ return FALSE;
+#endif // wxUSE_STREAMS
+}
- /*
- * 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;
- }
- }
-
- /*
- * 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....
- */
-
- 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( _T("can't deal with 4bit encoded yet.") );
- 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
+//-----------------------------------------------------------------------------
+// MSW conversion routines
+//-----------------------------------------------------------------------------
+
#ifdef __WXMSW__
wxBitmap wxImage::ConvertToBitmap() const
{
+ if ( !Ok() )
+ return wxNullBitmap;
+
// sizeLimit is the MS upper limit for the DIB size
+#ifdef WIN32
int sizeLimit = 1024*768*3;
+#else
+ int sizeLimit = 0x7fff ;
+#endif
// width and height of the device-dependent bitmap
int width = GetWidth();
// calc the number of bytes per scanline and padding
int bytePerLine = width*3;
int sizeDWORD = sizeof( DWORD );
- div_t lineBoundary = div( bytePerLine, sizeDWORD );
+ int lineBoundary = bytePerLine % sizeDWORD;
int padding = 0;
- if( lineBoundary.rem > 0 )
+ if( lineBoundary > 0 )
{
- padding = sizeDWORD - lineBoundary.rem;
+ padding = sizeDWORD - lineBoundary;
bytePerLine += padding;
}
// calc the number of DIBs and heights of DIBs
height = bmpHeight;
else
{
- div_t result = div( bmpHeight, height );
- numDIB = result.quot;
- hRemain = result.rem;
+ numDIB = bmpHeight / height;
+ hRemain = bmpHeight % height;
if( hRemain >0 ) numDIB++;
}
// set bitmap parameters
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, _T("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, _T("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( _T("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( _T("invalid bitmap") );
+ wxFAIL_MSG( T("invalid bitmap") );
return;
}
unsigned char *data = GetData();
if( !data )
{
- wxFAIL_MSG( _T("could not allocate data for image") );
+ wxFAIL_MSG( T("could not allocate data for image") );
return;
}
// 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 lineBoundary = bytePerLine % sizeDWORD;
int padding = 0;
- if( lineBoundary.rem > 0 )
+ if( lineBoundary > 0 )
{
- padding = sizeDWORD - lineBoundary.rem;
+ padding = sizeDWORD - lineBoundary;
bytePerLine += padding;
}
LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
if( !lpDIBh )
{
- wxFAIL_MSG( _T("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( _T("could not allocate data for DIB") );
+ wxFAIL_MSG( T("could not allocate data for DIB") );
free( data );
free( lpDIBh );
return;
#endif
+//-----------------------------------------------------------------------------
+// GTK conversion routines
+//-----------------------------------------------------------------------------
+
#ifdef __WXGTK__
#include "gtk/gtk.h"
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
+ wxCHECK_MSG( Ok(), bitmap, T("invalid image") );
int width = GetWidth();
int height = GetHeight();
// Retrieve depth
GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
- if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+ if (visual == NULL) visual = gdk_visual_get_system();
int bpp = visual->depth;
bitmap.SetDepth( bpp );
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), _T("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, _T("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( _T("couldn't create image") );
+ wxFAIL_MSG( T("couldn't create image") );
return;
}
{
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;
#endif
+//-----------------------------------------------------------------------------
+// Motif conversion routines
+//-----------------------------------------------------------------------------
+
#ifdef __WXMOTIF__
#include <Xm/Xm.h>
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
+ wxCHECK_MSG( Ok(), bitmap, T("invalid image") );
int width = GetWidth();
int height = GetHeight();
vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
- wxCHECK_MSG( vi, wxNullBitmap, _T("no visual") );
+ wxCHECK_MSG( vi, wxNullBitmap, T("no visual") );
XFree( vi );
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), _T("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, _T("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( _T("couldn't create image") );
+ wxFAIL_MSG( T("couldn't create image") );
return;
}
vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
- wxCHECK_MSG( vi, wxNullBitmap, _T("no visual") );
+ wxCHECK_RET( vi, T("no visual") );
if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
projects / wxWidgets.git / blobdiff