Show
Ignore:
Timestamp:
12/16/08 20:49:09 (5 years ago)
Author:
robert
Message:

From Bob Kuehne, build fixes.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

    r9363 r9369  
    396396        resolution.height = CGDisplayPixelsHigh(id); 
    397397        resolution.colorDepth = CGDisplayBitsPerPixel(id); 
    398         resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate);        // Not tested 
     398        resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(id), kCGDisplayRefreshRate);        // Not tested 
    399399        if (resolution.refreshRate<0) resolution.refreshRate = 0; 
    400400    } 
    401      
     401 
    402402    /** return the top left coord of a specific screen in global screen space */ 
    403403    void getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y) { 
     
    416416        if (!number_value) // if can't get a number for the dictionary 
    417417            return -1;  // fail 
    418         if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &double_value)) // or if cant convert it 
     418        if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &value)) // or if cant convert it 
    419419            return -1; // fail 
    420420        return value; // otherwise return the long value 
     
    439439         
    440440        CGRefreshRate refresh = resolution.refreshRate>0 ? resolution.refreshRate : getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate);   
    441         sizt_t depth = resolution.colorDepth>0 ? resolution.colorDepth : CGDisplayBitsPerPixel(displayID); 
     441        size_t depth = resolution.colorDepth>0 ? resolution.colorDepth : CGDisplayBitsPerPixel(displayID); 
    442442        CFDictionaryRef display_mode_values = 
    443443            CGDisplayBestModeForParametersAndRefreshRate(