Changeset 9369

Timestamp:

12/16/08 20:49:09 (4 years ago)

Author:

robert

Message:

From Bob Kuehne, build fixes.

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -396 +396 @@
         resolution.height = CGDisplayPixelsHigh(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;
     }
-    
+
     /** return the top left coord of a specific screen in global screen space */
     void getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y) {
@@ -416 +416 @@
         if (!number_value) // if can't get a number for the dictionary
             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 value; // otherwise return the long value
@@ -439 +439 @@
         
         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 =
             CGDisplayBestModeForParametersAndRefreshRate(