From 92826e1c1f988141c6bab73830470a9c56870132 Mon Sep 17 00:00:00 2001
From: Chris Thrasher <chrisjthrasher@gmail.com>
Date: Sat, 16 Dec 2023 14:39:55 -0700
Subject: [PATCH] Remove `static_cast`s

---
 src/SFML/Window/macOS/Scaling.h            |  2 +-
 src/SFML/Window/macOS/cg_sf_conversion.hpp |  4 ++--
 src/SFML/Window/macOS/cg_sf_conversion.mm  | 16 +++++++---------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/SFML/Window/macOS/Scaling.h b/src/SFML/Window/macOS/Scaling.h
index 8c45564b2..95394df1b 100644
--- a/src/SFML/Window/macOS/Scaling.h
+++ b/src/SFML/Window/macOS/Scaling.h
@@ -72,7 +72,7 @@ void scaleInXY(T& in, id<WindowImplDelegateProtocol> delegate)
 template <class T>
 void scaleOut(T& out, id<WindowImplDelegateProtocol> delegate)
 {
-    out = out * static_cast<T>(delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor());
+    out *= static_cast<T>(delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor());
 }
 
 template <class T>
diff --git a/src/SFML/Window/macOS/cg_sf_conversion.hpp b/src/SFML/Window/macOS/cg_sf_conversion.hpp
index 2c2795949..1b4e8577e 100644
--- a/src/SFML/Window/macOS/cg_sf_conversion.hpp
+++ b/src/SFML/Window/macOS/cg_sf_conversion.hpp
@@ -41,7 +41,7 @@ namespace sf::priv
 /// to represent video mode. Instead it uses a CGDisplayMode opaque type.
 ///
 ////////////////////////////////////////////////////////////
-std::size_t modeBitsPerPixel(CGDisplayModeRef mode);
+unsigned int modeBitsPerPixel(CGDisplayModeRef mode);
 
 ////////////////////////////////////////////////////////////
 /// \brief Get bpp for all OS X version
@@ -50,7 +50,7 @@ std::size_t modeBitsPerPixel(CGDisplayModeRef mode);
 /// display bits per pixel information for a given display id.
 ///
 ////////////////////////////////////////////////////////////
-std::size_t displayBitsPerPixel(CGDirectDisplayID displayId);
+unsigned int displayBitsPerPixel(CGDirectDisplayID displayId);
 
 ////////////////////////////////////////////////////////////
 /// \brief Convert a Quartz video mode into a sf::VideoMode object
diff --git a/src/SFML/Window/macOS/cg_sf_conversion.mm b/src/SFML/Window/macOS/cg_sf_conversion.mm
index 7eef58492..14ad854e9 100644
--- a/src/SFML/Window/macOS/cg_sf_conversion.mm
+++ b/src/SFML/Window/macOS/cg_sf_conversion.mm
@@ -37,9 +37,9 @@ namespace sf::priv
 {
 
 ////////////////////////////////////////////////////////////
-std::size_t modeBitsPerPixel(CGDisplayModeRef mode)
+unsigned int modeBitsPerPixel(CGDisplayModeRef mode)
 {
-    std::size_t bpp = 0; // no match
+    unsigned int bpp = 0; // no match
 
     // Compare encoding.
     CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode);
@@ -58,13 +58,13 @@ std::size_t modeBitsPerPixel(CGDisplayModeRef mode)
 
 
 ////////////////////////////////////////////////////////////
-std::size_t displayBitsPerPixel(CGDirectDisplayID displayId)
+unsigned int displayBitsPerPixel(CGDirectDisplayID displayId)
 {
     // Get the display mode.
     CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId);
 
     // Get bpp for the mode.
-    const std::size_t bpp = modeBitsPerPixel(mode);
+    const auto bpp = modeBitsPerPixel(mode);
 
     // Clean up Memory.
     CGDisplayModeRelease(mode);
@@ -87,11 +87,9 @@ VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode)
     //
     // [1]: "APIs for Supporting High Resolution" > "Additions and Changes for OS X v10.8"
     // https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/APIs/APIs.html#//apple_ref/doc/uid/TP40012302-CH5-SW27
-    VideoMode mode({static_cast<unsigned int>(CGDisplayModeGetWidth(cgmode)),
-                    static_cast<unsigned int>(CGDisplayModeGetHeight(cgmode))},
-                   static_cast<unsigned int>(modeBitsPerPixel(cgmode)));
-    scaleOutWidthHeight(mode.size.x, mode.size.y, nil);
-    return mode;
+    auto size = Vector2u(Vector2(CGDisplayModeGetWidth(cgmode), CGDisplayModeGetHeight(cgmode)));
+    scaleOutXY(size, nil);
+    return VideoMode(size, modeBitsPerPixel(cgmode));
 }
 
 } // namespace sf::priv