X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5f05abf22febac397b3d081a6dd107bd88ff959..0e17930f4329ffc03e2fa89abb7d78deb2d935b5:/src/common/imagfill.cpp

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index b5a6c66a53..fa4992fe6b 100644
--- 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
@@ -35,7 +32,7 @@
 
 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);
@@ -45,16 +42,16 @@ static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, con
 
 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;
 }
 
 
@@ -62,12 +59,15 @@ static void LINKAGEMODE
 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();
@@ -273,34 +273,53 @@ wxImageFloodFill(wxImage *image,
 }
 
 
-void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
-                   const wxColour& col, int style)
+bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+                   const wxColour& col, wxFloodFillStyle style)
 {
-    if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
-        return;
+    if (dc->GetBrush().GetStyle() == wxBRUSHSTYLE_TRANSPARENT)
+        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"));
+
+    const int x_dev = dc->LogicalToDeviceX(x);
+    const int y_dev = dc->LogicalToDeviceY(y);
+
+    // if start point is outside dc, can't do anything
+    if (!wxRect(0, 0, width, height).Contains(x_dev, y_dev))
+        return false;
 
-    //this is much faster than doing the individual pixels
-    wxMemoryDC memdc;
     wxBitmap bitmap(width, height);
-    memdc.SelectObject(bitmap);
-    memdc.Blit(0, 0, width, height, dc, 0, 0);
+    wxMemoryDC memdc(bitmap);
+    // match dc scales
+    double sx, sy;
+    dc->GetUserScale(&sx, &sy);
+    memdc.SetUserScale(sx, sy);
+    dc->GetLogicalScale(&sx, &sy);
+    memdc.SetLogicalScale(sx, sy);
+
+    // get logical size and origin
+    const int w_log = dc->DeviceToLogicalXRel(width);
+    const int h_log = dc->DeviceToLogicalYRel(height);
+    const int x0_log = dc->DeviceToLogicalX(0);
+    const int y0_log = dc->DeviceToLogicalY(0);
+
+    memdc.Blit(0, 0, w_log, h_log, dc, x0_log, y0_log);
     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();
-    wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style,
+    wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style,
                      dc->GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);
-    dc->Blit(0, 0, width, height, &memdc, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
+    dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0);
+
+    return true;
 }
 
 #endif // wxUSE_IMAGE
-