diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-17 03:51:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-17 03:51:42 +0300 |
commit | 9bcdb4b758d96d1fe5345858f6c61a90f7c57eac (patch) | |
tree | 51d1be5c5d7243b9782a10e8ed99a153f5392ef7 /intern | |
parent | de9495e51915cae71ecdae05fdc21e5aef09ba4e (diff) |
2.5: various warning fixes.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/SoundSystem/SND_Utils.h | 4 | ||||
-rw-r--r-- | intern/SoundSystem/intern/SND_Utils.cpp | 4 | ||||
-rw-r--r-- | intern/decimation/intern/LOD_ExternNormalEditor.cpp | 4 | ||||
-rw-r--r-- | intern/decimation/intern/LOD_ManMesh2.cpp | 2 | ||||
-rw-r--r-- | intern/decimation/intern/LOD_QSDecimator.cpp | 6 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 17 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_Solver.cpp | 6 | ||||
-rw-r--r-- | intern/opennl/superlu/util.c | 2 |
9 files changed, 24 insertions, 23 deletions
diff --git a/intern/SoundSystem/SND_Utils.h b/intern/SoundSystem/SND_Utils.h index 26cf1bda11c..82b7c69a595 100644 --- a/intern/SoundSystem/SND_Utils.h +++ b/intern/SoundSystem/SND_Utils.h @@ -97,8 +97,8 @@ extern unsigned int SND_GetSampleFormat(void* sample); extern unsigned int SND_GetNumberOfChannels(void* sample); extern unsigned int SND_GetSampleRate(void* sample); extern unsigned int SND_GetBitRate(void* sample); -extern unsigned int SND_GetNumberOfSamples(void* sample, int sample_length); -extern unsigned int SND_GetHeaderSize(void* sample, int sample_length); +extern unsigned int SND_GetNumberOfSamples(void* sample, unsigned int sample_length); +extern unsigned int SND_GetHeaderSize(void* sample, unsigned int sample_length); extern unsigned int SND_GetExtraChunk(void* sample); extern void SND_GetSampleInfo(signed char* sample, SND_WaveSlot* waveslot); diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp index 26ce106a24e..a9239576c96 100644 --- a/intern/SoundSystem/intern/SND_Utils.cpp +++ b/intern/SoundSystem/intern/SND_Utils.cpp @@ -290,7 +290,7 @@ unsigned int SND_GetBitRate(void* sample) /* gets the length of the actual sample data (without the header) */ -unsigned int SND_GetNumberOfSamples(void* sample, int sample_length) +unsigned int SND_GetNumberOfSamples(void* sample, unsigned int sample_length) { unsigned int chunklength, length = 0, offset; unsigned short block_align; @@ -330,7 +330,7 @@ unsigned int SND_GetNumberOfSamples(void* sample, int sample_length) /* gets the size of the entire header (file - sampledata) */ -unsigned int SND_GetHeaderSize(void* sample, int sample_length) +unsigned int SND_GetHeaderSize(void* sample, unsigned int sample_length) { unsigned int chunklength, headersize = 0, offset = 16; unsigned short block_align; diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.cpp b/intern/decimation/intern/LOD_ExternNormalEditor.cpp index b7c7b5a529b..21fd4f3e39f 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.cpp +++ b/intern/decimation/intern/LOD_ExternNormalEditor.cpp @@ -41,8 +41,8 @@ LOD_ExternNormalEditor( LOD_Decimation_InfoPtr extern_info, LOD_ManMesh2 &mesh ) : - m_extern_info (extern_info), - m_mesh(mesh) + m_mesh(mesh), + m_extern_info (extern_info) { } diff --git a/intern/decimation/intern/LOD_ManMesh2.cpp b/intern/decimation/intern/LOD_ManMesh2.cpp index 2fe49b36583..99f1c7d926a 100644 --- a/intern/decimation/intern/LOD_ManMesh2.cpp +++ b/intern/decimation/intern/LOD_ManMesh2.cpp @@ -546,7 +546,7 @@ DeleteEdge( // edges[e] should already have been removed from the heap - MT_assert(edges[e].HeapPos() == 0xffffffff); + MT_assert(edges[e].HeapPos() == -1); edges[e] = edges[last]; // also have to swap there heap positions.!!!!! diff --git a/intern/decimation/intern/LOD_QSDecimator.cpp b/intern/decimation/intern/LOD_QSDecimator.cpp index 1a0ec87f05b..0b0de767a9a 100644 --- a/intern/decimation/intern/LOD_QSDecimator.cpp +++ b/intern/decimation/intern/LOD_QSDecimator.cpp @@ -91,10 +91,10 @@ LOD_QSDecimator( LOD_ExternNormalEditor &face_editor, LOD_ExternBufferEditor &extern_editor ) : + m_is_armed (false), m_mesh(mesh), m_face_editor(face_editor), - m_extern_editor(extern_editor), - m_is_armed (false) + m_extern_editor(extern_editor) { m_deg_edges.reserve(32); m_deg_faces.reserve(32); @@ -318,7 +318,7 @@ UpdateHeap( LOD_Edge &e = edge_set[*edge_it]; m_heap->Remove(&edge_set[0],e.HeapPos()); - e.HeapPos() = 0xffffffff; + e.HeapPos() = -1; } } diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 270531d80be..ce54adb48ee 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -1401,7 +1401,7 @@ void LbmFsgrSolver::initMovingObstacles(bool staticInit) { debMsgStd("LbmFsgrSolver::initMovingObstacles",DM_MSG," obj "<<obj->getName()<<" skip:"<<skip<<", static:"<<staticInit<<" anim:"<<obj->getIsAnimated()<<" gid:"<<obj->getGeoInitId()<<" simgid:"<<mLbmInitId, 10); if( (obj->getGeoInitType()&FGI_ALLBOUNDS) || - (obj->getGeoInitType()&FGI_FLUID) && staticInit ) { + ((obj->getGeoInitType()&FGI_FLUID) && staticInit) ) { otype = ntype = CFInvalid; switch(obj->getGeoInitType()) { diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 34ce0409d53..2cc30aaa5bc 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -719,17 +719,17 @@ void GHOST_WindowX11::netwmMaximized(bool set) bool GHOST_WindowX11::netwmIsMaximized(void) const { unsigned char *prop_ret; - unsigned long bytes_after, num_ret; + unsigned long bytes_after, num_ret, i; Atom type_ret; bool st; - int format_ret, count, i; + int format_ret, ret, count; prop_ret = NULL; st = False; - i = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0, + ret = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0, 0x7fffffff, False, XA_ATOM, &type_ret, &format_ret, &num_ret, &bytes_after, &prop_ret); - if ((i == Success) && (prop_ret) && (format_ret == 32)) { + if ((ret == Success) && (prop_ret) && (format_ret == 32)) { count = 0; for (i = 0; i < num_ret; i++) { if (((unsigned long *) prop_ret)[i] == m_system->m_net_max_horz) @@ -775,17 +775,17 @@ void GHOST_WindowX11::netwmFullScreen(bool set) bool GHOST_WindowX11::netwmIsFullScreen(void) const { unsigned char *prop_ret; - unsigned long bytes_after, num_ret; + unsigned long bytes_after, num_ret, i; Atom type_ret; bool st; - int format_ret, i; + int format_ret, ret; prop_ret = NULL; st = False; - i = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0, + ret = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0, 0x7fffffff, False, XA_ATOM, &type_ret, &format_ret, &num_ret, &bytes_after, &prop_ret); - if ((i == Success) && (prop_ret) && (format_ret == 32)) { + if ((ret == Success) && (prop_ret) && (format_ret == 32)) { for (i = 0; i < num_ret; i++) { if (((unsigned long *) prop_ret)[i] == m_system->m_net_fullscreen) { st = True; @@ -868,7 +868,6 @@ GHOST_TSuccess GHOST_WindowX11::setState(GHOST_TWindowState state) { GHOST_TWindowState cur_state; bool is_max, is_full, is_motif_full; - int icccm_state; cur_state = getState(); if (state == (int)cur_state) diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 9de937ea4b2..9eec1c38a2d 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -175,11 +175,12 @@ void IK_SetLimit(IK_Segment *seg, IK_SegmentAxis axis, float lmin, float lmax) IK_QSegment *qseg = (IK_QSegment*)seg; if (axis >= IK_TRANS_X) { - if(!qseg->Translational()) + if(!qseg->Translational()) { if(qseg->Composite() && qseg->Composite()->Translational()) qseg = qseg->Composite(); else return; + } if(axis == IK_TRANS_X) axis = IK_X; else if(axis == IK_TRANS_Y) axis = IK_Y; @@ -201,11 +202,12 @@ void IK_SetStiffness(IK_Segment *seg, IK_SegmentAxis axis, float stiffness) MT_Scalar weight = 1.0-stiffness; if (axis >= IK_TRANS_X) { - if(!qseg->Translational()) + if(!qseg->Translational()) { if(qseg->Composite() && qseg->Composite()->Translational()) qseg = qseg->Composite(); else return; + } if(axis == IK_TRANS_X) axis = IK_X; else if(axis == IK_TRANS_Y) axis = IK_Y; diff --git a/intern/opennl/superlu/util.c b/intern/opennl/superlu/util.c index 824cabacee5..f77da9c4736 100644 --- a/intern/opennl/superlu/util.c +++ b/intern/opennl/superlu/util.c @@ -34,7 +34,7 @@ float DenseSize(int n, float sum_nw); void superlu_abort_and_exit(char* msg) { - fprintf(stderr, msg); + fprintf(stderr, "%s", msg); exit (-1); } |