[ros-diffs] [reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 2

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03344980688a47267debdf...

commit 03344980688a47267debdf875b458e50bac70786
Author:     Katayama Hirofumi MZ [e-mail]
AuthorDate: Wed Jun 14 17:03:22 2023 +0900
Commit:     Katayama Hirofumi MZ [e-mail]
CommitDate: Wed Jun 14 17:03:22 2023 +0900

[MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 2

CORE-18867
---
 base/applications/mspaint/drawing.cpp | 36 +++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp
index 40ff30bcb32..de9c925f396 100644
--- a/base/applications/mspaint/drawing.cpp
+++ b/base/applications/mspaint/drawing.cpp
@@ -116,26 +116,42 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color)
 void
 Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius)
 {
-    LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2;
-    RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius };
-
+    LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1)));
+    RECT rc;
     HBRUSH hbr = ::CreateSolidBrush(color);
-    ::FillRect(hdc, &rc, hbr);
+
+    for (LONG a = 0; a <= b; a++)
+    {
+        ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius,
+                       (y1 * (b - a) + y2 * a) / b - radius,
+                       (x1 * (b - a) + x2 * a) / b + radius,
+                       (y1 * (b - a) + y2 * a) / b + radius);
+
+        ::FillRect(hdc, &rc, hbr);
+    }
+
     ::DeleteObject(hbr);
 }

void
 Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius)
 {
-    LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2;
-    RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius };
+    LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1)));
+    RECT rc;

-    for (LONG y = rc.top; y < rc.bottom; ++y)
+    for (LONG a = 0; a <= b; a++)
     {
-        for (LONG x = rc.left; x < rc.right; ++x)
+        ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius,
+                       (y1 * (b - a) + y2 * a) / b - radius,
+                       (x1 * (b - a) + x2 * a) / b + radius,
+                       (y1 * (b - a) + y2 * a) / b + radius);
+        for (LONG y = rc.top; y < rc.bottom; ++y)
         {
-            if (::GetPixel(hdc, x, y) == fg)
-                ::SetPixelV(hdc, x, y, bg);
+            for (LONG x = rc.left; x < rc.right; ++x)
+            {
+                if (::GetPixel(hdc, x, y) == fg)
+                    ::SetPixelV(hdc, x, y, bg);
+            }
         }
     }
 }