forked from bartvdbraak/blender
a bunch of small warnings fixes:
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:
parent
21c9ee54ca
commit
97a4e4f88d
@ -51,3 +51,4 @@ m_userConstraintType(-1)
|
||||
};
|
||||
|
||||
#endif //TYPED_CONSTRAINT_H
|
||||
|
||||
|
@ -146,3 +146,4 @@ public:
|
||||
};
|
||||
|
||||
#endif //RAYCASTVEHICLE_H
|
||||
|
||||
|
@ -29,3 +29,4 @@ struct VehicleRaycaster
|
||||
};
|
||||
|
||||
#endif //VEHICLE_RAYCASTER_H
|
||||
|
||||
|
@ -113,3 +113,4 @@ struct WheelInfo
|
||||
};
|
||||
|
||||
#endif //WHEEL_INFO_H
|
||||
|
||||
|
@ -1227,3 +1227,4 @@ PHY_IVehicle* CcdPhysicsEnvironment::getVehicleConstraint(int constraintId)
|
||||
}
|
||||
|
||||
#endif //NEW_BULLET_VEHICLE_SUPPORT
|
||||
|
||||
|
@ -342,14 +342,14 @@ short imb_savehdr(struct ImBuf *ibuf, char *name, int flags)
|
||||
FILE* file = fopen(name, "wb");
|
||||
float *fp= NULL;
|
||||
int y, width=ibuf->x, height=ibuf->y;
|
||||
char *cp= NULL;
|
||||
unsigned char *cp= NULL;
|
||||
|
||||
if (file==NULL) return 0;
|
||||
|
||||
writeHeader(file, width, height);
|
||||
|
||||
if(ibuf->rect)
|
||||
cp= (char *)(ibuf->rect + (height-1)*width);
|
||||
cp= (unsigned char *)(ibuf->rect + (height-1)*width);
|
||||
if(ibuf->rect_float)
|
||||
fp= ibuf->rect_float + 4*(height-1)*width;
|
||||
|
||||
|
@ -44,7 +44,7 @@
|
||||
*/
|
||||
void
|
||||
addEdges(
|
||||
char * targetbuf,
|
||||
unsigned char * targetbuf,
|
||||
int iw,
|
||||
int ih,
|
||||
int osanr,
|
||||
|
@ -80,7 +80,7 @@ extern struct Render R;
|
||||
static Material** matBuffer; /* buffer with material indices */
|
||||
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 bufWidth; /* x-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
|
||||
* 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.
|
||||
@ -140,7 +140,7 @@ static void fillEdgeRenderFace(struct ZSpan *zspan, int, float *v1, float *v2, f
|
||||
/**
|
||||
* 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
|
||||
@ -156,7 +156,7 @@ static void addEdgeOver(unsigned char *dst, unsigned char *src);
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/* 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)
|
||||
{
|
||||
float rf, gf ,bf;
|
||||
@ -192,7 +192,7 @@ void addEdges(char * targetbuf, int iw, int ih, int osanr,
|
||||
|
||||
static void initEdgeRenderBuffer()
|
||||
{
|
||||
char *ptr;
|
||||
unsigned char *ptr;
|
||||
int i;
|
||||
|
||||
maskBorder = 1; /* for 3 by 3 mask*/
|
||||
@ -207,7 +207,7 @@ static void initEdgeRenderBuffer()
|
||||
}
|
||||
|
||||
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)) {
|
||||
@ -265,7 +265,7 @@ static void insertInEdgeBuffer(int x, int y, int dist)
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* 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 */
|
||||
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*/
|
||||
int *matptr_low = 0, *matptr_cent = 0, *matptr_high = 0;
|
||||
int matdiffac = 0;
|
||||
char *cp;
|
||||
unsigned char *cp;
|
||||
|
||||
#ifdef RE_EDGERENDER_NO_CORRECTION
|
||||
return; /* no edge correction */
|
||||
@ -513,7 +513,7 @@ static void addEdgeOver(unsigned char *dst, unsigned char *src)
|
||||
dst[2] = c;
|
||||
}
|
||||
|
||||
static void calcEdgeRenderColBuf(char* colTargetBuffer)
|
||||
static void calcEdgeRenderColBuf(unsigned char *colTargetBuffer)
|
||||
{
|
||||
int keepLooping = 1;
|
||||
int sample;
|
||||
|
@ -1309,3 +1309,4 @@ PHY_IVehicle* CcdPhysicsEnvironment::getVehicleConstraint(int constraintId)
|
||||
}
|
||||
|
||||
#endif //NEW_BULLET_VEHICLE_SUPPORT
|
||||
|
||||
|
@ -1292,7 +1292,6 @@ void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
|
||||
const KX_IndexArray & indexarray = (*indexarrays[vt]);
|
||||
numindices = indexarray.size();
|
||||
const unsigned int enabled = polymat->GetEnabled();
|
||||
unsigned int unit;
|
||||
|
||||
if (!numindices)
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user