Same problem for blurring functions.

[wxWidgets.git] / src / common / imagfill.cpp

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index 81f49d8471d532a2058e163fb2530f4e2599b7fb..b81b9770557a854d4cd6a03c93d544444a274fc4 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagfill.cpp
+// Name:        src/common/imagfill.cpp
 // Purpose:     FloodFill for wxImage
-// Author:
+// Author:      Julian Smart
 // RCS-ID:      $Id$
-// Copyright:
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,17 +15,14 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_IMAGE && !defined(__WXMSW__)
 // we have no use for this code in wxMSW...
 
-#include "wx/image.h"
-
 #ifndef WX_PRECOMP
     #include "wx/brush.h"
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 // DoFloodFill
@@ -33,9 +30,9 @@
 // a color different from the start pixel is reached (wxFLOOD_SURFACE)
 // or fill color is reached (wxFLOOD_BORDER)
 
-static LINKAGEMODE bool MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c)
+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);
@@ -43,31 +40,34 @@ static LINKAGEMODE bool MatchPixel(wxImage *img, int x, int y, int w, int h, con
     return c.Red() == r && c.Green() == g && c.Blue() == b ;
 }
 
-static LINKAGEMODE bool MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound)
+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;
-    if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b ) 
-        return TRUE;
-    return FALSE;
+    if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b )
+        return true;
+    if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b )
+        return true;
+    return false;
 }
 
 
-static LINKAGEMODE
-void wxImageFloodFill(wxImage *image,
-                      wxCoord x, wxCoord y, const wxBrush & fillBrush,
-                      const wxColour& testColour, int style,
-                      int LogicalFunction)
+static void LINKAGEMODE
+wxImageFloodFill(wxImage *image,
+                 wxCoord x, wxCoord y, const wxBrush & fillBrush,
+                 const wxColour& testColour, int style,
+                 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();
@@ -273,18 +273,19 @@ void wxImageFloodFill(wxImage *image,
 }
 
 
-void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
                    const wxColour& col, int style)
 {
     if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
-        return;
+        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...
-    wxCHECK_RET(width >= 1 && height >= 1, wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
+    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;
@@ -294,13 +295,14 @@ void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();
-    wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style, 
+    wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style,
                      dc->GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);
     dc->Blit(0, 0, width, height, &memdc, 0, 0);
     memdc.SelectObject(wxNullBitmap);
+
+    return true;
 }
 
 #endif // wxUSE_IMAGE
-