Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further corrections to wxBitmap and Blit code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-10-18 19:21:50 +00:00
parent 508ba31dd5
commit 0569aeead8
5 changed files with 105 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
samples/image/image.cpp
View File

@@ -608,24 +608,33 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetTextForeground( wxT("BLACK") ); dc.SetTextForeground( wxT("BLACK") );
} }
dc.DrawText(_T("XPM bitmap"), 30, 2230); // For testing transparency
dc.SetBrush( *wxRED_BRUSH );
dc.DrawRectangle( 20, 2220, 560, 68 );
dc.DrawText(_T("XPM bitmap"), 30, 2230 );
if ( m_bmpSmileXpm.Ok() ) if ( m_bmpSmileXpm.Ok() )
dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE); dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
dc.DrawText(_T("XPM icon"), 150, 2230); dc.DrawText(_T("XPM icon"), 110, 2230 );
if ( m_iconSmileXpm.Ok() ) if ( m_iconSmileXpm.Ok() )
dc.DrawIcon(m_iconSmileXpm, 150, 2250); dc.DrawIcon(m_iconSmileXpm, 110, 2250);
dc.DrawText(_T("Enlarged"), 250, 2230);
// testing icon -> bitmap conversion // testing icon -> bitmap conversion
wxBitmap to_blit( m_iconSmileXpm ); wxBitmap to_blit( m_iconSmileXpm );
dc.SetUserScale( 1.5, 1.5 );
dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5) );
dc.SetUserScale( 2, 2 );
dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2) );
dc.SetUserScale( 1.0, 1.0 );
dc.DrawText(_T("Blit"), 400, 2230); dc.DrawText( _T("SubBitmap"), 170, 2230 );
wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) );
dc.DrawBitmap( sub, 170, 2250, TRUE );
dc.DrawText( _T("Enlarged"), 250, 2230 );
dc.SetUserScale( 1.5, 1.5 );
dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), TRUE );
dc.SetUserScale( 2, 2 );
dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), TRUE );
dc.SetUserScale( 1.0, 1.0 );
dc.DrawText( _T("Blit"), 400, 2230);
wxMemoryDC blit_dc; wxMemoryDC blit_dc;
blit_dc.SelectObject( to_blit ); blit_dc.SelectObject( to_blit );
dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, TRUE ); dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, TRUE );

60
src/gtk/bitmap.cpp
View File

@@ -963,6 +963,11 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
else else
{ {
GdkGC *gc = gdk_gc_new( ret.GetBitmap() ); GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
GdkColor col;
col.pixel = 0xFFFFFF;
gdk_gc_set_foreground( gc, &col );
col.pixel = 0;
gdk_gc_set_background( gc, &col );
gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
gdk_gc_destroy( gc ); gdk_gc_destroy( gc );
} }
@@ -973,7 +978,12 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 ); mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
GdkGC *gc = gdk_gc_new( mask->m_bitmap ); GdkGC *gc = gdk_gc_new( mask->m_bitmap );
gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height ); GdkColor col;
col.pixel = 0xFFFFFF;
gdk_gc_set_foreground( gc, &col );
col.pixel = 0;
gdk_gc_set_background( gc, &col );
gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
gdk_gc_destroy( gc ); gdk_gc_destroy( gc );
ret.SetMask( mask ); ret.SetMask( mask );
@@ -1053,14 +1063,18 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
int old_x = -1; int old_x = -1;
guint32 old_pixval; guint32 old_pixval;
for (int w=0; w<width; w++) for (int w = 0; w < width; w++)
{ {
guint32 pixval; guint32 pixval;
int x = tablex[w]; int x = tablex[w];
if (x == old_x) if (x == old_x)
pixval = old_pixval; pixval = old_pixval;
else else
{
pixval = gdk_image_get_pixel( img, x, tabley[h] ); pixval = gdk_image_get_pixel( img, x, tabley[h] );
old_pixval = pixval;
old_x = x;
}
if (bpp == 1) if (bpp == 1)
{ {
@@ -1073,7 +1087,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if ((w+1)%8==0) if ((w+1)%8==0)
{ {
dst[h*dstbyteperline+w/8]=~outbyte; dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0; outbyte = 0;
} }
} }
@@ -1087,8 +1101,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
} }
// do not forget the last byte // do not forget the last byte
if (bpp == 1) if ((bpp == 1) && (width % 8 != 0))
dst[h*dstbyteperline+width/8] = ~outbyte; dst[h*dstbyteperline+width/8] = outbyte;
} }
gdk_image_destroy( img ); gdk_image_destroy( img );
@@ -1102,9 +1116,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if (GetMask()) if (GetMask())
{ {
bpp = 1; dstbyteperline = width/8;
dstbyteperline = width/8*bpp; if (width % 8 != 0)
if (width*bpp % 8 != 0)
dstbyteperline++; dstbyteperline++;
dst = (char*) malloc(dstbyteperline*height); dst = (char*) malloc(dstbyteperline*height);
img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() ); img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
@@ -1112,10 +1125,22 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
for (int h = 0; h < height; h++) for (int h = 0; h < height; h++)
{ {
char outbyte = 0; char outbyte = 0;
int old_x = -1;
guint32 old_pixval;
for (int w=0; w<width; w++) for (int w = 0; w < width; w++)
{ {
guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] ); guint32 pixval;
int x = tablex[w];
if (x == old_x)
pixval = old_pixval;
else
{
pixval = gdk_image_get_pixel( img, x, tabley[h] );
old_pixval = pixval;
old_x = x;
}
if (pixval) if (pixval)
{ {
char bit=1; char bit=1;
@@ -1123,22 +1148,21 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
outbyte |= shift; outbyte |= shift;
} }
if ((w+1)%8==0) if ((w+1)%8 == 0)
{ {
dst[h*dstbyteperline+w/8]=~outbyte; dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0; outbyte = 0;
} }
} }
// do not forget the last byte // do not forget the last byte
if (bpp == 1) if (width % 8 != 0)
dst[h*dstbyteperline+width/8] = ~outbyte; dst[h*dstbyteperline+width/8] = outbyte;
} }
wxMask* mask = new wxMask;
wxBitmap mask_bmp( (const char *)dst, width, height, 1 ); mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
wxMask* mask = new wxMask(mask_bmp);
bmp.SetMask(mask); bmp.SetMask(mask);
free( dst ); free( dst );
gdk_image_destroy( img ); gdk_image_destroy( img );
} }

