mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove static_casts

Browse Source
This commit is contained in:
Chris Thrasher 2023-12-16 14:39:55 -07:00
parent b20376813c
commit 92826e1c1f
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Window/macOS/Scaling.h
View File

@ -72,7 +72,7 @@ void scaleInXY(T& in, id<WindowImplDelegateProtocol> delegate)
template <class T> template <class T>
void scaleOut(T& out, id<WindowImplDelegateProtocol> delegate) 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> template <class T>

4
src/SFML/Window/macOS/cg_sf_conversion.hpp
View File

@ -41,7 +41,7 @@ namespace sf::priv
/// to represent video mode. Instead it uses a CGDisplayMode opaque type. /// 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 /// \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. /// 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 /// \brief Convert a Quartz video mode into a sf::VideoMode object

16
src/SFML/Window/macOS/cg_sf_conversion.mm
View File

@ -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. // Compare encoding.
CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode); 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. // Get the display mode.
CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId);
// Get bpp for the mode. // Get bpp for the mode.
const std::size_t bpp = modeBitsPerPixel(mode); const auto bpp = modeBitsPerPixel(mode);
// Clean up Memory. // Clean up Memory.
CGDisplayModeRelease(mode); CGDisplayModeRelease(mode);
@ -87,11 +87,9 @@ VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode)
// //
// [1]: "APIs for Supporting High Resolution" > "Additions and Changes for OS X v10.8" // [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 // 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)), auto size = Vector2u(Vector2(CGDisplayModeGetWidth(cgmode), CGDisplayModeGetHeight(cgmode)));
static_cast<unsigned int>(CGDisplayModeGetHeight(cgmode))}, scaleOutXY(size, nil);
static_cast<unsigned int>(modeBitsPerPixel(cgmode))); return VideoMode(size, modeBitsPerPixel(cgmode));
scaleOutWidthHeight(mode.size.x, mode.size.y, nil);
return mode;
} }
} // namespace sf::priv } // namespace sf::priv