archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

quiet some warnings for gcc 4.7

Browse Source
This commit is contained in:
Campbell Barton
2012-03-26 20:49:33 +00:00
parent abf551b1a5
commit 83e83e5eff
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/ghost/intern/GHOST_DisplayManager.cpp
View File

@@ -149,7 +149,12 @@ GHOST_DisplayManager::findMatch(
GHOST_TSuccess success = GHOST_kSuccess; GHOST_TSuccess success = GHOST_kSuccess;
GHOST_ASSERT(m_settingsInitialized, "GHOST_DisplayManager::findMatch(): m_settingsInitialized=false"); 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]; int capabilities[4];
double field, score; double field, score;
double best = 1e12; // A big number double best = 1e12; // A big number

3
source/gameengine/Expressions/PyObjectPlus.cpp
View File

@@ -456,7 +456,8 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef *
{ {
MT_Vector3 *val = reinterpret_cast<MT_Vector3*>(ptr); MT_Vector3 *val = reinterpret_cast<MT_Vector3*>(ptr);
#ifdef USE_MATHUTILS #ifdef USE_MATHUTILS
float fval[3]= {(*val)[0], (*val)[1], (*val)[2]}; float fval[3];
val->getValue(fval);
return Vector_CreatePyObject(fval, 3, Py_NEW, NULL); return Vector_CreatePyObject(fval, 3, Py_NEW, NULL);
#else #else
PyObject* resultlist = PyList_New(3); PyObject* resultlist = PyList_New(3);

12
source/gameengine/Ketsji/KX_PyMath.cpp
View File

@@ -146,7 +146,8 @@ PyObject* PyObjectFrom(const MT_Matrix3x3 &mat)
PyObject* PyObjectFrom(const MT_Quaternion &qrot) PyObject* PyObjectFrom(const MT_Quaternion &qrot)
{ {
/* NOTE, were re-ordering here for Mathutils compat */ /* NOTE, were re-ordering here for Mathutils compat */
float fvec[4]= {qrot[3], qrot[0], qrot[1], qrot[2]}; float fvec[4];
qrot.getValue(fvec);
return Quaternion_CreatePyObject(fvec, Py_NEW, NULL); return Quaternion_CreatePyObject(fvec, Py_NEW, NULL);
} }
#endif #endif
@@ -154,7 +155,8 @@ PyObject* PyObjectFrom(const MT_Quaternion &qrot)
PyObject* PyObjectFrom(const MT_Tuple4 &vec) PyObject* PyObjectFrom(const MT_Tuple4 &vec)
{ {
#ifdef USE_MATHUTILS #ifdef USE_MATHUTILS
float fvec[4]= {vec[0], vec[1], vec[2], vec[3]}; float fvec[4];
vec.getValue(fvec);
return Vector_CreatePyObject(fvec, 4, Py_NEW, NULL); return Vector_CreatePyObject(fvec, 4, Py_NEW, NULL);
#else #else
PyObject *list = PyList_New(4); PyObject *list = PyList_New(4);
@@ -169,7 +171,8 @@ PyObject* PyObjectFrom(const MT_Tuple4 &vec)
PyObject* PyObjectFrom(const MT_Tuple3 &vec) PyObject* PyObjectFrom(const MT_Tuple3 &vec)
{ {
#ifdef USE_MATHUTILS #ifdef USE_MATHUTILS
float fvec[3]= {vec[0], vec[1], vec[2]}; float fvec[3];
vec.getValue(fvec);
return Vector_CreatePyObject(fvec, 3, Py_NEW, NULL); return Vector_CreatePyObject(fvec, 3, Py_NEW, NULL);
#else #else
PyObject *list = PyList_New(3); PyObject *list = PyList_New(3);
@@ -183,7 +186,8 @@ PyObject* PyObjectFrom(const MT_Tuple3 &vec)
PyObject* PyObjectFrom(const MT_Tuple2 &vec) PyObject* PyObjectFrom(const MT_Tuple2 &vec)
{ {
#ifdef USE_MATHUTILS #ifdef USE_MATHUTILS
float fvec[2]= {vec[0], vec[1]}; float fvec[2];
vec.getValue(fvec);
return Vector_CreatePyObject(fvec, 2, Py_NEW, NULL); return Vector_CreatePyObject(fvec, 2, Py_NEW, NULL);
#else #else
PyObject *list = PyList_New(2); PyObject *list = PyList_New(2);