Merge pull request matplotlib#25207 from oscargus/roundtoint

jklymak · web-flow · commit bc25f7447593 · 2023-02-14T07:34:42.000-08:00
Add mpl_round_to_int
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -780,10 +780,10 @@ inline void RendererAgg::draw_text_image(GCAgg &gc, ImageArray &image, int x, in
         if (gc.cliprect.x1 != 0.0 || gc.cliprect.y1 != 0.0 || gc.cliprect.x2 != 0.0 || gc.cliprect.y2 != 0.0) {
             agg::rect_i clip;
 
-            clip.init(int(mpl_round(gc.cliprect.x1)),
-                      int(mpl_round(height - gc.cliprect.y2)),
-                      int(mpl_round(gc.cliprect.x2)),
-                      int(mpl_round(height - gc.cliprect.y1)));
+            clip.init(mpl_round_to_int(gc.cliprect.x1),
+                      mpl_round_to_int(height - gc.cliprect.y2),
+                      mpl_round_to_int(gc.cliprect.x2),
+                      mpl_round_to_int(height - gc.cliprect.y1));
             text.clip(clip);
         }
 
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -29,9 +29,14 @@
 #endif
 
 
+inline int mpl_round_to_int(double v)
+{
+    return (int)(v + ((v >= 0.0) ? 0.5 : -0.5));
+}
+
 inline double mpl_round(double v)
 {
-    return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
+    return (double)mpl_round_to_int(v);
 }
 
 // 'kind' codes for paths.
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -595,7 +595,7 @@ class PathSnapper
         m_snap = should_snap(source, snap_mode, total_vertices);
 
         if (m_snap) {
-            int is_odd = (int)mpl_round(stroke_width) % 2;
+            int is_odd = mpl_round_to_int(stroke_width) % 2;
             m_snap_value = (is_odd) ? 0.5 : 0.0;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,14 @@`
`29`	`29`	`#endif`
`30`	`30`
`31`	`31`
	`32`	`+inline int mpl_round_to_int(double v)`
	`33`	`+{`
	`34`	`+ return (int)(v + ((v >= 0.0) ? 0.5 : -0.5));`
	`35`	`+}`
	`36`	`+`
`32`	`37`	`inline double mpl_round(double v)`
`33`	`38`	`{`
`34`		`- return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));`
	`39`	`+ return (double)mpl_round_to_int(v);`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`// 'kind' codes for paths.`
Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ class PathSnapper`
`595`	`595`	`m_snap = should_snap(source, snap_mode, total_vertices);`
`596`	`596`
`597`	`597`	`if (m_snap) {`
`598`		`- int is_odd = (int)mpl_round(stroke_width) % 2;`
	`598`	`+ int is_odd = mpl_round_to_int(stroke_width) % 2;`
`599`	`599`	`m_snap_value = (is_odd) ? 0.5 : 0.0;`
`600`	`600`	`}`
`601`	`601`