Avoid warnings about narrowing conversions inside { }

diff --git a/src/EditCoursesMenu.cpp b/src/EditCoursesMenu.cpp
index 98d970a..3d2073f 100755 (executable)
--- a/src/EditCoursesMenu.cpp
+++ b/src/EditCoursesMenu.cpp
@@ -170,7 +170,7 @@ bool EditCoursesMenu::CanGoRight()
 {
        int num_values[NUM_ROWS] = 
        {
-               m_pCourses.size(),
+               (int)m_pCourses.size(),
                1,
                NUM_ACTIONS,
                (int)GetSelectedCourse()->m_entries.size(),

diff --git a/src/EditCoursesSongMenu.cpp b/src/EditCoursesSongMenu.cpp
index 7672c8b..320d0b5 100755 (executable)
--- a/src/EditCoursesSongMenu.cpp
+++ b/src/EditCoursesSongMenu.cpp
@@ -77,8 +77,8 @@ bool EditCoursesSongMenu::CanGoRight()
 {
        int num_values[NUM_ROWS] = 
        {
-               m_aGroups.size(),
-               m_aSongs.size(),
+               (int)m_aGroups.size(),
+               (int)m_aSongs.size(),
                NUM_COURSE_ENTRY_TYPES,
                NUM_DIFFICULTIES+1,
                11,

diff --git a/src/EditMenu.cpp b/src/EditMenu.cpp
index 2ca30fc..253dcf6 100755 (executable)
--- a/src/EditMenu.cpp
+++ b/src/EditMenu.cpp
@@ -238,13 +238,13 @@ bool EditMenu::CanGoRight()
 {
        int num_values[NUM_EDIT_MENU_ROWS] = 
        {
-               m_sGroups.size(),
-               m_pSongs.size(),
-               m_StepsTypes.size(),
-               m_vpSteps.size(),
-               m_StepsTypes.size(),
-               m_vpSourceSteps.size(),
-               m_Actions.size()
+               (int)m_sGroups.size(),
+               (int)m_pSongs.size(),
+               (int)m_StepsTypes.size(),
+               (int)m_vpSteps.size(),
+               (int)m_StepsTypes.size(),
+               (int)m_vpSourceSteps.size(),
+               (int)m_Actions.size()
        };
 
        return m_iSelection[m_SelectedRow] != (num_values[m_SelectedRow]-1);

diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp
index c2a99eb..ffc53c6 100755 (executable)
--- a/src/RageDisplay.cpp
+++ b/src/RageDisplay.cpp
@@ -546,7 +546,7 @@ RageSurface *RageDisplay::CreateSurfaceFromPixfmt( PixelFormat pixfmt,
 }
 
 RageDisplay::PixelFormat RageDisplay::FindPixelFormat( 
-       int bpp, int Rmask, int Gmask, int Bmask, int Amask, bool realtime )
+       int bpp, unsigned Rmask, unsigned Gmask, unsigned Bmask, unsigned Amask, bool realtime )
 {
        PixelFormatDesc tmp = { bpp, { Rmask, Gmask, Bmask, Amask } };
 

diff --git a/src/RageDisplay.h b/src/RageDisplay.h
index 5ca9bcd..d3904e0 100755 (executable)
--- a/src/RageDisplay.h
+++ b/src/RageDisplay.h
@@ -292,7 +292,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 );
 
 protected:
        RageMatrix GetPerspectiveMatrix(float fovy, float aspect, float zNear, float zFar);

diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index d0e33db..3452b40 100755 (executable)
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -59,7 +59,7 @@ namespace avcodec
 struct AVPixelFormat_t
 {
        int bpp;
-       int masks[4];
+       unsigned masks[4];
        avcodec::PixelFormat pf;
        bool HighColor;
        bool ByteSwapOnLittleEndian;

diff --git a/src/io/G15.cpp b/src/io/G15.cpp
index ba8b341..fcb315c 100644 (file)
--- a/src/io/G15.cpp
+++ b/src/io/G15.cpp
@@ -5,8 +5,8 @@
 
 #include "arch/USB/USBDriver_Impl.h"
 
-const short G15_VENDOR_ID = 0x046D;
-const short G15_PRODUCT_ID[] = { 0xC227, 0xC251 };
+const unsigned short G15_VENDOR_ID = 0x046D;
+const unsigned short G15_PRODUCT_ID[] = { 0xC227, 0xC251 };
 
 const unsigned NUM_PRODUCT_IDS = ARRAYLEN( G15_PRODUCT_ID );