[共通] Point::length(), lengthSq() を整数オーバーフローしにくい実装に #1217

Siv3D · Jun 29, 2024 · b27886b · b27886b
1 parent 9ee8f8b
commit b27886b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Siv3D/include/Siv3D/detail/Point.ipp b/Siv3D/include/Siv3D/detail/Point.ipp
@@ -309,13 +309,17 @@ namespace s3d
 	template <class Type>
 	inline Type Point::length() const noexcept
 	{
-		return static_cast<Type>(std::sqrt((x * x) + (y * y)));
+		const Type x_ = static_cast<Type>(x);
+		const Type y_ = static_cast<Type>(y);
+		return static_cast<Type>(std::sqrt((x_ * x_) + (y_ * y_)));
 	}
 
 	template <class Type>
 	inline constexpr Type Point::lengthSq() const noexcept
 	{
-		return static_cast<Type>((x * x) + (y * y));
+		const Type x_ = static_cast<Type>(x);
+		const Type y_ = static_cast<Type>(y);
+		return ((x_ * x_) + (y_ * y_));
 	}
 
 	inline constexpr int32 Point::manhattanLength() const noexcept