| 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; |
| 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); |
| 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? */ |
| 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) |
