| 91 |
|
if (!strncmp(s, "OBSTRUCTIONS=", 13)) { |
| 92 |
|
s += 13; |
| 93 |
|
while (*s == ' ') s++; |
| 94 |
< |
if (*s == 't' | *s == 'T') |
| 94 |
> |
if ((*s == 't') | (*s == 'T')) |
| 95 |
|
*hf |= H_OBST; |
| 96 |
< |
else if (*s == 'f' | *s == 'F') |
| 96 |
> |
else if ((*s == 'f') | (*s == 'F')) |
| 97 |
|
*hf |= H_OBSF; |
| 98 |
|
else |
| 99 |
|
error(WARNING, "bad OBSTRUCTIONS value in holodeck"); |
| 333 |
|
error(WARNING, errmsg); |
| 334 |
|
} |
| 335 |
|
/* figure out what to do about exposure */ |
| 336 |
< |
if (phd.expos < 0.99 | phd.expos > 1.01) { |
| 336 |
> |
if ((phd.expos < 0.99) | (phd.expos > 1.01)) { |
| 337 |
|
emult = -log(phd.expos)/log(2.); |
| 338 |
|
eshft = emult >= 0. ? emult+.5 : emult-.5; |
| 339 |
|
emult -= (double)eshft; |
| 340 |
< |
if (emult <= 0.01 & emult >= -0.01) |
| 340 |
> |
if ((emult <= 0.01) & (emult >= -0.01)) |
| 341 |
|
emult = -1.; |
| 342 |
|
else { |
| 343 |
|
emult = 1./phd.expos; |
| 350 |
|
/* allocate buffers */ |
| 351 |
|
cscn = (COLR *)malloc(scanlen(&prs)*sizeof(COLR)); |
| 352 |
|
zscn = (float *)malloc(scanlen(&prs)*sizeof(float)); |
| 353 |
< |
if (cscn == NULL | zscn == NULL) |
| 353 |
> |
if ((cscn == NULL) | (zscn == NULL)) |
| 354 |
|
error(SYSTEM, "out of memory in addpicz"); |
| 355 |
|
/* read and process each scanline */ |
| 356 |
|
for (j = 0; j < numscans(&prs); j++) { |
