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.59 by greg, Fri Feb 23 03:47:57 2024 UTC vs.
Revision 2.62 by greg, Sat Jun 7 05:09:46 2025 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9  
10   #include "platform.h"
11   #include "standard.h"
12 #include "paths.h"
12   #include "color.h"
13   #include "calcomp.h"
14   #include "view.h"
# Line 70 | Line 69 | int    xres, yres;                     /* output resolution */
69  
70   int     xpos, ypos;                     /* output position */
71  
73 char    *progname;                      /* global argv[0] */
74
72   int     echoheader = 1;
73   int     wrongformat = 0;
74   int     gotview;
# Line 104 | Line 101 | main(
101          SET_DEFAULT_BINARY();
102          SET_FILE_BINARY(stdin);
103          SET_FILE_BINARY(stdout);
104 <        progname = argv[0];
104 >        fixargv0(argv[0]);              /* sets global progname */
105          esupport |= E_VARIABLE|E_FUNCTION|E_RCONST;
106          esupport &= ~(E_OUTCHAN|E_INCHAN);
107                                                  /* scan options */
# Line 240 | Line 237 | main(
237                  fprintview(commvp, stdout);
238                  fputc('\n', stdout);
239          }
240 <        if (outfloat) {                         /* print format if known */
240 >        if (outfloat) {                         /* print output format */
241                  printf("NROWS=%d\nNCOLS=%d\n", yres, xres);
242                  fputncomp(outfloat, stdout);
243                  fputendian(stdout);
244                  fputformat("float", stdout);
245          } else if (strcmp(ourfmt, PICFMT))
246                  fputformat(ourfmt, stdout);
247 +        else
248 +                fputformat(COLRFMT, stdout);
249          fputc('\n', stdout);                    /* end header */
250          if (!outfloat)
251                  fprtresolu(xres, yres, stdout);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines