Re-order variants to prioritize narrower types (#31504)

QuLogic · web-flow · commit d6b33a2e8a9d · 2026-04-16T16:27:00.000-04:00
As of pybind/pybind11#5879, pybind11 will convert Python `int` to C `float`/`double`. For `std::variant`, pybind11 will attempt to convert arguments in the order of the type. So if `double` occurs earlier in the variant, then `int`/`long` will never be produced. By putting `int`/`long` before `double`, pybind11 will attempt that conversion first and we'll continue to produce our deprecation warning correctly. Fixes #31495
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -58,8 +58,8 @@ PyRendererAgg_draw_path(RendererAgg *self,
 static void
 PyRendererAgg_draw_text_image(RendererAgg *self,
                               py::array_t<agg::int8u, py::array::c_style | py::array::forcecast> image_obj,
-                              std::variant<double, int> vx,
-                              std::variant<double, int> vy,
+                              std::variant<int, double> vx,
+                              std::variant<int, double> vy,
                               double angle,
                               GCAgg &gc)
 {
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -14,7 +14,7 @@ namespace py = pybind11;
 using namespace pybind11::literals;
 
 template <typename T>
-using double_or_ = std::variant<double, T>;
+using double_or_ = std::variant<T, double>;
 
 template <typename T>
 static T
