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

remove Rescale(), it is no longer used

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-01-04 02:42:03 +00:00
parent 02cecc4dc2
commit 5852a1dcbb
2 changed files with 0 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/bitmap.h
View File

@@ -110,10 +110,6 @@ public:
bool HasPixbuf() const; bool HasPixbuf() const;
GdkPixbuf *GetPixbuf() const; GdkPixbuf *GetPixbuf() const;
// Basically, this corresponds to Win32 StretchBlt()
wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight,
int width, int height) const;
// raw bitmap access support functions // raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp); void *GetRawData(wxPixelDataBase& data, int bpp);
void UngetRawData(wxPixelDataBase& data); void UngetRawData(wxPixelDataBase& data);

64
src/gtk/bitmap.cpp
View File

@@ -309,70 +309,6 @@ bool wxBitmap::Create( int width, int height, int depth )
return Ok(); return Ok();
} }
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"));
width = wxMax(width, 1);
height = wxMax(height, 1);
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.
// use pixbuf if already available,
// otherwise create temporary pixbuf from pixmap
GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
if (pixbuf)
g_object_ref(pixbuf);
else
pixbuf = gdk_pixbuf_get_from_drawable(
NULL, M_BMPDATA->m_pixmap, NULL,
0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
// new pixbuf for scaled wxBitmap
GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new(
GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, width, height);
// GDK_INTERP_NEAREST is the lowest-quality method for continuous-tone
// images, but the only one which preserves sharp edges
gdk_pixbuf_scale(
pixbuf, pixbuf_scaled,
0, 0, width, height, -clipx*scale_x, -clipy*scale_y, scale_x, scale_y,
GDK_INTERP_NEAREST);
g_object_unref(pixbuf);
bmp.SetPixbuf(pixbuf_scaled, M_BMPDATA->m_bpp);
if (M_BMPDATA->m_mask)
{
pixbuf = gdk_pixbuf_get_from_drawable(
NULL, M_BMPDATA->m_mask->m_bitmap, NULL,
0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
pixbuf_scaled = gdk_pixbuf_new(
GDK_COLORSPACE_RGB, false, 8, width, height);
gdk_pixbuf_scale(
pixbuf, pixbuf_scaled,
0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
GDK_INTERP_NEAREST);
g_object_unref(pixbuf);
// use existing functionality to create mask from scaled pixbuf
wxBitmap maskbmp;
maskbmp.SetPixbuf(pixbuf_scaled);
bmp.SetMask(new wxMask(maskbmp, *wxBLACK));
}
return bmp;
}
#if wxUSE_IMAGE #if wxUSE_IMAGE
bool wxBitmap::CreateFromImage(const wxImage& image, int depth) bool wxBitmap::CreateFromImage(const wxImage& image, int depth)