From 35feea4423adb3dbc5851f5a76a2e5697ca685e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tin=20=C5=A0vagelj?= <tin.svagelj@live.com>
Date: Thu, 25 Apr 2024 20:22:33 +0200
Subject: [PATCH] Ensure component access always returns wanted type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should help avoid bad pointer reinterpretation.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
---
 src/geometry.h | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/geometry.h b/src/geometry.h
index 91295d6c5..f289dfb30 100644
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -52,10 +52,18 @@ struct point {
 
   /// @brief Point x component
   /// @return x value of this point
-  inline T x() const { return value.x(); }
+  template <typename R = T,
+            typename = typename std::enable_if<std::is_arithmetic<R>::value>>
+  inline R x() const {
+    return reinterpret_cast<R>(this->value.x());
+  }
   /// @brief Point y component
   /// @return y value of this point
-  inline T y() const { return value.y(); }
+  template <typename R = T,
+            typename = typename std::enable_if<std::is_arithmetic<R>::value>>
+  inline R y() const {
+    return reinterpret_cast<R>(this->value.y());
+  }
 
   template <typename O = T,
             typename = typename std::enable_if<std::is_arithmetic<O>::value>>
@@ -148,16 +156,32 @@ struct rect {
 
   /// @brief Rectangle x position
   /// @return x position of this rectangle
-  inline T x() const { return this->pos.x(); }
+  template <typename R = T,
+            typename = typename std::enable_if<std::is_arithmetic<R>::value>>
+  inline R x() const {
+    return reinterpret_cast<R>(this->pos.x());
+  }
   /// @brief Rectangle y position
   /// @return y position of this rectangle
-  inline T y() const { return this->pos.y(); }
+  template <typename R = T,
+            typename = typename std::enable_if<std::is_arithmetic<R>::value>>
+  inline R y() const {
+    return reinterpret_cast<R>(this->pos.y());
+  }
   /// @brief Rectangle width
   /// @return width of this rectangle
-  inline T width() const { return this->size.x(); }
+  template <typename R = T,
+            typename = typename std::enable_if<std::is_arithmetic<R>::value>>
+  inline R width() const {
+    return reinterpret_cast<R>(this->size.x());
+  }
   /// @brief Rectangle height
   /// @return height of this rectangle
-  inline T height() const { return this->size.y(); }
+  template <typename R = T,
+            typename = typename std::enable_if<std::is_arithmetic<R>::value>>
+  inline R height() const {
+    return reinterpret_cast<R>(this->size.y());
+  }
 
   template <typename O = T,
             typename = typename std::enable_if<std::is_arithmetic<O>::value>>