X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b280524bb94f3e1ceca283b23b0f374e4182762..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 8ef0b3429a..fa17d43fa0 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -150,19 +150,19 @@ void wxImage::Destroy() 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, wxT("invalid image") ); - wxCHECK_MSG( (width > 0) && (height > 0), image, _T("invalid image size") ); + wxCHECK_MSG( (width > 0) && (height > 0), image, wxT("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, wxT("unable to create image") ); if (M_IMGDATA->m_hasMask) image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); @@ -189,14 +189,51 @@ wxImage wxImage::Scale( int width, int height ) return image; } +wxImage wxImage::GetSubImage( const wxRect &rect ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()) + , image, wxT("invalid subimage size") ); + + int subwidth=rect.GetWidth(); + const int subheight=rect.GetHeight(); + + image.Create( subwidth, subheight ); + + char unsigned *subdata = image.GetData(), *data=GetData(); + + wxCHECK_MSG( subdata, image, wxT("unable to create image") ); + + if (M_IMGDATA->m_hasMask) + image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + + const int subleft=3*rect.GetLeft(); + const int width=3*GetWidth(); + subwidth*=3; + + data+=rect.GetTop()*width+subleft; + + for (long j = 0; j < subheight; ++j) + { + memcpy( subdata, data, subwidth); + subdata+=subwidth; + data+=width; + } + + return image; +} + void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), _T("invalid image") ); + wxCHECK_RET( Ok(), wxT("invalid image") ); int w = M_IMGDATA->m_width; int h = M_IMGDATA->m_height; - wxCHECK_RET( (x>=0) && (y>=0) && (x=0) && (y>=0) && (xm_width; int h = M_IMGDATA->m_height; - wxCHECK_MSG( (x>=0) && (y>=0) && (x=0) && (y>=0) && (xm_width; int h = M_IMGDATA->m_height; - wxCHECK_MSG( (x>=0) && (y>=0) && (x=0) && (y>=0) && (xm_width; int h = M_IMGDATA->m_height; - wxCHECK_MSG( (x>=0) && (y>=0) && (x=0) && (y>=0) && (xm_data; } void wxImage::SetData( char unsigned *data ) { - wxCHECK_RET( Ok(), _T("invalid image") ); + wxCHECK_RET( Ok(), wxT("invalid image") ); + + wxImageRefData *newRefData = new wxImageRefData(); + + newRefData->m_width = M_IMGDATA->m_width; + newRefData->m_height = M_IMGDATA->m_height; + newRefData->m_data = data; + newRefData->m_ok = TRUE; + newRefData->m_maskRed = M_IMGDATA->m_maskRed; + newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; + newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; + newRefData->m_hasMask = M_IMGDATA->m_hasMask; + + UnRef(); - memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3); + m_refData = newRefData; } void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), _T("invalid image") ); + wxCHECK_RET( Ok(), wxT("invalid image") ); M_IMGDATA->m_maskRed = r; M_IMGDATA->m_maskGreen = g; @@ -278,49 +328,49 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) unsigned char wxImage::GetMaskRed() const { - wxCHECK_MSG( Ok(), 0, _T("invalid image") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskRed; } unsigned char wxImage::GetMaskGreen() const { - wxCHECK_MSG( Ok(), 0, _T("invalid image") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskGreen; } unsigned char wxImage::GetMaskBlue() const { - wxCHECK_MSG( Ok(), 0, _T("invalid image") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskBlue; } void wxImage::SetMask( bool mask ) { - wxCHECK_RET( Ok(), _T("invalid image") ); + wxCHECK_RET( Ok(), wxT("invalid image") ); M_IMGDATA->m_hasMask = mask; } bool wxImage::HasMask() const { - wxCHECK_MSG( Ok(), FALSE, _T("invalid image") ); + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); return M_IMGDATA->m_hasMask; } int wxImage::GetWidth() const { - wxCHECK_MSG( Ok(), 0, _T("invalid image") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); return M_IMGDATA->m_width; } int wxImage::GetHeight() const { - wxCHECK_MSG( Ok(), 0, _T("invalid image") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); return M_IMGDATA->m_height; } @@ -335,7 +385,7 @@ bool wxImage::LoadFile( const wxString& filename, long type ) } else { - wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() ); + wxLogError( wxT("Can't load image from file '%s': file does not exist."), filename.c_str() ); return FALSE; } @@ -354,7 +404,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype ) } else { - wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() ); + wxLogError( wxT("Can't load image from file '%s': file does not exist."), filename.c_str() ); return FALSE; } @@ -387,18 +437,61 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) return FALSE; } +bool wxImage::CanRead( const wxString &name ) +{ +#if wxUSE_STREAMS + wxFileInputStream stream(name); + return CanRead(stream); +#else + return FALSE; +#endif +} + #if wxUSE_STREAMS + +bool wxImage::CanRead( wxInputStream &stream ) +{ + wxList &list=GetHandlers(); + + for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() ) + { + wxImageHandler *handler=(wxImageHandler*)node->GetData(); + if (handler->CanRead( stream )) + return TRUE; + } + + return FALSE; +} + bool wxImage::LoadFile( 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( wxT("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( wxT("No image handler for type %d defined."), type ); return FALSE; } @@ -416,7 +509,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype ) if (handler == NULL) { - wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() ); + wxLogWarning( wxT("No image handler for type %s defined."), mimetype.GetData() ); return FALSE; } @@ -426,13 +519,13 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype ) bool wxImage::SaveFile( wxOutputStream& stream, int type ) { - wxCHECK_MSG( Ok(), FALSE, _T("invalid image") ); + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); wxImageHandler *handler = FindHandler(type); if (handler == NULL) { - wxLogWarning( _T("No image handler for type %d defined."), type ); + wxLogWarning( wxT("No image handler for type %d defined."), type ); return FALSE; } @@ -442,13 +535,13 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) { - wxCHECK_MSG( Ok(), FALSE, _T("invalid image") ); + wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); wxImageHandler *handler = FindHandlerMime(mimetype); if (handler == NULL) { - wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() ); + wxLogWarning( wxT("No image handler for type %s defined."), mimetype.GetData() ); return FALSE; } @@ -538,7 +631,7 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype ) void wxImage::InitStandardHandlers() { - AddHandler( new wxBMPHandler ); + AddHandler( new wxBMPHandler ); } void wxImage::CleanUpHandlers() @@ -559,19 +652,41 @@ void wxImage::CleanUpHandlers() //----------------------------------------------------------------------------- #if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxImageHandler,wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject) #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; } + +bool wxImageHandler::CanRead( const wxString& name ) +{ +#if wxUSE_STREAMS + if (wxFileExists(name)) + { + wxFileInputStream stream(name); + return CanRead(stream); + } + + else { + wxLogError( wxT("Can't check image format of file '%s': file does not exist."), name.c_str() ); + + return FALSE; + } +#else // !wxUSE_STREAMS + return FALSE; +#endif // wxUSE_STREAMS +} + + + #endif // wxUSE_STREAMS //----------------------------------------------------------------------------- @@ -582,8 +697,15 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSE 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(); @@ -592,11 +714,11 @@ wxBitmap wxImage::ConvertToBitmap() const // 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 @@ -607,15 +729,14 @@ wxBitmap wxImage::ConvertToBitmap() const 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, wxT("invalid image") ); bitmap.SetWidth( width ); bitmap.SetHeight( bmpHeight ); bitmap.SetDepth( wxDisplayDepth() ); @@ -623,7 +744,7 @@ wxBitmap wxImage::ConvertToBitmap() const // 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, wxT("could not allocate memory for DIB header") ); // Fill in the DIB header lpDIBh->bmiHeader.biSize = headersize; lpDIBh->bmiHeader.biWidth = (DWORD)width; @@ -644,7 +765,7 @@ wxBitmap wxImage::ConvertToBitmap() const lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage ); if( !lpBits ) { - wxFAIL_MSG( _T("could not allocate memory for DIB") ); + wxFAIL_MSG( wxT("could not allocate memory for DIB") ); free( lpDIBh ); return bitmap; } @@ -699,7 +820,7 @@ wxBitmap wxImage::ConvertToBitmap() const // HDC memdc = ::CreateCompatibleDC( hdc ); // ::SelectObject( memdc, hbitmap); // ::SetDIBitsToDevice( memdc, 0, 0, width, height, - // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS); + // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS); // ::SelectObject( memdc, 0 ); // ::DeleteDC( memdc ); } @@ -787,7 +908,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) // check the bitmap if( !bitmap.Ok() ) { - wxFAIL_MSG( _T("invalid bitmap") ); + wxFAIL_MSG( wxT("invalid bitmap") ); return; } @@ -798,18 +919,18 @@ wxImage::wxImage( const wxBitmap &bitmap ) unsigned char *data = GetData(); if( !data ) { - wxFAIL_MSG( _T("could not allocate data for image") ); + wxFAIL_MSG( wxT("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; } @@ -818,7 +939,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); if( !lpDIBh ) { - wxFAIL_MSG( _T("could not allocate data for DIB header") ); + wxFAIL_MSG( wxT("could not allocate data for DIB header") ); free( data ); return; } @@ -840,7 +961,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage ); if( !lpBits ) { - wxFAIL_MSG( _T("could not allocate data for DIB") ); + wxFAIL_MSG( wxT("could not allocate data for DIB") ); free( data ); free( lpDIBh ); return; @@ -913,6 +1034,243 @@ wxImage::wxImage( const wxBitmap &bitmap ) #endif +#ifdef __WXMAC__ + +#include + +extern CTabHandle wxMacCreateColorTable( int numColors ) ; +extern void wxMacDestroyColorTable( CTabHandle colors ) ; +extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ; +extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ; +extern void wxMacDestroyGWorld( GWorldPtr gw ) ; + +wxBitmap wxImage::ConvertToBitmap() const +{ + // width and height of the device-dependent bitmap + int width = GetWidth(); + int height = GetHeight(); + + // Create picture + + wxBitmap bitmap( width , height , wxDisplayDepth() ) ; + + // Create mask + + if (HasMask()) + { + /* + unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + + mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); + + wxMask *mask = new wxMask(); + mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); + + bitmap.SetMask( mask ); + */ + } + + // Render + + int r_mask = GetMaskRed(); + int g_mask = GetMaskGreen(); + int b_mask = GetMaskBlue(); + + CGrafPtr origPort ; + GDHandle origDevice ; + + GetGWorld( &origPort , &origDevice ) ; + SetGWorld( bitmap.GetHBITMAP() , NULL ) ; + + register unsigned char* data = GetData(); + + int index = 0; + for (int y = 0; y < height; y++) + { +#if 0 + unsigned char lastr = 0 ; + unsigned char lastg = 0 ; + unsigned char lastb = 0 ; + RGBColor lastcolor ; + + MoveTo( 0 , y ) ; + for (int x = 0; x < width; x++) + { + unsigned char r = data[index++]; + unsigned char g = data[index++]; + unsigned char b = data[index++]; + + if ( r != lastr || g != lastg || b != lastb ) + { + lastcolor.red = ( lastr << 8 ) + lastr ; + lastcolor.green = ( lastg << 8 ) + lastg ; + lastcolor.blue = ( lastb << 8 ) + lastb ; + RGBForeColor( &lastcolor ) ; + LineTo( x , y ) ; + lastr = r ; + lastg = g ; + lastb = b ; + } + } // for width + lastcolor.red = ( lastr << 8 ) + lastr ; + lastcolor.green = ( lastg << 8 ) + lastg ; + lastcolor.blue = ( lastb << 8 ) + lastb ; + RGBForeColor( &lastcolor ) ; + LineTo( width - 1 , y ) ; +#else + for (int x = 0; x < width; x++) + { + unsigned char r = data[index++]; + unsigned char g = data[index++]; + unsigned char b = data[index++]; + RGBColor color ; + color.red = ( r << 8 ) + r ; + color.green = ( g << 8 ) + g ; + color.blue = ( b << 8 ) + b ; + SetCPixel( x , y , &color ) ; + } +#endif + } // for height + + SetGWorld( origPort , origDevice ) ; + + return bitmap; + +} + +wxImage::wxImage( const wxBitmap &bitmap ) +{ + // check the bitmap + if( !bitmap.Ok() ) + { + wxFAIL_MSG( "invalid bitmap" ); + return; + } + + // create an wxImage object + 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; + } + + // calc the number of bytes per scanline and padding in the DIB + int bytePerLine = width*3; + int sizeDWORD = sizeof( DWORD ); + div_t lineBoundary = div( bytePerLine, sizeDWORD ); + int padding = 0; + if( lineBoundary.rem > 0 ) + { + padding = sizeDWORD - lineBoundary.rem; + bytePerLine += padding; + } + + // create a DIB header + 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 = 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 ) + { + wxFAIL_MSG( "could not allocate data for DIB" ); + free( data ); + free( lpDIBh ); + return; + } + + // 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; iGetMaskBitmap() ) + { + 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; idepth; bitmap.SetDepth( bpp ); @@ -958,25 +1316,25 @@ wxBitmap wxImage::ConvertToBitmap() const { static bool s_hasInitialized = FALSE; - if (!s_hasInitialized) - { - gdk_rgb_init(); - s_hasInitialized = TRUE; - } + 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_draw_rgb_image( bitmap.GetPixmap(), + gc, + 0, 0, + width, height, + GDK_RGB_DITHER_NONE, + GetData(), + width*3 ); gdk_gc_unref( gc ); - return bitmap; + return bitmap; } #endif @@ -984,7 +1342,7 @@ wxBitmap wxImage::ConvertToBitmap() const // Create picture image GdkImage *data_image = - gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_best(), width, height ); + gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height ); // Create mask image @@ -994,7 +1352,7 @@ wxBitmap wxImage::ConvertToBitmap() const { unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); - mask_image = gdk_image_new_bitmap( gdk_visual_get_best(), 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 ); @@ -1009,7 +1367,7 @@ wxBitmap wxImage::ConvertToBitmap() const if (bpp >= 24) { - GdkVisual *visual = gdk_visual_get_best(); + GdkVisual *visual = gdk_visual_get_system(); if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB; else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RGB; else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG; @@ -1139,13 +1497,26 @@ wxBitmap wxImage::ConvertToBitmap() const wxImage::wxImage( const wxBitmap &bitmap ) { - wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") ); + wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") ); - GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(), - 0, 0, - bitmap.GetWidth(), bitmap.GetHeight() ); + GdkImage *gdk_image = (GdkImage*) NULL; + if (bitmap.GetPixmap()) + { + gdk_image = gdk_image_get( bitmap.GetPixmap(), + 0, 0, + bitmap.GetWidth(), bitmap.GetHeight() ); + } else + if (bitmap.GetBitmap()) + { + gdk_image = gdk_image_get( bitmap.GetBitmap(), + 0, 0, + bitmap.GetWidth(), bitmap.GetHeight() ); + } else + { + wxFAIL_MSG( wxT("Ill-formed bitmap") ); + } - wxCHECK_RET( gdk_image, _T("couldn't create image") ); + wxCHECK_RET( gdk_image, wxT("couldn't create image") ); Create( bitmap.GetWidth(), bitmap.GetHeight() ); char unsigned *data = GetData(); @@ -1153,7 +1524,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) if (!data) { gdk_image_destroy( gdk_image ); - wxFAIL_MSG( _T("couldn't create image") ); + wxFAIL_MSG( wxT("couldn't create image") ); return; } @@ -1167,7 +1538,12 @@ wxImage::wxImage( const wxBitmap &bitmap ) SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable } - GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); + GdkVisual *visual = (GdkVisual*) NULL; + if (bitmap.GetPixmap()) + visual = gdk_window_get_visual( bitmap.GetPixmap() ); + else + visual = gdk_window_get_visual( bitmap.GetBitmap() ); + if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); int bpp = visual->depth; if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; @@ -1179,7 +1555,8 @@ wxImage::wxImage( const wxBitmap &bitmap ) { 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; @@ -1237,7 +1614,7 @@ wxBitmap wxImage::ConvertToBitmap() const { wxBitmap bitmap; - wxCHECK_MSG( Ok(), bitmap, _T("invalid image") ); + wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); int width = GetWidth(); int height = GetHeight(); @@ -1286,7 +1663,7 @@ wxBitmap wxImage::ConvertToBitmap() const vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxCHECK_MSG( vi, wxNullBitmap, _T("no visual") ); + wxCHECK_MSG( vi, wxNullBitmap, wxT("no visual") ); XFree( vi ); @@ -1437,7 +1814,7 @@ wxBitmap wxImage::ConvertToBitmap() const wxImage::wxImage( const wxBitmap &bitmap ) { - wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") ); + wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") ); Display *dpy = (Display*) wxGetDisplay(); Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) ); @@ -1449,7 +1826,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) bitmap.GetWidth(), bitmap.GetHeight(), AllPlanes, ZPixmap ); - wxCHECK_RET( ximage, _T("couldn't create image") ); + wxCHECK_RET( ximage, wxT("couldn't create image") ); Create( bitmap.GetWidth(), bitmap.GetHeight() ); char unsigned *data = GetData(); @@ -1457,7 +1834,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) if (!data) { XDestroyImage( ximage ); - wxFAIL_MSG( _T("couldn't create image") ); + wxFAIL_MSG( wxT("couldn't create image") ); return; } @@ -1485,7 +1862,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxCHECK_RET( vi, _T("no visual") ); + wxCHECK_RET( vi, wxT("no visual") ); if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; @@ -1552,6 +1929,341 @@ wxImage::wxImage( const wxBitmap &bitmap ) } #endif +#ifdef __WXPM__ +// OS/2 Presentation manager conversion routings + +wxBitmap wxImage::ConvertToBitmap() const +{ + if ( !Ok() ) + return wxNullBitmap; + wxBitmap bitmap; // remove +// TODO: +/* + int sizeLimit = 1024*768*3; + + // width and height of the device-dependent bitmap + int width = GetWidth(); + int bmpHeight = GetHeight(); + + // calc the number of bytes per scanline and padding + int bytePerLine = width*3; + int sizeDWORD = sizeof( DWORD ); + 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++; + } + + // set bitmap parameters + wxBitmap bitmap; + wxCHECK_MSG( Ok(), bitmap, wxT("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, wxT("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( wxT("could not allocate memory for DIB") ); + free( lpDIBh ); + return bitmap; + } + + // 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 1 && n == numDIB-1 && hRemain > 0 ) + { + // redefine height and size of the (possibly) last smaller DIB + // memory is not reallocated + height = hRemain; + lpDIBh->bmiHeader.biHeight = (DWORD)(-height); + lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; + } + ptbits = lpBits; + + for( j=0; jbmiHeader), 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 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; jSetMaskBitmap( (WXHBITMAP) hbitmap ); + bitmap.SetMask( mask ); + } + + // free allocated resources + ::SelectObject( memdc, 0 ); + ::DeleteDC( memdc ); + ::ReleaseDC(NULL, hdc); + free(lpDIBh); + free(lpBits); + + // check the wxBitmap object + if( bitmap.GetHBITMAP() ) + bitmap.SetOk( TRUE ); + else + bitmap.SetOk( FALSE ); +*/ + return bitmap; +} + +wxImage::wxImage( const wxBitmap &bitmap ) +{ + // check the bitmap + if( !bitmap.Ok() ) + { + wxFAIL_MSG( wxT("invalid bitmap") ); + return; + } + + // create an wxImage object + int width = bitmap.GetWidth(); + int height = bitmap.GetHeight(); + Create( width, height ); + unsigned char *data = GetData(); + if( !data ) + { + wxFAIL_MSG( wxT("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 ); + int lineBoundary = bytePerLine % sizeDWORD; + int padding = 0; + if( lineBoundary > 0 ) + { + padding = sizeDWORD - lineBoundary; + bytePerLine += padding; + } +// TODO: +/* + // create a DIB header + int headersize = sizeof(BITMAPINFOHEADER); + LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); + if( !lpDIBh ) + { + wxFAIL_MSG( wxT("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 = 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 ) + { + wxFAIL_MSG( wxT("could not allocate data for DIB") ); + free( data ); + free( lpDIBh ); + return; + } + + // 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; iGetMaskBitmap() ) + { + 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