--- ray/src/px/pf3.c 2003/02/25 00:26:05 2.15 +++ ray/src/px/pf3.c 2003/07/27 22:12:03 2.17 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pf3.c,v 2.15 2003/02/25 00:26:05 greg Exp $"; +static const char RCSid[] = "$Id: pf3.c,v 2.17 2003/07/27 22:12:03 schorsch Exp $"; #endif /* * pf3.c - routines for gaussian and box filtering @@ -9,6 +9,8 @@ static const char RCSid[] = "$Id: pf3.c,v 2.15 2003/02 #include "standard.h" +#include + #include "color.h" #define RSCA 1.13 /* square-radius multiplier: sqrt(4/PI) */ @@ -99,7 +101,7 @@ initmask() /* initialize gaussian lookup table */ ringsum = (float *)malloc((orad+1)*sizeof(float)); ringwt = (short *)malloc((orad+1)*sizeof(short)); warr = (float *)malloc(obarsize*obarsize*sizeof(float)); - if (ringsum == NULL | ringwt == 0 | warr == NULL) + if ((ringsum == NULL) | (ringwt == 0) | (warr == NULL)) goto memerr; return; memerr: @@ -190,8 +192,8 @@ int ccent, rcent; register int c, x; register float *gscan; /* compute ring sums */ - bzero((char *)ringsum, (orad+1)*sizeof(float)); - bzero((char *)ringwt, (orad+1)*sizeof(short)); + memset((char *)ringsum, '\0', (orad+1)*sizeof(float)); + memset((char *)ringwt, '\0', (orad+1)*sizeof(short)); for (r = -orad; r <= orad; r++) { if (rcent+r < 0) continue; if (rcent+r >= nrows) break;