FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Bob Kuehne, build fixes.

Browse Source
This commit is contained in:
Robert Osfield 2008-12-16 19:49:09 +00:00
parent bd4b6e9b8c
commit 3313327ab4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@ -395,10 +395,10 @@ struct OSXCarbonWindowingSystemInterface : public osg::GraphicsContext::Windowin
resolution.width = CGDisplayPixelsWide(id); resolution.width = CGDisplayPixelsWide(id);
resolution.height = CGDisplayPixelsHigh(id); resolution.height = CGDisplayPixelsHigh(id);
resolution.colorDepth = CGDisplayBitsPerPixel(id); resolution.colorDepth = CGDisplayBitsPerPixel(id);
resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate); // Not tested resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(id), kCGDisplayRefreshRate); // Not tested
if (resolution.refreshRate<0) resolution.refreshRate = 0; if (resolution.refreshRate<0) resolution.refreshRate = 0;
} }
/** return the top left coord of a specific screen in global screen space */ /** return the top left coord of a specific screen in global screen space */
void getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y) { void getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y) {
CGRect bounds = CGDisplayBounds( getDisplayID(si) ); CGRect bounds = CGDisplayBounds( getDisplayID(si) );
@ -415,7 +415,7 @@ struct OSXCarbonWindowingSystemInterface : public osg::GraphicsContext::Windowin
CFNumberRef number_value = (CFNumberRef) CFDictionaryGetValue(refDict, key); CFNumberRef number_value = (CFNumberRef) CFDictionaryGetValue(refDict, key);
if (!number_value) // if can't get a number for the dictionary if (!number_value) // if can't get a number for the dictionary
return -1; // fail return -1; // fail
if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &double_value)) // or if cant convert it if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &value)) // or if cant convert it
return -1; // fail return -1; // fail
return value; // otherwise return the long value return value; // otherwise return the long value
} }
@ -438,7 +438,7 @@ struct OSXCarbonWindowingSystemInterface : public osg::GraphicsContext::Windowin
CGDirectDisplayID displayID = getDisplayID(screenIdentifier); CGDirectDisplayID displayID = getDisplayID(screenIdentifier);
CGRefreshRate refresh = resolution.refreshRate>0 ? resolution.refreshRate : getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate); CGRefreshRate refresh = resolution.refreshRate>0 ? resolution.refreshRate : getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate);
sizt_t depth = resolution.colorDepth>0 ? resolution.colorDepth : CGDisplayBitsPerPixel(displayID); size_t depth = resolution.colorDepth>0 ? resolution.colorDepth : CGDisplayBitsPerPixel(displayID);
CFDictionaryRef display_mode_values = CFDictionaryRef display_mode_values =
CGDisplayBestModeForParametersAndRefreshRate( CGDisplayBestModeForParametersAndRefreshRate(
displayID, displayID,