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

Comparing src/px/pcond.c (file contents):
Revision 3.15 by schorsch, Thu Jun 5 19:29:34 2003 UTC vs.
Revision 3.17 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 106 | Line 106 | char   *argv[];
106                  case 'e':
107                          if (i+1 >= argc) goto userr;
108                          scalef = atof(argv[++i]);
109 <                        if (argv[i][0] == '+' | argv[i][0] == '-')
109 >                        if ((argv[i][0] == '+') | (argv[i][0] == '-'))
110                                  scalef = pow(2.0, scalef);
111                          what2do |= DO_LINEAR;
112                          break;
# Line 151 | Line 151 | char   *argv[];
151                                  progname);
152                  exit(1);
153          }
154 <        if (outprims == stdprims & inprims != stdprims)
154 >        if ((outprims == stdprims) & (inprims != stdprims))
155                  outprims = inprims;
156          Bldmin = Bl(ldmax/lddyn);
157          Bldmax = Bl(ldmax);
# Line 167 | Line 167 | char   *argv[];
167          SET_FILE_BINARY(stdout);
168          getahead();                     /* load input header */
169          printargs(argc, argv, stdout);  /* add to output header */
170 <        if (mbcalfile == NULL & outprims != stdprims)
170 >        if ((mbcalfile == NULL) & (outprims != stdprims))
171                  fputprims(outprims, stdout);
172          if ((what2do & (DO_PREHIST|DO_VEIL|DO_ACUITY)) != DO_PREHIST)
173                  getfovimg();            /* get foveal sample image? */
# Line 243 | Line 243 | getahead()                     /* load picture header */
243                  exit(1);
244          }
245          if (!gotview || ourview.type == VT_PAR) {
246 <                copystruct(&ourview, &stdview);
246 >                ourview = stdview;
247                  ourview.type = VT_PER;
248                  if (pixaspect*inpres.yr < inpres.xr) {
249                          ourview.horiz = 40.0;
# Line 325 | Line 325 | getfovimg()                    /* load foveal sampled image */
325          if ((fp = popen(combuf, "r")) == NULL)
326                  syserror("popen");
327          getheader(fp, NULL, NULL);      /* skip header */
328 <        if (fgetresolu(&x, &y, fp) < 0 || x != fvxr | y != fvyr)
328 >        if (fgetresolu(&x, &y, fp) < 0 || (x != fvxr) | (y != fvyr))
329                  goto readerr;
330          for (y = 0; y < fvyr; y++)
331                  if (freadscan(fovscan(y), fvxr, fp) < 0)

Diff Legend

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