diff options
| author | James Cowgill <james410@cowgill.org.uk> | 2014-12-09 20:21:40 +0000 |
|---|---|---|
| committer | James Cowgill <james410@cowgill.org.uk> | 2014-12-09 20:21:40 +0000 |
| commit | fa21c65d0c764705cfc377bf0d0de08fac26874e (patch) | |
| tree | dbc9e87bbd8684d15e79fc0c8b7a8985389c3b35 /src/SFML/Window/OSX/cg_sf_conversion.hpp | |
| parent | dd835931261c340acd5f0409341d13fa2670423e (diff) | |
Imported Upstream version 2.2.0+dfsg
Diffstat (limited to 'src/SFML/Window/OSX/cg_sf_conversion.hpp')
| -rw-r--r-- | src/SFML/Window/OSX/cg_sf_conversion.hpp | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/SFML/Window/OSX/cg_sf_conversion.hpp b/src/SFML/Window/OSX/cg_sf_conversion.hpp index 150e7b5..a60cce4 100644 --- a/src/SFML/Window/OSX/cg_sf_conversion.hpp +++ b/src/SFML/Window/OSX/cg_sf_conversion.hpp @@ -1,8 +1,8 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2013 Marco Antognini (antognini.marco@gmail.com), -// Laurent Gomila (laurent.gom@gmail.com), +// Copyright (C) 2007-2014 Marco Antognini (antognini.marco@gmail.com), +// Laurent Gomila (laurent.gom@gmail.com), // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -37,19 +37,17 @@ namespace sf namespace priv { //////////////////////////////////////////////////////////// -/// \brief Get bpp of a video mode for OS 10.6 or later. -/// -/// With OS 10.6 and later, Quartz doesn't use anymore dictionaries +/// \brief Get bpp of a video mode for OS 10.6 or later +/// +/// With OS 10.6 and later, Quartz doesn't use dictionaries any more /// to represent video mode. Instead it uses a CGDisplayMode opaque type. /// -//////////////////////////////////////////////////////////// -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 +//////////////////////////////////////////////////////////// size_t modeBitsPerPixel(CGDisplayModeRef mode); -#endif //////////////////////////////////////////////////////////// -/// \brief Get bpp for all OS X version. -/// +/// \brief Get bpp for all OS X version +/// /// This function use only non-deprecated way to get the /// display bits per pixel information for a given display id. /// @@ -57,25 +55,17 @@ size_t modeBitsPerPixel(CGDisplayModeRef mode); size_t 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 /// //////////////////////////////////////////////////////////// -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -VideoMode convertCGModeToSFMode(CFDictionaryRef dictionary); -#else // MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode); -#endif - + //////////////////////////////////////////////////////////// -/// \brief Convert a sf::VideoMode object into a Quartz video mode. +/// \brief Convert a sf::VideoMode object into a Quartz video mode /// //////////////////////////////////////////////////////////// -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -CFDictionaryRef convertSFModeToCGMode(VideoMode sfmode); -#else // MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 CGDisplayModeRef convertSFModeToCGMode(VideoMode sfmode); -#endif - + } // namespace priv } // namespace sf |