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

Comparing src/px/pcomb.c (file contents):
Revision 2.48 by greg, Sat Jan 13 00:35:55 2018 UTC vs.
Revision 2.49 by greg, Mon Feb 5 20:07:17 2018 UTC

# Line 31 | Line 31 | struct {
31  
32   int     nfiles;                         /* number of input files */
33  
34 + VIEW    commvw;                         /* common view parameters */
35 +
36   char    ourfmt[LPICFMT+1] = PICFMT;     /* input picture format */
37  
38   char    StandardInput[] = "<stdin>";
# Line 222 | Line 224 | main(
224          }
225                                                  /* complete header */
226          printargs(argc, argv, stdout);
227 +        if (commvw.type) {
228 +                fputs(VIEWSTR, stdout);
229 +                fprintview(&commvw, stdout);
230 +                fputc('\n', stdout);
231 +        }
232          if (strcmp(ourfmt, PICFMT))
233                  fputformat(ourfmt, stdout);     /* print format if known */
234          putchar('\n');
# Line 300 | Line 307 | checkfile(void)                        /* ready a file */
307          }
308          if (!gotview || setview(&input[nfiles].vw) != NULL)
309                  input[nfiles].vw.type = 0;
310 +        else if (!commvw.type)
311 +                commvw = input[nfiles].vw;
312          if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
313                  eputs(input[nfiles].name);
314                  eputs(": bad picture size\n");

Diff Legend

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