/////////////////////////////////////////////////////////////////////////////
// Name: imagfill.cpp
// Purpose: FloodFill for wxImage
-// Author:
+// Author: Julian Smart
// RCS-ID: $Id$
-// Copyright:
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c)
{
- if ((x<0)||(x>=w)||(y<0)||(y>=h)) return FALSE;
+ if ((x<0)||(x>=w)||(y<0)||(y>=h)) return false;
unsigned char r = img->GetRed(x,y);
unsigned char g = img->GetGreen(x,y);
static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound)
{
- if ((x<0)||(x>=w)||(y<0)||(y>=h)) return TRUE;
+ if ((x<0)||(x>=w)||(y<0)||(y>=h)) return true;
unsigned char r = img->GetRed(x,y);
unsigned char g = img->GetGreen(x,y);
unsigned char b = img->GetBlue(x,y);
if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b )
- return TRUE;
+ return true;
if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b )
- return TRUE;
- return FALSE;
+ return true;
+ return false;
}
wxImageFloodFill(wxImage *image,
wxCoord x, wxCoord y, const wxBrush & fillBrush,
const wxColour& testColour, int style,
- int LogicalFunction)
+ int WXUNUSED(LogicalFunction))
{
/* A diamond flood-fill using a circular queue system.
Each pixel surrounding the current pixel is added to
the queue if it meets the criteria, then is retrieved in
- its turn. Code originally based on http://www.drawit.co.nz/Developers.htm */
+ its turn. Code originally based on http://www.drawit.co.nz/Developers.htm,
+ with explicit permission to use this for wxWidgets granted by Andrew Empson
+ (no copyright claimed)
+ */
int width = image->GetWidth();
int height = image->GetHeight();
const wxColour& col, int style)
{
if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
- return TRUE;
+ return true;
int height = 0;
int width = 0;
dc->GetSize(&width, &height);
//it would be nice to fail if we don't get a sensible size...
- wxASSERT_MSG(width >= 1 && height >= 1, wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-
- if (width <= 1 || height <= 1)
- return FALSE;
+ wxCHECK_MSG(width >= 1 && height >= 1, false,
+ wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
//this is much faster than doing the individual pixels
wxMemoryDC memdc;
memdc.SelectObject(bitmap);
dc->Blit(0, 0, width, height, &memdc, 0, 0);
memdc.SelectObject(wxNullBitmap);
-
- return TRUE;
+
+ return true;
}
#endif // wxUSE_IMAGE
-