--- ray/src/rt/lookamb.c 1992/07/13 16:17:42 2.2 +++ ray/src/rt/lookamb.c 1994/02/27 10:17:33 2.6 @@ -12,19 +12,24 @@ static char SCCSid[] = "$SunId$ LBL"; #include +#ifdef MSDOS +#include +#endif + #include "color.h" #include "ambient.h" int dataonly = 0; - +int header = 1; int reverse = 0; AMBVAL av; main(argc, argv) /* load ambient values from a file */ +int argc; char *argv[]; { FILE *fp; @@ -39,6 +44,9 @@ char *argv[]; case 'r': reverse = 1; break; + case 'h': + header = 0; + break; default: fprintf(stderr, "%s: unknown option '%s'\n", argv[0], argv[i]); @@ -53,12 +61,40 @@ char *argv[]; fprintf(stderr, "%s: file not found\n", argv[i]); return(1); } - if (reverse) + if (reverse) { + if (header) { + if (checkheader(fp, "ascii", stdout) < 0) + goto formaterr; + } else { + newheader("RADIANCE", stdout); + printargs(argc, argv, stdout); + } + fputformat(AMBFMT, stdout); + putchar('\n'); +#ifdef MSDOS + setmode(fileno(stdout), O_BINARY); +#endif + putambmagic(stdout); writamb(fp); - else + } else { +#ifdef MSDOS + setmode(fileno(fp), O_BINARY); +#endif + if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0) + goto formaterr; + if (!hasambmagic(fp)) + goto formaterr; + if (header) { + fputformat("ascii", stdout); + putchar('\n'); + } lookamb(fp); + } fclose(fp); return(0); +formaterr: + fprintf(stderr, "%s: format error on input\n", argv[0]); + exit(1); }