From 614abdd5e38ad6cde58c5aaf6c2ca229cd29edab Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Thu, 16 Apr 2026 16:27:00 -0400
Subject: [PATCH] Backport PR #31504: Re-order variants to prioritize narrower
 types

---
 src/_backend_agg_wrapper.cpp | 4 ++--
 src/ft2font_wrapper.cpp      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
index 269e2aaa9ee5..80bb14e8cfec 100644
--- 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
index 9b54721810d6..3008c0b08b2f 100644
--- 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