From 58aa480016efadce2864567cc1e65b6b7a92d97f Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Wed, 26 Dec 2012 21:12:12 -0500 Subject: [PATCH] war on -Werror, part 3: narrowing conversions --- src/RageDisplay.cpp | 2 +- src/RageDisplay.h | 2 +- src/RageUtil.cpp | 2 +- src/arch/LowLevelWindow/LowLevelWindow_X11.cpp | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp index 9ed817b48d..50fa26e3a7 100644 --- a/src/RageDisplay.cpp +++ b/src/RageDisplay.cpp @@ -639,7 +639,7 @@ RageSurface *RageDisplay::CreateSurfaceFromPixfmt( PixelFormat pixfmt, return surf; } -PixelFormat RageDisplay::FindPixelFormat( int iBPP, int iRmask, int iGmask, int iBmask, int iAmask, bool bRealtime ) +PixelFormat RageDisplay::FindPixelFormat( int iBPP, unsigned iRmask, unsigned iGmask, unsigned iBmask, unsigned iAmask, bool bRealtime ) { PixelFormatDesc tmp = { iBPP, { iRmask, iGmask, iBmask, iAmask } }; diff --git a/src/RageDisplay.h b/src/RageDisplay.h index ca881c85f5..dd1e55d35f 100644 --- a/src/RageDisplay.h +++ b/src/RageDisplay.h @@ -380,7 +380,7 @@ public: void ChangeCentering( int trans_x, int trans_y, int add_width, int add_height ); RageSurface *CreateSurfaceFromPixfmt( PixelFormat pixfmt, void *pixels, int width, int height, int pitch ); - PixelFormat FindPixelFormat( int bpp, int Rmask, int Gmask, int Bmask, int Amask, bool realtime=false ); + PixelFormat FindPixelFormat( int bpp, unsigned Rmask, unsigned Gmask, unsigned Bmask, unsigned Amask, bool realtime=false ); // Lua void PushSelf( lua_State *L ); diff --git a/src/RageUtil.cpp b/src/RageUtil.cpp index 76393c7a86..d3bdf32c9a 100644 --- a/src/RageUtil.cpp +++ b/src/RageUtil.cpp @@ -43,7 +43,7 @@ void MersenneTwister::Reset( int iSeed ) void MersenneTwister::GenerateValues() { - static const int mask[] = { 0, 0x9908B0DF }; + static const unsigned mask[] = { 0, 0x9908B0DF }; for( int i = 0; i < 227; ++i ) { diff --git a/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp index 9c1f29e6b9..6d75d3f384 100644 --- a/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp +++ b/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp @@ -402,6 +402,7 @@ void RenderTarget_X11::Create( const RenderTargetParam ¶m, int &iTextureWidt m_iWidth = param.iWidth; m_iHeight = param.iHeight; + /* NOTE: int casts on GLX_DONT_CARE are for -Werror=narrowing */ int pConfigAttribs[] = { GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT, @@ -410,10 +411,10 @@ void RenderTarget_X11::Create( const RenderTargetParam ¶m, int &iTextureWidt GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, - GLX_ALPHA_SIZE, param.bWithAlpha? 8:GLX_DONT_CARE, + GLX_ALPHA_SIZE, param.bWithAlpha? 8: (int) GLX_DONT_CARE, GLX_DOUBLEBUFFER, False, - GLX_DEPTH_SIZE, param.bWithDepthBuffer? 16:GLX_DONT_CARE, + GLX_DEPTH_SIZE, param.bWithDepthBuffer? 16: (int) GLX_DONT_CARE, None }; int iConfigs;