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

honour user scale and source offset in wxDC::Blit() (#2605)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-27 00:52:13 +00:00
parent 3c06bd88f4
commit 98d8a7ece5
4 changed files with 131 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/bitmap.cpp
View File

@@ -300,19 +300,18 @@ bool wxBitmap::Create( int width, int height, int depth )
return Ok();
}
wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const
wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
int width, int height) const
{
wxBitmap bmp;
wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
int width = wxMax(newx, 1);
int height = wxMax(newy, 1);
width = wxMin(width, clipwidth);
height = wxMin(height, clipheight);
width = wxMax(width, 1);
height = wxMax(height, 1);
const double scale_x = double(newx) / M_BMPDATA->m_width;
const double scale_y = double(newy) / M_BMPDATA->m_height;
const double scale_x = double(width) / clipwidth;
const double scale_y = double(height) / clipheight;
// Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
// back, is faster than scaling pixmap ourselves.
@@ -335,7 +334,7 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
// images, but the only one which preserves sharp edges
gdk_pixbuf_scale(
pixbuf, pixbuf_scaled,
0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
0, 0, width, height, -clipx*scale_x, -clipy*scale_y, scale_x, scale_y,
GDK_INTERP_NEAREST);
g_object_unref(pixbuf);