From 83e83e5eff1a19748c11d234bb903973f80fc1aa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Mar 2012 20:49:33 +0000 Subject: quiet some warnings for gcc 4.7 --- intern/ghost/intern/GHOST_DisplayManager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'intern/ghost') 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 -- cgit v1.2.3