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

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.51 by greg, Thu Aug 2 18:33:43 2018 UTC vs.
Revision 2.52 by greg, Wed Apr 3 20:16:31 2019 UTC

# Line 31 | Line 31 | struct {
31  
32   int     nfiles;                         /* number of input files */
33  
34 < VIEW    commvw;                         /* common view parameters */
34 > VIEW    *commvp = NULL;                 /* common view parameters */
35  
36   char    ourfmt[LPICFMT+1] = PICFMT;     /* input picture format */
37  
# Line 233 | Line 233 | main(
233          }
234                                                  /* complete header */
235          printargs(argc, argv, stdout);
236 <        if (commvw.type) {
236 >        if (commvp != NULL) {
237                  fputs(VIEWSTR, stdout);
238 <                fprintview(&commvw, stdout);
238 >                fprintview(commvp, stdout);
239                  fputc('\n', stdout);
240          }
241          if (strcmp(ourfmt, PICFMT))
# Line 316 | Line 316 | checkfile(void)                        /* ready a file */
316          }
317          if (!gotview || setview(&input[nfiles].vw) != NULL)
318                  input[nfiles].vw.type = 0;
319 <        else if (!commvw.type)
320 <                commvw = input[nfiles].vw;
319 >        else if (commvp == NULL)
320 >                commvp = &input[nfiles].vw;
321          if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
322                  eputs(input[nfiles].name);
323                  eputs(": bad picture size\n");

Diff Legend

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