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

speed up Rescale by not using server to draw each point separately

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-05-16 02:44:15 +00:00
parent 96c37f91f7
commit 061c69fe01
1 changed files with 10 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gtk/bitmap.cpp
View File

@@ -304,7 +304,7 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap")); wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height) if (newx==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
return *this; return *this;
int width = wxMax(newx, 1); int width = wxMax(newx, 1);
@@ -330,24 +330,8 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
GdkImage* img = gdk_drawable_get_image( GdkImage* img = gdk_drawable_get_image(
M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height); M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
wxCHECK_MSG(img, bmp, wxT("couldn't create image")); bmp.Create(width, height, gdk_drawable_get_depth(M_BMPDATA->m_pixmap));
GdkImage* img_scaled = gdk_drawable_get_image(bmp.GetPixmap(), 0, 0, width, height);
GdkGC *gc = NULL;
GdkPixmap *dstpix = NULL;
char *dst = NULL;
long dstbyteperline = 0;
if (GetDepth() != 1)
{
bmp.Create(width, height, gdk_drawable_get_depth(M_BMPDATA->m_pixmap));
dstpix = bmp.GetPixmap();
gc = gdk_gc_new( dstpix );
}
else
{
dstbyteperline = (width + 7) / 8;
dst = (char*) malloc(dstbyteperline*height);
}
// be careful to use the right scaling factor // be careful to use the right scaling factor
float scx = (float)M_BMPDATA->m_width/(float)newx; float scx = (float)M_BMPDATA->m_width/(float)newx;
@@ -365,7 +349,6 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
// Main rescaling routine starts here // Main rescaling routine starts here
for (int h = 0; h < height; h++) for (int h = 0; h < height; h++)
{ {
char outbyte = 0;
int old_x = -1; int old_x = -1;
guint32 old_pixval = 0; guint32 old_pixval = 0;
@@ -382,48 +365,21 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
old_x = x; old_x = x;
} }
if ( dst ) gdk_image_put_pixel(img_scaled, w, h, pixval);
{
if (pixval)
{
char bit=1;
char shift = bit << (w % 8);
outbyte |= shift;
}
if ((w+1)%8==0)
{
dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0;
}
}
else
{
GdkColor col;
col.pixel = pixval;
gdk_gc_set_foreground( gc, &col );
gdk_draw_point( dstpix, gc, w, h);
}
} }
// do not forget the last byte
if ( dst && (width % 8 != 0) )
dst[h*dstbyteperline+width/8] = outbyte;
} }
g_object_unref (img); g_object_unref (img);
if (gc) g_object_unref (gc);
if ( dst ) GdkGC* gc = gdk_gc_new(bmp.GetPixmap());
{ gdk_draw_image(bmp.GetPixmap(), gc, img_scaled, 0, 0, 0, 0, -1, -1);
bmp = wxBitmap(dst, width, height, 1); g_object_unref(gc);
free( dst ); g_object_unref(img_scaled);
}
if (GetMask()) if (GetMask())
{ {
dstbyteperline = (width + 7) / 8; size_t dstbyteperline = (width + 7) / 8;
dst = (char*) malloc(dstbyteperline*height); char* dst = (char*) malloc(dstbyteperline*height);
img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight()); img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());
for (int h = 0; h < height; h++) for (int h = 0; h < height; h++)