--- ray/src/px/ra_bn.c 1994/02/27 10:17:10 2.6 +++ ray/src/px/ra_bn.c 2003/02/22 02:07:27 2.7 @@ -1,9 +1,6 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ra_bn.c,v 2.7 2003/02/22 02:07:27 greg Exp $"; #endif - /* * ra_bn.c - program to convert between RADIANCE and barneyscan picture format. * @@ -16,14 +13,14 @@ static char SCCSid[] = "$SunId$ LBL"; #include #endif +#include + #include #include "color.h" #include "resolu.h" -extern char *malloc(); - double gamcor = 2.0; /* gamma correction */ int bradj = 0; /* brightness adjustment */ @@ -210,7 +207,7 @@ ra2bn() /* convert radiance to barneyscan */ if (ferror(bnfp[0]) || ferror(bnfp[1]) || ferror(bnfp[2])) quiterr("error writing Barney files"); } - free((char *)inl); + free((void *)inl); } @@ -236,5 +233,5 @@ bn2ra() /* convert barneyscan to radiance */ if (fwritecolrs(outline, xmax, rafp) < 0) quiterr("error writing RADIANCE file"); } - free((char *)outline); + free((void *)outline); }