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

Fixed FIXME in blitting code.

Browse Source 
Small speed-up in wxBitmap::Rescale().
  The rescaling code still makes X11 crash
    with a memory problem. This can be seen
    in the image sample when you scroll up
    and down with the mouse often so that
    the smiley that gets blit appears and
    disappears often.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-10-17 14:26:33 +00:00
parent 858488c8d0
commit ea34719cb0
4 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/bitmap.cpp
View File

@@ -1050,11 +1050,19 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
for (int h = 0; h < height; h++)
{
char outbyte = 0;
int old_x = -1;
guint32 old_pixval;
for (int w=0; w<width; w++)
{
guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] );
if (bpp==1)
guint32 pixval;
int x = tablex[w];
if (x == old_x)
pixval = old_pixval;
else
pixval = gdk_image_get_pixel( img, x, tabley[h] );
if (bpp == 1)
{
if (!pixval)
{

32
src/gtk/dcclient.cpp
View File

@@ -1258,12 +1258,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord bm_width = memDC->m_selected.GetWidth();
wxCoord bm_height = memDC->m_selected.GetHeight();
// get clip coords
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
wxCoord cx,cy,cw,ch;
tmp.GetBox(cx,cy,cw,ch);
// interpret userscale of src too
double xsc,ysc;
memDC->GetUserScale(&xsc,&ysc);
@@ -1273,16 +1267,32 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord bm_ww = XLOG2DEVREL( bm_width );
wxCoord bm_hh = YLOG2DEVREL( bm_height );
// scale bitmap if required
wxBitmap use_bitmap;
// Get clip coords for the bitmap. If we don't
// use wxBitmap::Rescale(), which can clip the
// bitmap, these are the same as the original
// coordinates
wxCoord cx = xx;
wxCoord cy = yy;
wxCoord cw = ww;
wxCoord ch = hh;
// Scale bitmap if required
wxBitmap use_bitmap;
if ((bm_width != bm_ww) || (bm_height != bm_hh))
{
use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
// This indicates that the blitting code below will get
// a clipped bitmap and therefore needs to move the origin
// accordingly
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
tmp.GetBox(cx,cy,cw,ch);
// Scale and clipped bitmap
use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
}
else
{
// FIXME: use cx,cy,cw,ch here, too?
// Don't scale bitmap
use_bitmap = memDC->m_selected;
}
@@ -1453,7 +1463,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
pango_layout_set_text( layout, (const char*)data, strlen((const char*)data) );
if (abs(m_scaleY - 1.0) < 0.00001)
if (fabs(m_scaleY - 1.0) < 0.00001)
{
// If there is a user or actually any scale applied to
// the device context, scale the font.

12
src/gtk1/bitmap.cpp
View File

@@ -1050,11 +1050,19 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
for (int h = 0; h < height; h++)
{
char outbyte = 0;
int old_x = -1;
guint32 old_pixval;
for (int w=0; w<width; w++)
{
guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] );
if (bpp==1)
guint32 pixval;
int x = tablex[w];
if (x == old_x)
pixval = old_pixval;
else
pixval = gdk_image_get_pixel( img, x, tabley[h] );
if (bpp == 1)
{
if (!pixval)
{

32
src/gtk1/dcclient.cpp
View File

@@ -1258,12 +1258,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord bm_width = memDC->m_selected.GetWidth();
wxCoord bm_height = memDC->m_selected.GetHeight();
// get clip coords
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
wxCoord cx,cy,cw,ch;
tmp.GetBox(cx,cy,cw,ch);
// interpret userscale of src too
double xsc,ysc;
memDC->GetUserScale(&xsc,&ysc);
@@ -1273,16 +1267,32 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord bm_ww = XLOG2DEVREL( bm_width );
wxCoord bm_hh = YLOG2DEVREL( bm_height );
// scale bitmap if required
wxBitmap use_bitmap;
// Get clip coords for the bitmap. If we don't
// use wxBitmap::Rescale(), which can clip the
// bitmap, these are the same as the original
// coordinates
wxCoord cx = xx;
wxCoord cy = yy;
wxCoord cw = ww;
wxCoord ch = hh;
// Scale bitmap if required
wxBitmap use_bitmap;
if ((bm_width != bm_ww) || (bm_height != bm_hh))
{
use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
// This indicates that the blitting code below will get
// a clipped bitmap and therefore needs to move the origin
// accordingly
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
tmp.GetBox(cx,cy,cw,ch);
// Scale and clipped bitmap
use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
}
else
{
// FIXME: use cx,cy,cw,ch here, too?
// Don't scale bitmap
use_bitmap = memDC->m_selected;
}
@@ -1453,7 +1463,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
pango_layout_set_text( layout, (const char*)data, strlen((const char*)data) );
if (abs(m_scaleY - 1.0) < 0.00001)
if (fabs(m_scaleY - 1.0) < 0.00001)
{
// If there is a user or actually any scale applied to
// the device context, scale the font.