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

Comparing ray/src/px/pcompos.c (file contents):
Revision 2.19 by greg, Mon Oct 16 11:40:09 1995 UTC vs.
Revision 2.21 by greg, Sat Feb 22 02:07:27 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1993 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  pcompos.c - program to composite pictures.
6   *
# Line 18 | Line 15 | static char SCCSid[] = "$SunId$ LBL";
15   #include  <fcntl.h>
16   #endif
17  
18 + #include  <time.h>
19 +
20   #include  "color.h"
21  
22   #include  "resolu.h"
# Line 61 | Line 60 | int  nfile;                    /* number of files */
60   char  ourfmt[LPICFMT+1] = PICFMT;
61   int  wrongformat = 0;
62  
63 < FILE  *popen(), *lblopen();
63 > FILE  *lblopen();
64 > void  quit();
65  
66 – extern char  *malloc();
66  
68 –
67   tabputs(s)                      /* print line preceded by a tab */
68   char  *s;
69   {
70          char  fmt[32];
71  
72          if (isheadid(s))
73 <                return;
73 >                return(0);
74          if (formatval(fmt, s)) {
75                  if (globmatch(ourfmt, fmt)) {
76                          wrongformat = 0;
# Line 83 | Line 81 | char  *s;
81                  putc('\t', stdout);
82                  fputs(s, stdout);
83          }
84 +        return(0);
85   }
86  
87  
# Line 150 | Line 149 | char  *argv[];
149                  }
150   dofiles:
151          newheader("RADIANCE", stdout);
152 +        fputnow(stdout);
153          for (nfile = 0; an < argc; nfile++) {
154                  if (nfile >= MAXFILE)
155                          goto toomany;
# Line 227 | Line 227 | getfile:
227                  printf("%s:\n", input[nfile].name);
228                  getheader(input[nfile].fp, tabputs, NULL);
229                  if (wrongformat) {
230 <                        fprintf(stderr, "%s: bad Radiance input file\n",
230 >                        fprintf(stderr, "%s: incompatible input format\n",
231                                          input[nfile].name);
232                          quit(1);
233                  }
# Line 415 | Line 415 | err:
415   }
416  
417  
418 + void
419   quit(code)              /* exit gracefully */
420   int  code;
421   {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines