--- ray/src/px/pextrem.c 2003/02/22 02:07:27 2.5 +++ ray/src/px/pextrem.c 2019/07/19 17:37:56 2.14 @@ -1,16 +1,16 @@ #ifndef lint -static const char RCSid[] = "$Id: pextrem.c,v 2.5 2003/02/22 02:07:27 greg Exp $"; +static const char RCSid[] = "$Id: pextrem.c,v 2.14 2019/07/19 17:37:56 greg Exp $"; #endif /* * Find extrema points in a Radiance picture. */ -#include #include -#ifdef MSDOS -#include -#endif + +#include "rtio.h" +#include "platform.h" #include "color.h" +#include "resolu.h" int orig = 0; @@ -19,11 +19,16 @@ int wrongformat = 0; COLOR expos = WHTCOLOR; +static gethfunc headline; -headline(s) /* check header line */ -char *s; + +static int +headline( /* check header line */ + char *s, + void *p +) { - char fmt[32]; + char fmt[MAXFMTLEN]; double d; COLOR ctmp; @@ -44,9 +49,11 @@ char *s; } -main(argc, argv) -int argc; -char *argv[]; +int +main( + int argc, + char *argv[] +) { int i; int xres, yres; @@ -55,11 +62,8 @@ char *argv[]; COLR *scan; COLR cmin, cmax; int xmin, ymin, xmax, ymax; -#ifdef MSDOS - extern int _fmode; - _fmode = O_BINARY; - setmode(fileno(stdin), O_BINARY); -#endif + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); for (i = 1; i < argc; i++) /* get options */ if (!strcmp(argv[i], "-o")) orig++; @@ -81,8 +85,8 @@ char *argv[]; fprintf(stderr, "%s: out of memory\n", argv[0]); exit(1); } - setcolr(cmin, 1e10, 1e10, 1e10); - setcolr(cmax, 0., 0., 0.); + setcolr(cmin, 1e30, 1e30, 1e30); + setcolr(cmax, 0., 0., 0.); xmax=ymax=0; /* find extrema */ for (y = yres-1; y >= 0; y--) { if (freadcolrs(scan, xres, stdin) < 0) { @@ -107,11 +111,11 @@ char *argv[]; } } free((void *)scan); - printf("%d %d\t%e %e %e\n", xmin, ymin, + printf("%d %d\t%.2e %.2e %.2e\n", xmin, ymin, colrval(cmin,RED)/colval(expos,RED), colrval(cmin,GRN)/colval(expos,GRN), colrval(cmin,BLU)/colval(expos,BLU)); - printf("%d %d\t%e %e %e\n", xmax, ymax, + printf("%d %d\t%.2e %.2e %.2e\n", xmax, ymax, colrval(cmax,RED)/colval(expos,RED), colrval(cmax,GRN)/colval(expos,GRN), colrval(cmax,BLU)/colval(expos,BLU));