From 97a4e4f88df116997cb49682886e696c5ebd7dd0 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Fri, 24 Mar 2006 16:40:32 +0000 Subject: [PATCH] a bunch of small warnings fixes: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../ConstraintSolver/TypedConstraint.h | 3 ++- .../BulletDynamics/Vehicle/RaycastVehicle.h | 3 ++- .../BulletDynamics/Vehicle/VehicleRaycaster.h | 3 ++- .../bullet/BulletDynamics/Vehicle/WheelInfo.h | 3 ++- .../CcdPhysics/CcdPhysicsEnvironment.cpp | 3 ++- source/blender/imbuf/intern/radiance_hdr.c | 4 ++-- .../blender/render/intern/include/edgeRender.h | 2 +- .../blender/render/intern/source/edgeRender.c | 18 +++++++++--------- .../Physics/Bullet/CcdPhysicsEnvironment.cpp | 3 ++- .../RAS_OpenGLRasterizer.cpp | 1 - 10 files changed, 24 insertions(+), 19 deletions(-) diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h b/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h index a774af6d73a..632b5d51930 100755 --- a/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h +++ b/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h @@ -50,4 +50,5 @@ m_userConstraintType(-1) } }; -#endif //TYPED_CONSTRAINT_H \ No newline at end of file +#endif //TYPED_CONSTRAINT_H + diff --git a/extern/bullet/BulletDynamics/Vehicle/RaycastVehicle.h b/extern/bullet/BulletDynamics/Vehicle/RaycastVehicle.h index dde97934524..d3a8d2dff57 100755 --- a/extern/bullet/BulletDynamics/Vehicle/RaycastVehicle.h +++ b/extern/bullet/BulletDynamics/Vehicle/RaycastVehicle.h @@ -145,4 +145,5 @@ public: }; -#endif //RAYCASTVEHICLE_H \ No newline at end of file +#endif //RAYCASTVEHICLE_H + diff --git a/extern/bullet/BulletDynamics/Vehicle/VehicleRaycaster.h b/extern/bullet/BulletDynamics/Vehicle/VehicleRaycaster.h index 12119700120..ddbb02e31bd 100755 --- a/extern/bullet/BulletDynamics/Vehicle/VehicleRaycaster.h +++ b/extern/bullet/BulletDynamics/Vehicle/VehicleRaycaster.h @@ -28,4 +28,5 @@ struct VehicleRaycaster }; -#endif //VEHICLE_RAYCASTER_H \ No newline at end of file +#endif //VEHICLE_RAYCASTER_H + diff --git a/extern/bullet/BulletDynamics/Vehicle/WheelInfo.h b/extern/bullet/BulletDynamics/Vehicle/WheelInfo.h index 61687f58b3a..5d7c70c1e06 100755 --- a/extern/bullet/BulletDynamics/Vehicle/WheelInfo.h +++ b/extern/bullet/BulletDynamics/Vehicle/WheelInfo.h @@ -112,4 +112,5 @@ struct WheelInfo }; -#endif //WHEEL_INFO_H \ No newline at end of file +#endif //WHEEL_INFO_H + diff --git a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp index 2e464e9114c..8c596040a36 100644 --- a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp +++ b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp @@ -1226,4 +1226,5 @@ PHY_IVehicle* CcdPhysicsEnvironment::getVehicleConstraint(int constraintId) return 0; } -#endif //NEW_BULLET_VEHICLE_SUPPORT \ No newline at end of file +#endif //NEW_BULLET_VEHICLE_SUPPORT + diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index bd2d41881db..75be790a4cc 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -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; diff --git a/source/blender/render/intern/include/edgeRender.h b/source/blender/render/intern/include/edgeRender.h index 4d75d812711..ef11fdf9de2 100644 --- a/source/blender/render/intern/include/edgeRender.h +++ b/source/blender/render/intern/include/edgeRender.h @@ -44,7 +44,7 @@ */ void addEdges( - char * targetbuf, + unsigned char * targetbuf, int iw, int ih, int osanr, diff --git a/source/blender/render/intern/source/edgeRender.c b/source/blender/render/intern/source/edgeRender.c index f364272495e..5dc8ed9b16b 100644 --- a/source/blender/render/intern/source/edgeRender.c +++ b/source/blender/render/intern/source/edgeRender.c @@ -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; diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 7bc2eb73cbc..995fbb2a1e8 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -1308,4 +1308,5 @@ PHY_IVehicle* CcdPhysicsEnvironment::getVehicleConstraint(int constraintId) return 0; } -#endif //NEW_BULLET_VEHICLE_SUPPORT \ No newline at end of file +#endif //NEW_BULLET_VEHICLE_SUPPORT + diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 794562675ad..a576205b87c 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -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;