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/imbuf/intern/cspace.c | |
| 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/imbuf/intern/cspace.c')
| -rw-r--r-- | source/blender/imbuf/intern/cspace.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/cspace.c b/source/blender/imbuf/intern/cspace.c index ef2f78644d5..4fbfeb9c3c7 100644 --- a/source/blender/imbuf/intern/cspace.c +++ b/source/blender/imbuf/intern/cspace.c @@ -60,9 +60,9 @@ static void fillmattab(double val, unsigned short *mattab) } -static void cspfill(short *buf, short *fill, int x) +static void cspfill(short *buf, unsigned short *fill, int x) { - short r,g,b; + unsigned short r,g,b; b = fill[0]; g = fill[1]; @@ -76,7 +76,7 @@ static void cspfill(short *buf, short *fill, int x) } -static void cspadd(short *buf, short *cont, unsigned char *rect, int x) +static void cspadd(short *buf, unsigned short *cont, unsigned char *rect, int x) { short i; for (;x>0;x--){ @@ -120,7 +120,7 @@ static void cspret(short *buf, unsigned char *rect, int x) } -static void rotcspace(struct ImBuf *ibuf, short *cont_1, short *cont_2, short *cont_3, short *add) +static void rotcspace(struct ImBuf *ibuf, unsigned short *cont_1, unsigned short *cont_2, unsigned short *cont_3, unsigned short *add) { short x,y,*buf; uchar *rect; @@ -145,11 +145,11 @@ static void rotcspace(struct ImBuf *ibuf, short *cont_1, short *cont_2, short *c void IMB_cspace(struct ImBuf *ibuf, float mat[][4]) { - short *cont_1,*cont_2,*cont_3,add[3]; + unsigned short *cont_1,*cont_2,*cont_3,add[3]; - cont_1=(short *)malloc(256*3*sizeof(short)); - cont_2=(short *)malloc(256*3*sizeof(short)); - cont_3=(short *)malloc(256*3*sizeof(short)); + cont_1=(unsigned short *)malloc(256*3*sizeof(short)); + cont_2=(unsigned short *)malloc(256*3*sizeof(short)); + cont_3=(unsigned short *)malloc(256*3*sizeof(short)); if (cont_1 && cont_2 && cont_3){ |