--- ray/src/px/pcompos.c 1998/10/27 09:08:25 2.20 +++ ray/src/px/pcompos.c 2003/02/22 02:07:27 2.21 @@ -1,9 +1,6 @@ -/* Copyright (c) 1993 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: pcompos.c,v 2.21 2003/02/22 02:07:27 greg Exp $"; #endif - /* * pcompos.c - program to composite pictures. * @@ -18,6 +15,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include #endif +#include + #include "color.h" #include "resolu.h" @@ -61,11 +60,10 @@ int nfile; /* number of files */ char ourfmt[LPICFMT+1] = PICFMT; int wrongformat = 0; -FILE *popen(), *lblopen(); +FILE *lblopen(); +void quit(); -extern char *malloc(); - tabputs(s) /* print line preceded by a tab */ char *s; { @@ -151,6 +149,7 @@ char *argv[]; } dofiles: newheader("RADIANCE", stdout); + fputnow(stdout); for (nfile = 0; an < argc; nfile++) { if (nfile >= MAXFILE) goto toomany; @@ -228,7 +227,7 @@ getfile: printf("%s:\n", input[nfile].name); getheader(input[nfile].fp, tabputs, NULL); if (wrongformat) { - fprintf(stderr, "%s: bad Radiance input file\n", + fprintf(stderr, "%s: incompatible input format\n", input[nfile].name); quit(1); } @@ -416,6 +415,7 @@ err: } +void quit(code) /* exit gracefully */ int code; {