--- ray/src/px/ra_pixar.c 1991/11/12 16:04:54 2.1 +++ ray/src/px/ra_pixar.c 2004/01/02 10:25:13 2.4 @@ -1,9 +1,6 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ra_pixar.c,v 2.4 2004/01/02 10:25:13 schorsch Exp $"; #endif - /* ra_pixar.c */ /* * convert from RADIANCE image file to PIXAR image file. (or vice versa) @@ -21,7 +18,9 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include +#include #include +#include /* PIXAR */ #include @@ -115,7 +114,7 @@ char *outfile; perror("malloc"); exit(1); } - bzero(pixar_scanline,width*sizeof(RGBAPixelType)); + memset(pixar_scanline, '\0', width*sizeof(RGBAPixelType)); PicSetForce(1); PicSetPsize(width,height); @@ -162,7 +161,7 @@ int *h; perror("open"); exit(1); } - getheader(radiance_fp,NULL); + getheader(radiance_fp,NULL,NULL); if (fgetresolu(w, h, radiance_fp) < 0) { fprintf(stderr,"bad RADIANCE format\n");