From c78e44cdc563853c250da78ee78ba622c39126b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Luc=20Peuri=C3=A8re?= Date: Wed, 9 Mar 2005 19:45:59 +0000 Subject: big warning hunt commit lot of casts, added prototypes, missing includes and some true errors --- intern/SoundSystem/openal/SND_OpenALDevice.cpp | 2 ++ intern/bmfont/intern/BMF_BitmapFont.cpp | 6 ++-- intern/bsp/intern/BSP_CSGHelper.cpp | 2 +- .../decimation/intern/LOD_ExternNormalEditor.cpp | 2 +- intern/decimation/intern/LOD_QSDecimator.cpp | 2 +- intern/ghost/GHOST_Types.h | 6 +++- intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp | 4 +-- intern/ghost/intern/GHOST_SystemCarbon.cpp | 2 +- intern/ghost/intern/GHOST_WindowCarbon.cpp | 7 +++-- intern/iksolver/intern/IK_QJacobianSolver.cpp | 2 +- intern/iksolver/intern/IK_Solver.cpp | 2 +- intern/opennl/extern/ONL_opennl.h | 6 ++-- intern/opennl/intern/opennl.c | 34 +++++++++++----------- intern/opennl/superlu/get_perm_c.c | 6 ++-- intern/opennl/superlu/lsame.c | 3 ++ intern/opennl/superlu/memory.c | 4 +++ intern/opennl/superlu/mmd.c | 6 ++++ intern/opennl/superlu/sp_preorder.c | 3 ++ intern/opennl/superlu/ssp_defs.h | 3 ++ intern/opennl/superlu/superlu_timer.c | 2 ++ intern/opennl/superlu/sutil.c | 8 +++++ intern/opennl/superlu/util.c | 6 ++++ intern/opennl/superlu/xerbla.c | 1 + 23 files changed, 82 insertions(+), 37 deletions(-) (limited to 'intern') diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index 983ee0e7015..66950e6ef92 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -393,7 +393,9 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, { int buffer = waveslot->GetBuffer(); void* data = NULL; +#ifndef __APPLE__ char loop = 'a'; +#endif int sampleformat, bitrate, numberofchannels; ALenum al_error = alGetError(); diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp index fbb5d5805af..7aa7427430f 100644 --- a/intern/bmfont/intern/BMF_BitmapFont.cpp +++ b/intern/bmfont/intern/BMF_BitmapFont.cpp @@ -78,7 +78,7 @@ void BMF_BitmapFont::DrawString(char* str) glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - while (c = (unsigned char) *str++) { + while ( (c = (unsigned char) *str++) ) { BMF_CharData & cd = m_fontData->chars[c]; if (cd.data_offset==-1) { @@ -101,7 +101,7 @@ int BMF_BitmapFont::GetStringWidth(char* str) unsigned char c; int length = 0; - while (c = (unsigned char) *str++) { + while ( (c = (unsigned char) *str++) ) { length += m_fontData->chars[c].advance; } @@ -185,7 +185,7 @@ void BMF_BitmapFont::DrawStringTexture(char *str, float x, float y, float z) int baseLine = -(m_fontData->ymin); glBegin(GL_QUADS); - while (c = (unsigned char) *str++) { + while ( (c = (unsigned char) *str++) ) { BMF_CharData & cd = m_fontData->chars[c]; if (cd.data_offset != -1) { diff --git a/intern/bsp/intern/BSP_CSGHelper.cpp b/intern/bsp/intern/BSP_CSGHelper.cpp index 0932d9bcdb9..a35d2736a86 100644 --- a/intern/bsp/intern/BSP_CSGHelper.cpp +++ b/intern/bsp/intern/BSP_CSGHelper.cpp @@ -407,7 +407,7 @@ DuplicateMesh( // Run through the result and add in the triangle faces. - int i; + unsigned int i; for (i = 0; i < triangle_indices.size(); i+=3) { // duplicate the face data for this face. o_f_data.Duplicate(i_f_data[*f_faces_it]); diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.cpp b/intern/decimation/intern/LOD_ExternNormalEditor.cpp index 11818fc9f7c..7c9191b60c7 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.cpp +++ b/intern/decimation/intern/LOD_ExternNormalEditor.cpp @@ -241,7 +241,7 @@ ComputeVertexNormal( // average the face normals surrounding this // vertex and normalize - vector &verts = m_mesh.VertexSet(); + // vector &verts = m_mesh.VertexSet(); /*unused*/ const vector & face_normals = m_normals.Ref(); vector vertex_faces; diff --git a/intern/decimation/intern/LOD_QSDecimator.cpp b/intern/decimation/intern/LOD_QSDecimator.cpp index 231f076a78c..a9fd5267c54 100644 --- a/intern/decimation/intern/LOD_QSDecimator.cpp +++ b/intern/decimation/intern/LOD_QSDecimator.cpp @@ -273,7 +273,7 @@ BuildHeap( std::vector & heap_vector = m_heap->HeapVector(); - for (int i = 0; i < edge_set.size(); ++i) { + for (unsigned int i = 0; i < edge_set.size(); ++i) { edge_set[i].HeapPos() = i; heap_vector.push_back(i); } diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index ff507db6f51..8f487203ef7 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -83,7 +83,11 @@ typedef enum { GHOST_kWindowStateNormal = 0, GHOST_kWindowStateMaximized, GHOST_kWindowStateMinimized, - GHOST_kWindowStateFullScreen + GHOST_kWindowStateFullScreen, + GHOST_kWindowState8Normal = 8, + GHOST_kWindowState8Maximized, + GHOST_kWindowState8Minimized, + GHOST_kWindowState8FullScreen, } GHOST_TWindowState; diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp index 8984008f93d..9877d55d8a5 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp @@ -90,8 +90,8 @@ GHOST_TSuccess GHOST_DisplayManagerCarbon::getDisplaySetting(GHOST_TUns8 display CFArrayRef displayModes; CGDirectDisplayID d = m_displayIDs[display]; displayModes = ::CGDisplayAvailableModes(d); - CFIndex numModes = ::CFArrayGetCount(displayModes); - GHOST_TInt32 numSettings = (GHOST_TInt32)numModes; + //CFIndex numModes = ::CFArrayGetCount(displayModes);/*unused*/ + //GHOST_TInt32 numSettings = (GHOST_TInt32)numModes; /*unused*/ CFDictionaryRef displayModeValues = (CFDictionaryRef)::CFArrayGetValueAtIndex(displayModes, index); setting.xPixels = getValue(displayModeValues, kCGDisplayWidth); diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index 83ba2fdf764..d1caadab219 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -902,7 +902,7 @@ bool GHOST_SystemCarbon::handleMouseDown(EventRef event) ::ZoomWindow(window, part, true); ghostWindow->setMac_windowState(1); } else { // need to force size again - GHOST_TUns32 scr_x,scr_y; + // GHOST_TUns32 scr_x,scr_y; /*unused*/ Rect outAvailableRect; ghostWindow->setMac_windowState(2); diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index c1d6e8ee49f..ad19f08c950 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -123,7 +123,7 @@ GHOST_WindowCarbon::GHOST_WindowCarbon( if (state != GHOST_kWindowStateFullScreen) { Rect bnds = { top, left, top+height, left+width }; - Boolean visible = (state == GHOST_kWindowStateNormal) || (state == GHOST_kWindowStateMaximized); + // Boolean visible = (state == GHOST_kWindowStateNormal) || (state == GHOST_kWindowStateMaximized); /*unused*/ gen2mac(title, title255); err = ::CreateNewWindow( kDocumentWindowClass, @@ -648,6 +648,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setWindowCursorShape(GHOST_TStandardCursor sh return GHOST_kSuccess; } +#if 0 /** Reverse the bits in a GHOST_TUns8 */ static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch) { @@ -656,6 +657,8 @@ static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch) ch= ((ch>>4)&0x0F) | ((ch<<4)&0xF0); return ch; } +#endif + /** Reverse the bits in a GHOST_TUns16 */ static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt) @@ -698,7 +701,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setWindowCustomCursorShape(GHOST_TUns8 *bitma GHOST_TSuccess GHOST_WindowCarbon::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY) { - setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1); + return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1); } diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp index e5d8e19e92a..450baf8fa9e 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.cpp +++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp @@ -253,7 +253,7 @@ UpdateChain( vector &segs = chain.Segments(); - int seg_ind = 0; + unsigned int seg_ind = 0; for (seg_ind = 0;seg_ind < segs.size(); seg_ind++) { MT_Vector3 dq; diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 238e2d2ee97..d04b0de0daf 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -80,7 +80,7 @@ IK_LoadChain( if (intern_cpp == NULL) return 0; std::vector & segs = intern_cpp->Chain().Segments(); - if (segs.size() != num_segs) { + if (segs.size() != (unsigned int) num_segs) { segs = std::vector(num_segs); } diff --git a/intern/opennl/extern/ONL_opennl.h b/intern/opennl/extern/ONL_opennl.h index 5e4bd24313c..a84a153709d 100644 --- a/intern/opennl/extern/ONL_opennl.h +++ b/intern/opennl/extern/ONL_opennl.h @@ -109,10 +109,10 @@ typedef void* NLContext ; /* * Contexts */ - NLContext nlNewContext() ; + NLContext nlNewContext(void) ; void nlDeleteContext(NLContext context) ; void nlMakeCurrent(NLContext context) ; - NLContext nlGetCurrent() ; + NLContext nlGetCurrent(void) ; /* * State set/get @@ -153,7 +153,7 @@ typedef void* NLContext ; * Solve */ - NLboolean nlSolve() ; + NLboolean nlSolve(void) ; #ifdef __cplusplus } diff --git a/intern/opennl/intern/opennl.c b/intern/opennl/intern/opennl.c index be797223f51..3bc87c8dc76 100644 --- a/intern/opennl/intern/opennl.c +++ b/intern/opennl/intern/opennl.c @@ -416,7 +416,7 @@ static void __nlSparseMatrix_mult_cols( /************************************************************************************/ /* SparseMatrix x Vector routines, main driver routine */ -void __nlSparseMatrixMult(__NLSparseMatrix* A, NLfloat* x, NLfloat* y) { +static void __nlSparseMatrixMult(__NLSparseMatrix* A, NLfloat* x, NLfloat* y) { if(A->storage & __NL_ROWS) { if(A->storage & __NL_SYMMETRIC) { __nlSparseMatrix_mult_rows_symmetric(A, x, y) ; @@ -481,12 +481,12 @@ typedef struct { static __NLContext* __nlCurrentContext = NULL ; -void __nlMatrixVectorProd_default(NLfloat* x, NLfloat* y) { +static void __nlMatrixVectorProd_default(NLfloat* x, NLfloat* y) { __nlSparseMatrixMult(&(__nlCurrentContext->M), x, y) ; } -NLContext nlNewContext() { +NLContext nlNewContext(void) { __NLContext* result = __NL_NEW(__NLContext) ; result->state = __NL_STATE_INITIAL ; result->row_scaling = 1.0 ; @@ -533,15 +533,15 @@ void nlMakeCurrent(NLContext context) { __nlCurrentContext = (__NLContext*)(context) ; } -NLContext nlGetCurrent() { +NLContext nlGetCurrent(void) { return __nlCurrentContext ; } -void __nlCheckState(NLenum state) { +static void __nlCheckState(NLenum state) { __nl_assert(__nlCurrentContext->state == state) ; } -void __nlTransition(NLenum from_state, NLenum to_state) { +static void __nlTransition(NLenum from_state, NLenum to_state) { __nlCheckState(from_state) ; __nlCurrentContext->state = to_state ; } @@ -737,7 +737,7 @@ NLboolean nlVariableIsLocked(NLuint index) { /************************************************************************************/ /* System construction */ -void __nlVariablesToVector() { +static void __nlVariablesToVector() { NLuint i ; __nl_assert(__nlCurrentContext->alloc_x) ; __nl_assert(__nlCurrentContext->alloc_variable) ; @@ -750,7 +750,7 @@ void __nlVariablesToVector() { } } -void __nlVectorToVariables() { +static void __nlVectorToVariables() { NLuint i ; __nl_assert(__nlCurrentContext->alloc_x) ; __nl_assert(__nlCurrentContext->alloc_variable) ; @@ -764,7 +764,7 @@ void __nlVectorToVariables() { } -void __nlBeginSystem() { +static void __nlBeginSystem() { __nlTransition(__NL_STATE_INITIAL, __NL_STATE_SYSTEM) ; __nl_assert(__nlCurrentContext->nb_variables > 0) ; __nlCurrentContext->variable = __NL_NEW_ARRAY( @@ -773,11 +773,11 @@ void __nlBeginSystem() { __nlCurrentContext->alloc_variable = NL_TRUE ; } -void __nlEndSystem() { +static void __nlEndSystem() { __nlTransition(__NL_STATE_MATRIX_CONSTRUCTED, __NL_STATE_SYSTEM_CONSTRUCTED) ; } -void __nlBeginMatrix() { +static void __nlBeginMatrix() { NLuint i ; NLuint n = 0 ; NLenum storage = __NL_ROWS ; @@ -828,7 +828,7 @@ void __nlBeginMatrix() { __nlCurrentContext->current_row = 0 ; } -void __nlEndMatrix() { +static void __nlEndMatrix() { __nlTransition(__NL_STATE_MATRIX, __NL_STATE_MATRIX_CONSTRUCTED) ; __nlRowColumnDestroy(&__nlCurrentContext->af) ; @@ -846,14 +846,14 @@ void __nlEndMatrix() { } } -void __nlBeginRow() { +static void __nlBeginRow() { __nlTransition(__NL_STATE_MATRIX, __NL_STATE_ROW) ; __nlRowColumnZero(&__nlCurrentContext->af) ; __nlRowColumnZero(&__nlCurrentContext->al) ; __nlRowColumnZero(&__nlCurrentContext->xl) ; } -void __nlScaleRow(NLfloat s) { +static void __nlScaleRow(NLfloat s) { __NLRowColumn* af = &__nlCurrentContext->af ; __NLRowColumn* al = &__nlCurrentContext->al ; NLuint nf = af->size ; @@ -868,7 +868,7 @@ void __nlScaleRow(NLfloat s) { __nlCurrentContext->right_hand_side *= s ; } -void __nlNormalizeRow(NLfloat weight) { +static void __nlNormalizeRow(NLfloat weight) { __NLRowColumn* af = &__nlCurrentContext->af ; __NLRowColumn* al = &__nlCurrentContext->al ; NLuint nf = af->size ; @@ -885,7 +885,7 @@ void __nlNormalizeRow(NLfloat weight) { __nlScaleRow(weight / norm) ; } -void __nlEndRow() { +static void __nlEndRow() { __NLRowColumn* af = &__nlCurrentContext->af ; __NLRowColumn* al = &__nlCurrentContext->al ; __NLRowColumn* xl = &__nlCurrentContext->xl ; @@ -1137,7 +1137,7 @@ static NLboolean __nlSolve_SUPERLU( NLboolean do_perm) { /************************************************************************/ /* nlSolve() driver routine */ -NLboolean nlSolve() { +NLboolean nlSolve(void) { NLboolean result = NL_TRUE ; __nlCheckState(__NL_STATE_SYSTEM_CONSTRUCTED) ; diff --git a/intern/opennl/superlu/get_perm_c.c b/intern/opennl/superlu/get_perm_c.c index 9cdf5a876bf..e255b4a76bd 100644 --- a/intern/opennl/superlu/get_perm_c.c +++ b/intern/opennl/superlu/get_perm_c.c @@ -12,7 +12,7 @@ extern int genmmd_(int *, int *, int *, int *, int *, int *, int *, int *, int *, int *, int *, int *); -void +static void get_colamd( const int m, /* number of rows in matrix A. */ const int n, /* number of columns in matrix A. */ @@ -47,7 +47,7 @@ get_colamd( SUPERLU_FREE(p); } -void +static void getata( const int m, /* number of rows in matrix A. */ const int n, /* number of columns in matrix A. */ @@ -189,7 +189,7 @@ getata( } -void +static void at_plus_a( const int n, /* number of columns in matrix A. */ const int nz, /* number of nonzeros in matrix A */ diff --git a/intern/opennl/superlu/lsame.c b/intern/opennl/superlu/lsame.c index 29f27d38fa9..79fb4d428a5 100644 --- a/intern/opennl/superlu/lsame.c +++ b/intern/opennl/superlu/lsame.c @@ -1,3 +1,6 @@ +int lsame_(char *, char *); + + int lsame_(char *ca, char *cb) { /* -- LAPACK auxiliary routine (version 2.0) -- diff --git a/intern/opennl/superlu/memory.c b/intern/opennl/superlu/memory.c index 54d863ea9e9..279b60b5239 100644 --- a/intern/opennl/superlu/memory.c +++ b/intern/opennl/superlu/memory.c @@ -10,6 +10,10 @@ #include "ssp_defs.h" +/* prototypes --------------------------------- */ +void copy_mem_int(int, void *, void *); +void user_bcopy(char *, char *, int); + #if ( DEBUGlevel>=1 ) /* Debug malloc/free. */ int superlu_malloc_total = 0; diff --git a/intern/opennl/superlu/mmd.c b/intern/opennl/superlu/mmd.c index 05f26ce0995..cc45aea7b41 100644 --- a/intern/opennl/superlu/mmd.c +++ b/intern/opennl/superlu/mmd.c @@ -1,6 +1,12 @@ typedef int shortint; + +/* prototypes -------------------- */ +int genmmd_(int *, int *, int *, int *, int *, int *, int *, + int *, int *, int *, int *, int *); + + /* *************************************************************** */ /* *************************************************************** */ /* **** GENMMD ..... MULTIPLE MINIMUM EXTERNAL DEGREE **** */ diff --git a/intern/opennl/superlu/sp_preorder.c b/intern/opennl/superlu/sp_preorder.c index f82da2de1aa..c40ebc9a4f7 100644 --- a/intern/opennl/superlu/sp_preorder.c +++ b/intern/opennl/superlu/sp_preorder.c @@ -1,5 +1,8 @@ #include "ssp_defs.h" +int check_perm(char *, int , int *); + + void sp_preorder(superlu_options_t *options, SuperMatrix *A, int *perm_c, int *etree, SuperMatrix *AC) diff --git a/intern/opennl/superlu/ssp_defs.h b/intern/opennl/superlu/ssp_defs.h index 5b4e86b175b..61b324e74d8 100644 --- a/intern/opennl/superlu/ssp_defs.h +++ b/intern/opennl/superlu/ssp_defs.h @@ -225,7 +225,10 @@ extern void sPrint_SuperNode_Matrix(char *, SuperMatrix *); extern void sPrint_Dense_Matrix(char *, SuperMatrix *); extern void print_lu_col(char *, int, int, int *, GlobalLU_t *); extern void check_tempv(int, float *); +extern int print_int_vec(char *what, int n, int *vec); +extern int sp_symetree(int *acolst, int *acolend, int *arow, int n, int *parent); + #ifdef __cplusplus } #endif diff --git a/intern/opennl/superlu/superlu_timer.c b/intern/opennl/superlu/superlu_timer.c index 798fd59d4ea..4f68f3a7f1a 100644 --- a/intern/opennl/superlu/superlu_timer.c +++ b/intern/opennl/superlu/superlu_timer.c @@ -11,6 +11,8 @@ /* We want this flag, safer than putting in build system */ #define NO_TIMER +double SuperLU_timer_ (); + #ifdef SUN /* * It uses the system call gethrtime(3C), which is accurate to diff --git a/intern/opennl/superlu/sutil.c b/intern/opennl/superlu/sutil.c index 4689f34968a..78f0b8bc5cc 100644 --- a/intern/opennl/superlu/sutil.c +++ b/intern/opennl/superlu/sutil.c @@ -22,6 +22,14 @@ #include #include "ssp_defs.h" +/* prototypes */ +void sprint_lu_col(char *msg, int jcol, int pivrow, int *xprune, GlobalLU_t *Glu); +void scheck_tempv(int n, float *tempv); +void sPrintPerf(SuperMatrix *, SuperMatrix *, mem_usage_t *,float , float , + float *, float *, char *, SuperLUStat_t *); +int print_float_vec(char *what, int n, float *vec); +/* ********** */ + void sCreate_CompCol_Matrix(SuperMatrix *A, int m, int n, int nnz, float *nzval, int *rowind, int *colptr, diff --git a/intern/opennl/superlu/util.c b/intern/opennl/superlu/util.c index 3c49d714d1c..824cabacee5 100644 --- a/intern/opennl/superlu/util.c +++ b/intern/opennl/superlu/util.c @@ -22,6 +22,12 @@ #include "ssp_defs.h" #include "util.h" +/* prototypes */ +flops_t LUFactFlops(SuperLUStat_t *stat); +flops_t LUSolveFlops(SuperLUStat_t *stat); +float SpaSize(int n, int np, float sum_npw); +float DenseSize(int n, float sum_nw); + /* * Global statistics variale */ diff --git a/intern/opennl/superlu/xerbla.c b/intern/opennl/superlu/xerbla.c index cb94fa71d95..68cef9d84e4 100644 --- a/intern/opennl/superlu/xerbla.c +++ b/intern/opennl/superlu/xerbla.c @@ -1,5 +1,6 @@ #include +int xerbla_(char *, int *); /* Subroutine */ int xerbla_(char *srname, int *info) { -- cgit v1.2.3