| 137 |
|
off_t nextloc; |
| 138 |
|
int n; |
| 139 |
|
/* open holodeck file */ |
| 140 |
< |
if ((fp = fopen(fname, append ? "r+" : "r")) == NULL) { |
| 140 |
> |
if ((fp = fopen(fname, append ? "rb+" : "rb")) == NULL) { |
| 141 |
|
sprintf(errmsg, "cannot open \"%s\" for %s", fname, |
| 142 |
|
append ? "appending" : "reading"); |
| 143 |
|
error(SYSTEM, errmsg); |
| 336 |
|
int j; |
| 337 |
|
int i; |
| 338 |
|
/* open files */ |
| 339 |
< |
if ((pfp = fopen(pcf, "r")) == NULL) { |
| 339 |
> |
if ((pfp = fopen(pcf, "rb")) == NULL) { |
| 340 |
|
sprintf(errmsg, "cannot open picture file \"%s\"", pcf); |
| 341 |
|
error(SYSTEM, pcf); |
| 342 |
|
} |
| 344 |
|
sprintf(errmsg, "cannot open depth file \"%s\"", zbf); |
| 345 |
|
error(SYSTEM, pcf); |
| 346 |
|
} |
| 347 |
+ |
SET_FD_BINARY(zfd); |
| 348 |
|
/* load picture header */ |
| 349 |
|
phd.vw = stdview; |
| 350 |
|
phd.expos = 1.0; |
| 393 |
|
} |
| 394 |
|
if (eshft) /* shift exposure */ |
| 395 |
|
shiftcolrs(cscn, i, eshft); |
| 396 |
< |
i *= sizeof(float); /* read depth */ |
| 397 |
< |
if (read(zfd, (char *)zscn, i) != i) { |
| 396 |
> |
/* read depth */ |
| 397 |
> |
if (read(zfd, zscn, i*sizeof(float)) != i*sizeof(float)) { |
| 398 |
|
sprintf(errmsg, "error reading depth file \"%s\"", zbf); |
| 399 |
|
error(USER, errmsg); |
| 400 |
|
} |
| 401 |
< |
for (i = scanlen(&prs); i--; ) { /* do each pixel */ |
| 401 |
> |
while (i--) { /* process each pixel */ |
| 402 |
|
if (zscn[i] <= 0.0) |
| 403 |
|
continue; /* illegal depth */ |
| 404 |
|
pix2loc(vl, &prs, i, j); |