2
src/gtk/dcclient.cpp
View File

@@ -1187,7 +1187,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
xsrcMask = xsrc; xsrcMask = xsrc;
ysrcMask = ysrc; ysrcMask = ysrc;
} }
if (srcDC->m_isMemDC) if (srcDC->m_isMemDC)
{ {
if (!memDC->m_selected.Ok()) return FALSE; if (!memDC->m_selected.Ok()) return FALSE;

60
src/gtk1/bitmap.cpp
View File

@@ -963,6 +963,11 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
else else
{ {
GdkGC *gc = gdk_gc_new( ret.GetBitmap() ); GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
GdkColor col;
col.pixel = 0xFFFFFF;
gdk_gc_set_foreground( gc, &col );
col.pixel = 0;
gdk_gc_set_background( gc, &col );
gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
gdk_gc_destroy( gc ); gdk_gc_destroy( gc );
} }
@@ -973,7 +978,12 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 ); mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
GdkGC *gc = gdk_gc_new( mask->m_bitmap ); GdkGC *gc = gdk_gc_new( mask->m_bitmap );
gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height ); GdkColor col;
col.pixel = 0xFFFFFF;
gdk_gc_set_foreground( gc, &col );
col.pixel = 0;
gdk_gc_set_background( gc, &col );
gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
gdk_gc_destroy( gc ); gdk_gc_destroy( gc );
ret.SetMask( mask ); ret.SetMask( mask );
@@ -1053,14 +1063,18 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
int old_x = -1; int old_x = -1;
guint32 old_pixval; guint32 old_pixval;
for (int w=0; w<width; w++) for (int w = 0; w < width; w++)
{ {
guint32 pixval; guint32 pixval;
int x = tablex[w]; int x = tablex[w];
if (x == old_x) if (x == old_x)
pixval = old_pixval; pixval = old_pixval;
else else
{
pixval = gdk_image_get_pixel( img, x, tabley[h] ); pixval = gdk_image_get_pixel( img, x, tabley[h] );
old_pixval = pixval;
old_x = x;
}
if (bpp == 1) if (bpp == 1)
{ {
@@ -1073,7 +1087,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if ((w+1)%8==0) if ((w+1)%8==0)
{ {
dst[h*dstbyteperline+w/8]=~outbyte; dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0; outbyte = 0;
} }
} }
@@ -1087,8 +1101,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
} }
// do not forget the last byte // do not forget the last byte
if (bpp == 1) if ((bpp == 1) && (width % 8 != 0))
dst[h*dstbyteperline+width/8] = ~outbyte; dst[h*dstbyteperline+width/8] = outbyte;
} }
gdk_image_destroy( img ); gdk_image_destroy( img );
@@ -1102,9 +1116,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if (GetMask()) if (GetMask())
{ {
bpp = 1; dstbyteperline = width/8;
dstbyteperline = width/8*bpp; if (width % 8 != 0)
if (width*bpp % 8 != 0)
dstbyteperline++; dstbyteperline++;
dst = (char*) malloc(dstbyteperline*height); dst = (char*) malloc(dstbyteperline*height);
img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() ); img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
@@ -1112,10 +1125,22 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
for (int h = 0; h < height; h++) for (int h = 0; h < height; h++)
{ {
char outbyte = 0; char outbyte = 0;
int old_x = -1;
guint32 old_pixval;
for (int w=0; w<width; w++) for (int w = 0; w < width; w++)
{ {
guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] ); guint32 pixval;
int x = tablex[w];
if (x == old_x)
pixval = old_pixval;
else
{
pixval = gdk_image_get_pixel( img, x, tabley[h] );
old_pixval = pixval;
old_x = x;
}
if (pixval) if (pixval)
{ {
char bit=1; char bit=1;
@@ -1123,22 +1148,21 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
outbyte |= shift; outbyte |= shift;
} }
if ((w+1)%8==0) if ((w+1)%8 == 0)
{ {
dst[h*dstbyteperline+w/8]=~outbyte; dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0; outbyte = 0;
} }
} }
// do not forget the last byte // do not forget the last byte
if (bpp == 1) if (width % 8 != 0)
dst[h*dstbyteperline+width/8] = ~outbyte; dst[h*dstbyteperline+width/8] = outbyte;
} }
wxMask* mask = new wxMask;
wxBitmap mask_bmp( (const char *)dst, width, height, 1 ); mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
wxMask* mask = new wxMask(mask_bmp);
bmp.SetMask(mask); bmp.SetMask(mask);
free( dst ); free( dst );
gdk_image_destroy( img ); gdk_image_destroy( img );
} }

2
src/gtk1/dcclient.cpp
View File

@@ -1187,7 +1187,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
xsrcMask = xsrc; xsrcMask = xsrc;
ysrcMask = ysrc; ysrcMask = ysrc;
} }
if (srcDC->m_isMemDC) if (srcDC->m_isMemDC)
{ {
if (!memDC->m_selected.Ok()) return FALSE; if (!memDC->m_selected.Ok()) return FALSE;