sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

a bunch of small warnings fixes:

Browse Source 
newline missing at end of file fixes:
TypedConstraint.h WheelInfo.h RaycastVehicle.h VehicleRaycaster.h
CcdPhysicsEnvironment.cpp

radiance_hdr.c fixed the following warning by changing type of local variable:
radiance_hdr.c:357: warning: pointer targets in passing argument 3 of
‘fwritecol rs’ differ in signedness

edgeRender.c,edgeRender.h same thing changed type of local vars to get rid
of warnings about signedness

RAS_OpenGLRasterizer.cpp removed unused variable unit line 1295

Kent
This commit is contained in:
Kent Mein 2006-03-24 16:40:32 +00:00
parent 21c9ee54ca
commit 97a4e4f88d
10 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h vendored
View File

@ -50,4 +50,5 @@ m_userConstraintType(-1)
} }
}; };
#endif //TYPED_CONSTRAINT_H #endif //TYPED_CONSTRAINT_H

3
extern/bullet/BulletDynamics/Vehicle/RaycastVehicle.h vendored
View File

@ -145,4 +145,5 @@ public:
}; };
#endif //RAYCASTVEHICLE_H #endif //RAYCASTVEHICLE_H

3
extern/bullet/BulletDynamics/Vehicle/VehicleRaycaster.h vendored
View File

@ -28,4 +28,5 @@ struct VehicleRaycaster
}; };
#endif //VEHICLE_RAYCASTER_H #endif //VEHICLE_RAYCASTER_H

3
extern/bullet/BulletDynamics/Vehicle/WheelInfo.h vendored
View File

@ -112,4 +112,5 @@ struct WheelInfo
}; };
#endif //WHEEL_INFO_H #endif //WHEEL_INFO_H

3
extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp vendored
View File

@ -1226,4 +1226,5 @@ PHY_IVehicle* CcdPhysicsEnvironment::getVehicleConstraint(int constraintId)
return 0; return 0;
} }
#endif //NEW_BULLET_VEHICLE_SUPPORT #endif //NEW_BULLET_VEHICLE_SUPPORT

4
source/blender/imbuf/intern/radiance_hdr.c
View File

@ -342,14 +342,14 @@ short imb_savehdr(struct ImBuf *ibuf, char *name, int flags)
FILE* file = fopen(name, "wb"); FILE* file = fopen(name, "wb");
float *fp= NULL; float *fp= NULL;
int y, width=ibuf->x, height=ibuf->y; int y, width=ibuf->x, height=ibuf->y;
char *cp= NULL; unsigned char *cp= NULL;
if (file==NULL) return 0; if (file==NULL) return 0;
writeHeader(file, width, height); writeHeader(file, width, height);
if(ibuf->rect) if(ibuf->rect)
cp= (char *)(ibuf->rect + (height-1)*width); cp= (unsigned char *)(ibuf->rect + (height-1)*width);
if(ibuf->rect_float) if(ibuf->rect_float)
fp= ibuf->rect_float + 4*(height-1)*width; fp= ibuf->rect_float + 4*(height-1)*width;

2
source/blender/render/intern/include/edgeRender.h
View File

