Fix: deal with radius < 0

cycfi · May 22, 2024 · f8aa6b2 · f8aa6b2
1 parent c81e68c
commit f8aa6b2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/lib/impl/skia/canvas.cpp b/lib/impl/skia/canvas.cpp
@@ -314,11 +314,7 @@ namespace cycfi::artist
       bool ccw
    )
    {
-      if (radius <= 0)
-      {
-         line_to(p);
-         return;
-      }
+      radius = std::max(radius, 0.0f);
       auto start = start_angle * 180 / pi;
       auto sweep = (end_angle - start_angle) * 180 / pi;
       if (sweep < 0)

diff --git a/lib/impl/skia/path.cpp b/lib/impl/skia/path.cpp
@@ -107,11 +107,7 @@ namespace cycfi::artist
       float start_angle, float end_angle,
       bool ccw)
    {
-      if (radius <= 0)
-      {
-         line_to(p);
-         return;
-      }
+      radius = std::max(radius, 0.0f);
       auto start = start_angle * 180 / pi;
       auto sweep = (end_angle - start_angle) * 180 / pi;
       if (sweep < 0)

diff --git a/test/macos_golden/quartz2d/shapes2.png b/test/macos_golden/quartz2d/shapes2.png
diff --git a/test/macos_golden/skia/shapes2.png b/test/macos_golden/skia/shapes2.png
diff --git a/test/main.cpp b/test/main.cpp
@@ -151,25 +151,36 @@ void draw_round_rect(canvas& cnv, rect bounds, detail::corner_radii radius)
 void basics2(canvas& cnv)
 {
    auto state = cnv.new_state();
+   rect bounds = {20, 20, 220, 120};
 
    {
-      draw_round_rect(cnv, {50, 50, 250, 150}, {-1, 40, 40, -1}); // Negative radius
+      draw_round_rect(cnv, bounds, {-1, 40, 40, -1}); // Negative radius
 
       cnv.fill_style(colors::light_sea_green.opacity(0.8));
       cnv.fill_preserve();
 
-      cnv.stroke_style(colors::goldenrod.opacity(0.8));
-      cnv.line_width(3);
+      cnv.stroke_style(colors::antique_white.opacity(0.8));
+      cnv.line_width(2);
       cnv.stroke();
    }
    {
-      draw_round_rect(cnv, {20, 20, 220, 120}, {15, 40, 40, 15});
+      draw_round_rect(cnv, bounds.move(20, 20), {15, 40, 40, 15});
 
       cnv.fill_style(colors::navy_blue.opacity(0.5));
       cnv.fill_preserve();
 
       cnv.stroke_style(colors::antique_white.opacity(0.5));
-      cnv.line_width(3);
+      cnv.line_width(2);
+      cnv.stroke();
+   }
+   {
+      draw_round_rect(cnv, bounds.move(40, 40), {0, 0, 0, 0});
+
+      cnv.fill_style(colors::indian_red.opacity(0.5));
+      cnv.fill_preserve();
+
+      cnv.stroke_style(colors::antique_white.opacity(0.5));
+      cnv.line_width(2);
       cnv.stroke();
    }
 }