--- ray/src/px/ra_bn.c 1991/12/19 14:52:07 2.2 +++ ray/src/px/ra_bn.c 2003/06/05 19:29:34 2.8 @@ -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_bn.c,v 2.8 2003/06/05 19:29:34 schorsch Exp $"; #endif - /* * ra_bn.c - program to convert between RADIANCE and barneyscan picture format. * @@ -11,15 +8,15 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include +#include +#include +#include "platform.h" #include "color.h" - #include "resolu.h" -extern double pow(); +double gamcor = 2.0; /* gamma correction */ -double gamma = 2.0; /* gamma correction */ - int bradj = 0; /* brightness adjustment */ char *progname; @@ -37,14 +34,16 @@ char *argv[]; { int reverse = 0; int i; - + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); progname = argv[0]; for (i = 1; i < argc; i++) if (argv[i][0] == '-') switch (argv[i][1]) { case 'g': - gamma = atof(argv[++i]); + gamcor = atof(argv[++i]); break; case 'r': reverse = !reverse; @@ -60,7 +59,7 @@ char *argv[]; else break; /* set gamma correction */ - setcolrgam(gamma); + setcolrgam(gamcor); if (reverse) { if (i > argc-1 || i < argc-2) @@ -77,6 +76,7 @@ char *argv[]; quiterr(errmsg); } /* put header */ + newheader("RADIANCE", stdout); printargs(i, argv, rafp); fputformat(COLRFMT, rafp); putc('\n', rafp); @@ -198,7 +198,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); } @@ -224,5 +224,5 @@ bn2ra() /* convert barneyscan to radiance */ if (fwritecolrs(outline, xmax, rafp) < 0) quiterr("error writing RADIANCE file"); } - free((char *)outline); + free((void *)outline); }