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

Comparing ray/src/px/pcond.c (file contents):
Revision 3.11 by greg, Wed Mar 19 13:04:09 1997 UTC vs.
Revision 3.12 by gwlarson, Thu Mar 12 15:47:33 1998 UTC

# Line 85 | Line 85 | char   *argv[];
85                          if (fixfrac > FTINY) what2do |= DO_FIXHIST;
86                          else what2do &= ~DO_FIXHIST;
87                          break;
88 +                case 'I':
89 +                        bool(DO_PREHIST);
90 +                        break;
91                  case 'l':
92                          bool(DO_LINEAR);
93                          break;
# Line 137 | Line 140 | char   *argv[];
140                  default:
141                          goto userr;
142                  }
143 +        if ((what2do & (DO_FIXHIST|DO_PREHIST)) == (DO_FIXHIST|DO_PREHIST)) {
144 +                fprintf(stderr, "%s: only one of -i or -I option\n", progname);
145 +                exit(1);
146 +        }
147          if ((mbcalfile != NULL) + (cwarpfile != NULL) +
148                          (outprims != stdprims) > 1) {
149                  fprintf(stderr,
# Line 164 | Line 171 | char   *argv[];
171          printargs(argc, argv, stdout);  /* add to output header */
172          if (mbcalfile == NULL & outprims != stdprims)
173                  fputprims(outprims, stdout);
174 <        getfovimg();                    /* get foveal sample image */
175 <        if (what2do&DO_FIXHIST)         /* get fixation history? */
174 >        if ((what2do & (DO_PREHIST|DO_VEIL|DO_ACUITY)) != DO_PREHIST)
175 >                getfovimg();            /* get foveal sample image? */
176 >        if (what2do&DO_PREHIST)         /* get histogram? */
177 >                gethisto(stdin);
178 >        else if (what2do&DO_FIXHIST)    /* get fixation history? */
179                  getfixations(stdin);
180          mapimage();                     /* map the picture */
181          if (mapfp != NULL)              /* write out basic mapping */
182                  putmapping(mapfp);
183          exit(0);
184   userr:
185 <        fprintf(stderr, "Usage: %s [-{h|a|v|s|c|l|w}[+-]][-i ffrac][-e ev][-p xr yr xg yg xb yb xw yw|-f mbf.cal|-m rgb.cwp][-u Ldmax][-d Lddyn][-x mapfile] inpic [outpic]\n",
185 >        fprintf(stderr, "Usage: %s [-{h|a|v|s|c|l|w}[+-]][-I|-i ffrac][-e ev][-p xr yr xg yg xb yb xw yw|-f mbf.cal|-m rgb.cwp][-u Ldmax][-d Lddyn][-x mapfile] inpic [outpic]\n",
186                          progname);
187          exit(1);
188   #undef bool

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)