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/cspace.c | 16 ++++++++-------- source/blender/imbuf/intern/iris.c | 12 ++++++------ source/blender/imbuf/intern/readimage.c | 13 ++----------- 3 files changed, 16 insertions(+), 25 deletions(-) (limited to 'source/blender/imbuf') 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){ 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)); diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index bbb423fa2d2..4cae5cace16 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -119,17 +119,8 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { } } - /* let quicktime handle png's, skips error messages ;) - * but only on windows - */ -#ifdef _WIN32 - if(G.have_quicktime == FALSE) { -#else - if(1) { -#endif - ibuf = imb_loadpng((uchar *)mem, size, flags); - if (ibuf) return(ibuf); - } + ibuf = imb_loadpng((uchar *)mem, size, flags); + if (ibuf) return(ibuf); ibuf = imb_bmp_decode((uchar *)mem, size, flags); if (ibuf) return(ibuf); -- cgit v1.2.3