ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/pcompos.c
(Generate patch)

Comparing ray/src/px/pcompos.c (file contents):
Revision 2.18 by greg, Sun Feb 27 10:17:04 1994 UTC vs.
Revision 2.19 by greg, Mon Oct 16 11:40:09 1995 UTC

# Line 58 | Line 58 | struct {
58  
59   int  nfile;                     /* number of files */
60  
61 + char  ourfmt[LPICFMT+1] = PICFMT;
62   int  wrongformat = 0;
63  
64   FILE  *popen(), *lblopen();
# Line 72 | Line 73 | char  *s;
73  
74          if (isheadid(s))
75                  return;
76 <        if (formatval(fmt, s))
77 <                wrongformat = strcmp(fmt, COLRFMT);
78 <        else {
76 >        if (formatval(fmt, s)) {
77 >                if (globmatch(ourfmt, fmt)) {
78 >                        wrongformat = 0;
79 >                        strcpy(ourfmt, fmt);
80 >                } else
81 >                        wrongformat = 1;
82 >        } else {
83                  putc('\t', stdout);
84                  fputs(s, stdout);
85          }
# Line 222 | Line 227 | getfile:
227                  printf("%s:\n", input[nfile].name);
228                  getheader(input[nfile].fp, tabputs, NULL);
229                  if (wrongformat) {
230 <                        fprintf(stderr, "%s: not a Radiance picture\n",
230 >                        fprintf(stderr, "%s: bad Radiance input file\n",
231                                          input[nfile].name);
232                          quit(1);
233                  }
# Line 289 | Line 294 | getfile:
294                  ymax = ysiz;
295                                          /* add new header info. */
296          printargs(argc, argv, stdout);
297 <        fputformat(COLRFMT, stdout);
297 >        if (strcmp(ourfmt, PICFMT))
298 >                fputformat(ourfmt, stdout);     /* print format if known */
299          putchar('\n');
300          fprtresolu(xsiz, ysiz, stdout);
301  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)