@ -44,7 +44,7 @@
*/ */
void void
addEdges( addEdges(
char * targetbuf, unsigned char * targetbuf,
int iw, int iw,
int ih, int ih,
int osanr, int osanr,

18
source/blender/render/intern/source/edgeRender.c
View File

@ -80,7 +80,7 @@ extern struct Render R;
static Material** matBuffer; /* buffer with material indices */ static Material** matBuffer; /* buffer with material indices */
static Material* mat_cache; /* material of the face being buffered */ static Material* mat_cache; /* material of the face being buffered */
static char* colBuffer; /* buffer with colour correction */ static unsigned char* colBuffer; /* buffer with colour correction */
static int *edgeBuffer; /* buffer with distances */ static int *edgeBuffer; /* buffer with distances */
static int bufWidth; /* x-dimension of the buffer */ static int bufWidth; /* x-dimension of the buffer */
static int bufHeight; /* y-dimension of the buffer */ static int bufHeight; /* y-dimension of the buffer */
@ -125,7 +125,7 @@ static void insertInEdgeBuffer(int x, int y, int dist);
* Renders enhanced edges. Distances from distRect are used to * Renders enhanced edges. Distances from distRect are used to
* determine a correction on colourRect * determine a correction on colourRect
*/ */
static void renderEdges(char * colourRect); static void renderEdges(unsigned char * colourRect);
/** /**
* Buffer an edge between these two vertices in the e.r. distance buffer. * Buffer an edge between these two vertices in the e.r. distance buffer.
@ -140,7 +140,7 @@ static void fillEdgeRenderFace(struct ZSpan *zspan, int, float *v1, float *v2, f
/** /**
* Compose the edge render colour buffer. * Compose the edge render colour buffer.
*/ */
static void calcEdgeRenderColBuf(char * tarbuf); static void calcEdgeRenderColBuf(unsigned char * tarbuf);
/** /**
* Loop over all objects that need to be edge rendered. This loop determines * Loop over all objects that need to be edge rendered. This loop determines
@ -156,7 +156,7 @@ static void addEdgeOver(unsigned char *dst, unsigned char *src);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* this is main call! */ /* this is main call! */
void addEdges(char * targetbuf, int iw, int ih, int osanr, void addEdges(unsigned char * targetbuf, int iw, int ih, int osanr,
short int intens, short int intens_redux, int compat, int mode, float r, float g, float b) short int intens, short int intens_redux, int compat, int mode, float r, float g, float b)
{ {
float rf, gf ,bf; float rf, gf ,bf;
@ -192,7 +192,7 @@ void addEdges(char * targetbuf, int iw, int ih, int osanr,
static void initEdgeRenderBuffer() static void initEdgeRenderBuffer()
{ {
char *ptr; unsigned char *ptr;
int i; int i;
maskBorder = 1; /* for 3 by 3 mask*/ maskBorder = 1; /* for 3 by 3 mask*/
@ -207,7 +207,7 @@ static void initEdgeRenderBuffer()
} }
edgeBuffer = MEM_callocN(sizeof(int) * bufWidth * bufHeight, "edgeBuffer"); edgeBuffer = MEM_callocN(sizeof(int) * bufWidth * bufHeight, "edgeBuffer");
colBuffer = MEM_callocN(sizeof(char) * 4 * imWidth * imHeight, "colBuffer"); colBuffer = MEM_callocN(sizeof(unsigned char) * 4 * imWidth * imHeight, "colBuffer");
if ((edgeR != 0) || (edgeG != 0) || (edgeB != 0)) { if ((edgeR != 0) || (edgeG != 0) || (edgeB != 0)) {
@ -265,7 +265,7 @@ static void insertInEdgeBuffer(int x, int y, int dist)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* Modelled after rendercore.c/edge_enhance() */ /* Modelled after rendercore.c/edge_enhance() */
static void renderEdges(char *colourRect) static void renderEdges(unsigned char *colourRect)
{ {
/* use zbuffer to define edges, add it to the image */ /* use zbuffer to define edges, add it to the image */
int val, y, x, col, *rz, *rz1, *rz2, *rz3; int val, y, x, col, *rz, *rz1, *rz2, *rz3;
@ -276,7 +276,7 @@ static void renderEdges(char *colourRect)
* under the mask are the same, non-0 otherwise*/ * under the mask are the same, non-0 otherwise*/
int *matptr_low = 0, *matptr_cent = 0, *matptr_high = 0; int *matptr_low = 0, *matptr_cent = 0, *matptr_high = 0;
int matdiffac = 0; int matdiffac = 0;
char *cp; unsigned char *cp;
#ifdef RE_EDGERENDER_NO_CORRECTION #ifdef RE_EDGERENDER_NO_CORRECTION
return; /* no edge correction */ return; /* no edge correction */
@ -513,7 +513,7 @@ static void addEdgeOver(unsigned char *dst, unsigned char *src)
dst[2] = c; dst[2] = c;
} }
static void calcEdgeRenderColBuf(char* colTargetBuffer) static void calcEdgeRenderColBuf(unsigned char *colTargetBuffer)
{ {
int keepLooping = 1; int keepLooping = 1;
int sample; int sample;

3
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -1308,4 +1308,5 @@ PHY_IVehicle* CcdPhysicsEnvironment::getVehicleConstraint(int constraintId)
return 0; return 0;
} }
#endif //NEW_BULLET_VEHICLE_SUPPORT #endif //NEW_BULLET_VEHICLE_SUPPORT

1
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -1292,7 +1292,6 @@ void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
const KX_IndexArray & indexarray = (*indexarrays[vt]); const KX_IndexArray & indexarray = (*indexarrays[vt]);
numindices = indexarray.size(); numindices = indexarray.size();
const unsigned int enabled = polymat->GetEnabled(); const unsigned int enabled = polymat->GetEnabled();
unsigned int unit;
if (!numindices) if (!numindices)
break; break;