diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-04-27 15:52:50 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-04-27 15:52:50 +0400 |
| commit | 7811d7209a9ebb207979269c764831ef818521b5 (patch) | |
| tree | 74504d69828bf671f179296b4ed86cff0e13cf5b /source/blender/render/intern | |
| parent | e79db85cc18d378fc2dc6d30f0fb69d04e066f68 (diff) | |
Bunch of gcc 4.0 warning fixes.
source/creator/creator.c
changed ifdef's around fpe_handler to match when its actually used.
intern/SoundSystem/intern/SND_AudioDevice.cpp
Changed: SND_SoundObject* oldobject = oldobject = pIdObject->GetSoundObject();
to: SND_SoundObject* oldobject = pIdObject->GetSoundObject();
intern/SoundSystem/openal/SND_OpenALDevice.cpp
removed unused var.
source/blender/blenkernel/intern/mball.c
initalized a couple of vars that might have been used uninitalized.
The rest were changing types to match, most of them were something like
was short * should have been unsigned short *.
Kent
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/edgeRender.c | 6 | ||||
| -rw-r--r-- | source/blender/render/intern/source/zblur.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/edgeRender.c b/source/blender/render/intern/source/edgeRender.c index 2181224871b..f065e3bfd7b 100644 --- a/source/blender/render/intern/source/edgeRender.c +++ b/source/blender/render/intern/source/edgeRender.c @@ -68,10 +68,6 @@ #include "zbuf.h" /* for zbufclipwire and zbufclip */ #include "jitter.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef RE_EDGERENDERSAFE char edgeRender_h[] = EDGERENDER_H; char edgeRender_c[] = "$Id$"; @@ -574,7 +570,7 @@ void calcEdgeRenderColBuf(char* colTargetBuffer) /* correction for osa-sampling...*/ if( osaCount != 1) { - char *rp, *rt; + unsigned char *rp, *rt; int a; rt= colTargetBuffer; diff --git a/source/blender/render/intern/source/zblur.c b/source/blender/render/intern/source/zblur.c index 5432e78b144..67624d97ef4 100644 --- a/source/blender/render/intern/source/zblur.c +++ b/source/blender/render/intern/source/zblur.c @@ -118,7 +118,7 @@ static int free_img(Image *img) } /* 32 bits (int) rect to float buf */ -static void recti2imgf(int *src, Image *dest, int x, int y) +static void recti2imgf(unsigned int *src, Image *dest, int x, int y) { char *from; float *to; @@ -192,7 +192,7 @@ static void rectf2imgf(float *src, Image *dest, int x, int y) } /* floatbuf back to 32 bits rect */ -static void imgf2recti(Image *src, int *dest) +static void imgf2recti(Image *src, unsigned int *dest) { float *from; char *to; |