From 7811d7209a9ebb207979269c764831ef818521b5 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Wed, 27 Apr 2005 11:52:50 +0000 Subject: 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 --- source/blender/imbuf/intern/iris.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/imbuf/intern/iris.c') diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 78263daa2f5..20aa9d75fd2 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -238,7 +238,7 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) unsigned int *base, *lptr = NULL; unsigned int *zbase, *zptr; unsigned char *rledat; - int *starttab, *lengthtab; + unsigned int *starttab, *lengthtab; FILE *inf = NULL; IMAGE image; int x, y, z, tablen; @@ -277,8 +277,8 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) if (rle) { tablen = ysize*zsize*sizeof(int); - starttab = (int *)malloc(tablen); - lengthtab = (int *)malloc(tablen); + starttab = (unsigned int *)malloc(tablen); + lengthtab = (unsigned int *)malloc(tablen); file_offset = 512; readtab(inf,starttab,tablen); @@ -482,7 +482,7 @@ static int output_iris(unsigned int *lptr, int xsize, int ysize, int zsize, char FILE *outf; IMAGE *image; int tablen, y, z, pos, len = 0; - int *starttab, *lengthtab; + unsigned int *starttab, *lengthtab; unsigned char *rlebuf; unsigned int *lumbuf; int rlebuflen, goodwrite; @@ -494,8 +494,8 @@ static int output_iris(unsigned int *lptr, int xsize, int ysize, int zsize, char tablen = ysize*zsize*sizeof(int); image = (IMAGE *)malloc(sizeof(IMAGE)); - starttab = (int *)malloc(tablen); - lengthtab = (int *)malloc(tablen); + starttab = (unsigned int *)malloc(tablen); + lengthtab = (unsigned int *)malloc(tablen); rlebuflen = 1.05*xsize+10; rlebuf = (unsigned char *)malloc(rlebuflen); lumbuf = (unsigned int *)malloc(xsize*sizeof(int)); -- cgit v1.2.3