griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

big warning hunt commit

Browse Source 
lot of casts, added prototypes, missing includes and some true errors
This commit is contained in:
Jean-Luc Peurière
2005-03-09 19:45:59 +00:00
parent 77d44e88e9
commit c78e44cdc5
195 changed files with 739 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/python/api2_2x/Blender.c
View File

@@ -79,6 +79,9 @@ static PyObject *Blender_Load( PyObject * self, PyObject * args );
static PyObject *Blender_Save( PyObject * self, PyObject * args );
static PyObject *Blender_UpdateMenus( PyObject * self);
extern PyObject *Text3d_Init( void ); /* missing in some include */
/*****************************************************************************/
/* The following string definitions are used for documentation strings. */
/* In Python these will be written to the console when doing a */

8
source/blender/python/api2_2x/Bone.c
View File

@@ -233,7 +233,7 @@ PyObject *Bone_Init( void )
//--------------- Bone module internal callbacks-----------------
//--------------- updatePyBone------------------------------------
int updatePyBone( BPy_Bone * self )
static int updatePyBone( BPy_Bone * self )
{
int x, y;
char *parent_str = "";
@@ -1691,7 +1691,7 @@ static PyObject *Bone_getRestMatrix( BPy_Bone * self, PyObject * args )
//use python vars
if( BLI_streq( local, worldspace ) ) {
VecSubf( delta, self->tail->vec, self->head->vec );
make_boneMatrixvr( *( ( MatrixObject * ) matrix )->
make_boneMatrixvr( (float ( * )[4]) *( ( MatrixObject * ) matrix )->
matrix, delta, self->roll );
} else if( BLI_streq( local, bonespace ) ) {
return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
@@ -1701,12 +1701,12 @@ static PyObject *Bone_getRestMatrix( BPy_Bone * self, PyObject * args )
//use bone datastruct
if( BLI_streq( local, worldspace ) ) {
get_objectspace_bone_matrix( self->bone,
*( ( MatrixObject * )
( float ( * )[4] ) *( ( MatrixObject * )
matrix )->matrix, 1,
1 );
} else if( BLI_streq( local, bonespace ) ) {
VecSubf( delta, self->bone->tail, self->bone->head );
make_boneMatrixvr( *( ( MatrixObject * ) matrix )->
make_boneMatrixvr( (float ( * )[4]) *( ( MatrixObject * ) matrix )->
matrix, delta, self->bone->roll );
if( self->bone->parent ) {
get_bone_root_pos( self->bone, root, 1 );

3
source/blender/python/api2_2x/Build.c
View File

@@ -43,6 +43,9 @@
#include <stdio.h>
/* prototypes */
PyObject *Build_Init( void );
/*****************************************************************************/
/* Python BPy_Build methods table: */
/*****************************************************************************/

3
source/blender/python/api2_2x/Camera.c
View File

@@ -120,6 +120,9 @@ static PyObject *Camera_getScriptLinks( BPy_Camera * self, PyObject * args );
static PyObject *Camera_addScriptLink( BPy_Camera * self, PyObject * args );
static PyObject *Camera_clearScriptLinks( BPy_Camera * self );
Camera *GetCameraByName( char *name );
/*****************************************************************************/
/* Python BPy_Camera methods table: */
/*****************************************************************************/

22
source/blender/python/api2_2x/Ipo.c
View File

@@ -456,7 +456,7 @@ static PyObject *Ipo_getNcurves( BPy_Ipo * self )
stiv 6-jan-2004
*/
int Ipo_laIcuName( char *s, int *param )
static int Ipo_laIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "Energy" ) ) {
@@ -502,7 +502,7 @@ int Ipo_laIcuName( char *s, int *param )
return ok;
}
int Ipo_woIcuName( char *s, int *param )
static int Ipo_woIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "HorR" ) ) {
@@ -572,7 +572,7 @@ int Ipo_woIcuName( char *s, int *param )
return ok;
}
int Ipo_maIcuName( char *s, int *param )
static int Ipo_maIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "R" ) ) {
@@ -682,7 +682,7 @@ int Ipo_maIcuName( char *s, int *param )
return ok;
}
int Ipo_keIcuName( char *s, int *param )
static int Ipo_keIcuName( char *s, int *param )
{
char key[10];
int ok = 0;
@@ -703,7 +703,7 @@ int Ipo_keIcuName( char *s, int *param )
return ok;
}
int Ipo_seqIcuName( char *s, int *param )
static int Ipo_seqIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "Fac" ) ) {
@@ -714,7 +714,7 @@ int Ipo_seqIcuName( char *s, int *param )
return ok;
}
int Ipo_cuIcuName( char *s, int *param )
static int Ipo_cuIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "Speed" ) ) {
@@ -725,7 +725,7 @@ int Ipo_cuIcuName( char *s, int *param )
return ok;
}
int Ipo_coIcuName( char *s, int *param )
static int Ipo_coIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "Inf" ) ) {
@@ -736,7 +736,7 @@ int Ipo_coIcuName( char *s, int *param )
return ok;
}
int Ipo_acIcuName( char *s, int *param )
static int Ipo_acIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "LocX" ) ) {
@@ -782,7 +782,7 @@ int Ipo_acIcuName( char *s, int *param )
return ok;
}
int Ipo_caIcuName( char *s, int *param )
static int Ipo_caIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "Lens" ) ) {
@@ -800,7 +800,7 @@ int Ipo_caIcuName( char *s, int *param )
return ok;
}
int Ipo_texIcuName( char *s, int *param )
static int Ipo_texIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "NSize" ) ) {
@@ -891,7 +891,7 @@ int Ipo_texIcuName( char *s, int *param )
return ok;
}
int Ipo_obIcuName( char *s, int *param )
static int Ipo_obIcuName( char *s, int *param )
{
int ok = 0;
if( !strcmp( s, "LocX" ) ) {

4
source/blender/python/api2_2x/Library.c
View File

@@ -65,6 +65,10 @@ static PyObject *M_Library_Datablocks( PyObject * self, PyObject * args );
static PyObject *M_Library_Load( PyObject * self, PyObject * args );
static PyObject *M_Library_LinkableGroups( PyObject * self );
PyObject *Library_Init( void );
void EXPP_Library_Close( void );
/**
* Module doc strings.
*/

4
source/blender/python/api2_2x/Material.c
View File

@@ -161,6 +161,10 @@ static PyObject *M_Material_New( PyObject * self, PyObject * args,
PyObject * keywords );
static PyObject *M_Material_Get( PyObject * self, PyObject * args );
/* Not exposed nor used */
Material *GetMaterialByName( char *name );
/*****************************************************************************/
/* The following string definitions are used for documentation strings. */
/* In Python these will be written to the console when doing a */

4
source/blender/python/api2_2x/NMesh.c
View File

@@ -377,7 +377,7 @@ static int NMCol_setattr( PyObject * self, char *name, PyObject * v )
return 0;
}
PyObject *NMCol_repr( BPy_NMCol * self )
static PyObject *NMCol_repr( BPy_NMCol * self )
{
static char s[256];
sprintf( s, "[NMCol - <%d, %d, %d, %d>]", self->r, self->g, self->b,
@@ -2362,7 +2362,7 @@ static int check_validFaceUV( BPy_NMesh * nmesh )
}
/* this is a copy of unlink_mesh in mesh.c, because ... */
void EXPP_unlink_mesh( Mesh * me )
static void EXPP_unlink_mesh( Mesh * me )
{
int a;

6
source/blender/python/api2_2x/NMesh.h
View File

@@ -64,10 +64,10 @@ struct BPy_Object;
/* These are from blender/src/editdeform.c, should be declared elsewhere,
* maybe in BIF_editdeform.h, after proper testing of vgrouping methods XXX */
void create_dverts( Mesh * me );
void add_vert_defnr( Object * ob, int def_nr, int vertnum, float weight,
extern void create_dverts( Mesh * me );
extern void add_vert_defnr( Object * ob, int def_nr, int vertnum, float weight,
int assignmode );
void remove_vert_def_nr( Object * ob, int def_nr, int vertnum );
extern void remove_vert_def_nr( Object * ob, int def_nr, int vertnum );

4
source/blender/python/api2_2x/Noise.c
View File

@@ -59,6 +59,8 @@ static int left = 1;
static int initf = 0;
static unsigned long *next;
PyObject *Noise_Init(void);
/* initializes state[N] with a seed */
static void init_genrand( unsigned long s )
{
@@ -603,7 +605,7 @@ static PyMethodDef NoiseMethods[] = {
/*----------------------------------------------------------------------*/
PyObject *Noise_Init( )
PyObject *Noise_Init(void)
{
PyObject *NoiseTypes, *DistanceMetrics,
*md =

12
source/blender/python/api2_2x/Object.c
View File

@@ -63,6 +63,10 @@ static PyObject *M_Object_New( PyObject * self, PyObject * args );
PyObject *M_Object_Get( PyObject * self, PyObject * args );
static PyObject *M_Object_GetSelected( PyObject * self, PyObject * args );
extern int Text3d_CheckPyObject( PyObject * py_obj );
extern struct Text3d *Text3d_FromPyObject( PyObject * py_obj );
/*****************************************************************************/
/* The following string definitions are used for documentation strings. */
/* In Python these will be written to the console when doing a */
@@ -908,7 +912,7 @@ static PyObject *Object_getInverseMatrix( BPy_Object * self )
{
MatrixObject *inverse =
( MatrixObject * ) newMatrixObject( NULL, 4, 4 );
Mat4Invert( *inverse->matrix, self->object->obmat );
Mat4Invert( (float ( * )[4])*inverse->matrix, self->object->obmat );
return ( ( PyObject * ) inverse );
}
@@ -968,14 +972,14 @@ static PyObject *Object_getMatrix( BPy_Object * self, PyObject * args )
disable_where_script( 1 );
where_is_object( self->object );
disable_where_script( 0 );
Mat4CpyMat4( *( ( MatrixObject * ) matrix )->matrix,
Mat4CpyMat4((float ( * )[4]) *( ( MatrixObject * ) matrix )->matrix,
self->object->obmat );
} else if( BLI_streq( space, "localspace" ) ) { /* Localspace matrix */
object_to_mat4( self->object,
*( ( MatrixObject * ) matrix )->matrix );
( float ( * )[4] ) *( ( MatrixObject * ) matrix )->matrix );
/* old behavior, prior to 2.34, check this method's doc string: */
} else if( BLI_streq( space, "old_worldspace" ) ) {
Mat4CpyMat4( *( ( MatrixObject * ) matrix )->matrix,
Mat4CpyMat4( (float ( * )[4]) *( ( MatrixObject * ) matrix )->matrix,
self->object->obmat );
} else {
return ( EXPP_ReturnPyObjError( PyExc_RuntimeError,

3
source/blender/python/api2_2x/Particle.c
View File

@@ -124,6 +124,9 @@ static PyMethodDef BPy_Particle_methods[] = {
{NULL, NULL, 0, NULL}
};
/**************** prototypes ********************/
PyObject *Particle_Init( void );
/*****************************************************************************/
/* Python Particle_Type structure definition: */

9
source/blender/python/api2_2x/Sound.c
View File

@@ -153,9 +153,12 @@ static PyMethodDef BPy_Sound_methods[] = {
"() - play this sound"},
{"setCurrent", ( PyCFunction ) Sound_setCurrent, METH_NOARGS,
"() - make this the active sound in the sound buttons win (also redraws)"},
//{"reload", ( PyCFunction ) Sound_setCurrent, METH_NOARGS,
//"() - reload this Sound object's sample.\n\
//This is only useful if the original sound file has changed."},
/*
{"reload", ( PyCFunction ) Sound_setCurrent, METH_NOARGS,
"() - reload this Sound object's sample.\n\
This is only useful if the original sound file has changed."},
*/
SOUND_FLOAT_METHOD_FUNCS( Volume )
SOUND_FLOAT_METHOD_FUNCS( Attenuation )
SOUND_FLOAT_METHOD_FUNCS( Pitch )

1
source/blender/python/api2_2x/Sys.c
View File

@@ -37,6 +37,7 @@
#include <sys/stat.h>
#include "gen_utils.h"
#include "Sys.h"
/*****************************************************************************/
/* Python API function prototypes for the sys module. */

11
source/blender/python/api2_2x/Text3d.c
View File

@@ -34,6 +34,8 @@
#include "DNA_view3d_types.h"
#include "DNA_vfont_types.h"
#include "MEM_guardedalloc.h"
#include "BKE_object.h"
#include "BDR_editobject.h"
#include "BKE_displist.h"
@@ -140,8 +142,13 @@ struct PyMethodDef M_Text3d_methods[] = {
/*****************************************************************************/
/* Python BPy_Text3d methods declarations: */
/* extern prototypes */
/*****************************************************************************/
static PyObject *Text2Text3d( BPy_Text3d * self, PyObject * args );
/*static PyObject *Text2Text3d( BPy_Text3d * self, PyObject * args );*/ /*unused nor defined*/
extern void freedisplist(struct ListBase *lb);
extern VFont *get_builtin_font(void);
int Text3d_CheckPyObject( PyObject * py_obj );
struct Text3d *Text3d_FromPyObject( PyObject * py_obj );
/*
@@ -326,7 +333,7 @@ struct Text3d *Text3d_FromPyObject( PyObject * py_obj )
BPy_Text3d *blen_obj;
blen_obj = ( BPy_Text3d * ) py_obj;
return ((Text3d*) blen_obj->curve );
return ((struct Text3d*) blen_obj->curve );
}
static PyObject *Text3d_getName( BPy_Text3d * self )

2
source/blender/python/api2_2x/Wave.c
View File

@@ -33,6 +33,8 @@
#include "Wave.h"
#include "Effect.h"
/******* prototypes **********/
PyObject *Wave_Init( void );
/*****************************************************************************/
/* Python BPy_Wave methods table: */

2
source/blender/python/api2_2x/Window.c
View File

@@ -108,6 +108,8 @@ static PyObject *M_Window_GetScreens( PyObject * self );
static PyObject *M_Window_SetScreen( PyObject * self, PyObject * args );
static PyObject *M_Window_GetScreenInfo( PyObject * self, PyObject * args,
PyObject * kwords );
PyObject *Window_Init( void );
/*****************************************************************************/
/* The following string definitions are used for documentation strings. */

2
source/blender/python/api2_2x/logic.c
View File

@@ -150,7 +150,7 @@ int updateProperyData( BPy_Property * self )
}
//--------------- checkValidData_ptr--------------------------------
int checkValidData_ptr( BPy_Property * self )
static int checkValidData_ptr( BPy_Property * self )
{
int length;
//test pointer to see if data was removed (oops)

24
source/blender/python/api2_2x/matrix.c
View File

@@ -341,7 +341,7 @@ PyObject *Matrix_Invert( MatrixObject * self )
self->matrix[2][0], self->matrix[2][1],
self->matrix[2][2] );
} else if( self->rowSize == 4 ) {
det = Det4x4( *self->matrix );
det = Det4x4( (float ( * )[4]) *self->matrix );
} else {
return EXPP_ReturnPyObjError( PyExc_StandardError,
"error calculating determinant for inverse()\n" );
@@ -370,7 +370,7 @@ PyObject *Matrix_Invert( MatrixObject * self )
( PyExc_MemoryError,
"problem allocating mat\n\n" ) );
}
Mat3Adj( ( float ( * )[3] ) mat, *self->matrix );
Mat3Adj( ( float ( * )[3] ) mat,( float ( * )[3] ) *self->matrix );
} else if( self->rowSize == 4 ) {
mat = PyMem_Malloc( self->rowSize * self->colSize *
sizeof( float ) );
@@ -379,7 +379,7 @@ PyObject *Matrix_Invert( MatrixObject * self )
( PyExc_MemoryError,
"problem allocating mat\n\n" ) );
}
Mat4Adj( ( float ( * )[4] ) mat, *self->matrix );
Mat4Adj( ( float ( * )[4] ) mat, ( float ( * )[4] ) *self->matrix );
}
//divide by determinate
for( x = 0; x < ( self->rowSize * self->colSize ); x++ ) {
@@ -437,7 +437,7 @@ PyObject *Matrix_Determinant( MatrixObject * self )
self->matrix[2][0], self->matrix[2][1],
self->matrix[2][2] );
} else if( self->rowSize == 4 ) {
det = Det4x4( *self->matrix );
det = Det4x4( (float ( * )[4]) *self->matrix );
} else {
return EXPP_ReturnPyObjError( PyExc_StandardError,
"error in determinant()\n" );
@@ -458,9 +458,9 @@ PyObject *Matrix_Transpose( MatrixObject * self )
self->matrix[1][0] = self->matrix[0][1];
self->matrix[0][1] = t;
} else if( self->rowSize == 3 ) {
Mat3Transp( *self->matrix );
Mat3Transp( (float ( * )[3])*self->matrix );
} else if( self->rowSize == 4 ) {
Mat4Transp( *self->matrix );
Mat4Transp( (float ( * )[4])*self->matrix );
} else
return ( EXPP_ReturnPyObjError( PyExc_TypeError,
"unable to transpose matrix\n" ) );
@@ -492,9 +492,9 @@ PyObject *Matrix_Identity( MatrixObject * self )
self->matrix[1][0] = 0.0f;
self->matrix[1][1] = 1.0f;
} else if( self->rowSize == 3 ) {
Mat3One( *self->matrix );
Mat3One( ( float ( * )[3] ) *self->matrix );
} else if( self->rowSize == 4 ) {
Mat4One( *self->matrix );
Mat4One( ( float ( * )[4] ) *self->matrix );
} else
return ( EXPP_ReturnPyObjError( PyExc_TypeError,
"unable to create identity matrix\n" ) );
@@ -668,7 +668,7 @@ static int Matrix_len( MatrixObject * self )
return ( self->colSize * self->rowSize );
}
PyObject *Matrix_add( PyObject * m1, PyObject * m2 )
static PyObject *Matrix_add( PyObject * m1, PyObject * m2 )
{
float *mat;
int matSize, rowSize, colSize, x, y;
@@ -710,7 +710,7 @@ PyObject *Matrix_add( PyObject * m1, PyObject * m2 )
return newMatrixObject( mat, rowSize, colSize );
}
PyObject *Matrix_sub( PyObject * m1, PyObject * m2 )
static PyObject *Matrix_sub( PyObject * m1, PyObject * m2 )
{
float *mat;
int matSize, rowSize, colSize, x, y;
@@ -752,7 +752,7 @@ PyObject *Matrix_sub( PyObject * m1, PyObject * m2 )
return newMatrixObject( mat, rowSize, colSize );
}
PyObject *Matrix_mul( PyObject * m1, PyObject * m2 )
static PyObject *Matrix_mul( PyObject * m1, PyObject * m2 )
{
PyObject *retval;
int matSizeV, rowSizeV, colSizeV, rowSizeW, colSizeW, matSizeW, x, y,z;
@@ -830,7 +830,7 @@ PyObject *Matrix_mul( PyObject * m1, PyObject * m2 )
}
//coercion of unknown types to type MatrixObject for numeric protocols
int Matrix_coerce( PyObject ** m1, PyObject ** m2 )
static int Matrix_coerce( PyObject ** m1, PyObject ** m2 )
{
long *tempI;
double *tempF;

7
source/blender/python/api2_2x/quat.c
View File

@@ -64,6 +64,13 @@ struct PyMethodDef Quaternion_methods[] = {
{NULL, NULL, 0, NULL}
};
/* ****** prototypes ********** */
PyObject *Quaternion_add( PyObject * q1, PyObject * q2 );
PyObject *Quaternion_sub( PyObject * q1, PyObject * q2 );
PyObject *Quaternion_mul( PyObject * q1, PyObject * q2 );
int Quaternion_coerce( PyObject ** q1, PyObject ** q2 );
/*****************************/
// Quaternion Python Object
/*****************************/

2
source/blender/python/api2_2x/sceneRender.c
View File

@@ -893,7 +893,7 @@ PyObject *RenderData_Play( BPy_RenderData * self )
if( self->renderContext->imtype == R_QUICKTIME ) {
strcpy( file, self->renderContext->pic );
BLI_convertstringcode( file, self->scene,
BLI_convertstringcode( file, (char *) self->scene,
self->renderContext->cfra );
RE_make_existing_file( file );
if( strcasecmp( file + strlen( file ) - 4, ".mov" ) ) {

8
source/blender/python/api2_2x/vector.c
View File

@@ -55,6 +55,14 @@ struct PyMethodDef Vector_methods[] = {
{NULL, NULL, 0, NULL}
};
/******prototypes*************/
PyObject *Vector_add( PyObject * v1, PyObject * v2 );
PyObject *Vector_sub( PyObject * v1, PyObject * v2 );
PyObject *Vector_mul( PyObject * v1, PyObject * v2 );
PyObject *Vector_div( PyObject * v1, PyObject * v2 );
int Vector_coerce( PyObject ** v1, PyObject ** v2 );
/*****************************/
// Vector Python Object
/*****************************/