diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 00:49:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 00:49:33 +0400 |
| commit | 83e83e5eff1a19748c11d234bb903973f80fc1aa (patch) | |
| tree | 9d2f2de2de06fb47c554a9f642930cf32362c616 /intern/ghost | |
| parent | abf551b1a51fe7991be0eb9a8ced6a9c4db927e5 (diff) | |
quiet some warnings for gcc 4.7
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cpp index 8a86424e347..ca0d53b8297 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.cpp +++ b/intern/ghost/intern/GHOST_DisplayManager.cpp @@ -149,7 +149,12 @@ GHOST_DisplayManager::findMatch( GHOST_TSuccess success = GHOST_kSuccess; GHOST_ASSERT(m_settingsInitialized, "GHOST_DisplayManager::findMatch(): m_settingsInitialized=false"); - int criteria[4] = { setting.xPixels, setting.yPixels, setting.bpp, setting.frequency }; + int criteria[4] = { + (int)setting.xPixels, + (int)setting.yPixels, + (int)setting.bpp, + (int)setting.frequency + }; int capabilities[4]; double field, score; double best = 1e12; // A big number |