--- ray/src/px/ra_xyze.c 2003/02/22 02:07:28 2.6 +++ ray/src/px/ra_xyze.c 2004/01/02 12:47:01 2.8 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: ra_xyze.c,v 2.6 2003/02/22 02:07:28 greg Exp $"; +static const char RCSid[] = "$Id: ra_xyze.c,v 2.8 2004/01/02 12:47:01 schorsch Exp $"; #endif /* * Program to convert between RADIANCE RGBE and XYZE formats @@ -10,13 +10,11 @@ static const char RCSid[] = "$Id: ra_xyze.c,v 2.6 2003 #include #include #include + +#include "platform.h" #include "color.h" #include "resolu.h" -#ifdef MSDOS -#include -#endif - int rgbinp = -1; /* input is RGBE? */ int rgbout = 0; /* output should be RGBE? */ @@ -31,10 +29,14 @@ int doflat = -1; /* produce flat file? */ char *progname; +static gethfunc headline; -int -headline(s) /* process header line */ -char *s; + +static int +headline( /* process header line */ + char *s, + void *p +) { char fmt[32]; @@ -61,12 +63,9 @@ int argc; char *argv[]; { int i; -#ifdef MSDOS - extern int _fmode; - _fmode = O_BINARY; - setmode(fileno(stdin), O_BINARY); - setmode(fileno(stdout), O_BINARY); -#endif + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); progname = argv[0]; for (i = 1; i < argc; i++)