| 308 |
|
if (ourras == NULL) |
| 309 |
|
goto fail; |
| 310 |
|
getmono(); |
| 311 |
< |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo)) { |
| 311 |
> |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo) |
| 312 |
> |
/* kludge for DirectColor */ |
| 313 |
> |
|| XMatchVisualInfo(thedisplay,ourscreen,24,DirectColor,&vinfo)) { |
| 314 |
|
ourdata = (unsigned char *)malloc(xmax*ymax*3); |
| 315 |
|
if (ourdata == NULL) |
| 316 |
|
goto fail; |
| 336 |
|
} |
| 337 |
|
return; |
| 338 |
|
fail: |
| 339 |
< |
quit("could not create raster image"); |
| 339 |
> |
quiterr("could not create raster image"); |
| 340 |
|
} |
| 341 |
|
|
| 342 |
|
|
| 445 |
|
XBell(thedisplay, 0); |
| 446 |
|
return(-1); |
| 447 |
|
} |
| 448 |
< |
viewray(rorg, rdir, &ourview, |
| 448 |
> |
if (viewray(rorg, rdir, &ourview, |
| 449 |
|
(ekey->x-xoff+.5)/xmax, |
| 450 |
< |
(ymax-1-ekey->y+yoff+.5)/ymax); |
| 450 |
> |
(ymax-1-ekey->y+yoff+.5)/ymax) < 0) |
| 451 |
> |
return(-1); |
| 452 |
|
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
| 453 |
|
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
| 454 |
|
fflush(stdout); |
| 604 |
|
register unsigned char *dp; |
| 605 |
|
register int x, err; |
| 606 |
|
int y; |
| 604 |
– |
rgbpixel *inline; |
| 607 |
|
short *cerr; |
| 608 |
|
|
| 609 |
< |
if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL |
| 610 |
< |
|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
| 609 |
< |
quit("out of memory in getmono"); |
| 609 |
> |
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
| 610 |
> |
quiterr("out of memory in getmono"); |
| 611 |
|
dp = ourdata - 1; |
| 612 |
|
for (y = 0; y < ymax; y++) { |
| 613 |
< |
picreadline3(y, inline); |
| 613 |
> |
if (getscan(y) < 0) |
| 614 |
> |
quiterr("seek error in getmono"); |
| 615 |
> |
normcolrs(scanline, xmax, scale); |
| 616 |
|
err = 0; |
| 617 |
|
for (x = 0; x < xmax; x++) { |
| 618 |
|
if (!(x&7)) |
| 619 |
|
*++dp = 0; |
| 620 |
< |
err += rgb_bright(&inline[x]) + cerr[x]; |
| 620 |
> |
err += normbright(scanline[x]) + cerr[x]; |
| 621 |
|
if (err > 127) |
| 622 |
|
err -= 255; |
| 623 |
|
else |
| 625 |
|
cerr[x] = err >>= 1; |
| 626 |
|
} |
| 627 |
|
} |
| 625 |
– |
free((char *)inline); |
| 628 |
|
free((char *)cerr); |
| 629 |
|
} |
| 630 |
|
|
| 632 |
|
getfull() /* get full (24-bit) data */ |
| 633 |
|
{ |
| 634 |
|
int y; |
| 635 |
< |
|
| 636 |
< |
for (y = 0; y < ymax; y++) |
| 637 |
< |
picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); |
| 635 |
> |
register unsigned char *dp; |
| 636 |
> |
register int x; |
| 637 |
> |
/* set gamma correction */ |
| 638 |
> |
setcolrgam(gamcor); |
| 639 |
> |
/* read and convert file */ |
| 640 |
> |
dp = ourdata; |
| 641 |
> |
for (y = 0; y < ymax; y++) { |
| 642 |
> |
if (getscan(y) < 0) |
| 643 |
> |
quiterr("seek error in getfull"); |
| 644 |
> |
if (scale) |
| 645 |
> |
shiftcolrs(scanline, xmax, scale); |
| 646 |
> |
colrs_gambs(scanline, xmax); |
| 647 |
> |
for (x = 0; x < xmax; x++) { |
| 648 |
> |
*dp++ = scanline[x][RED]; |
| 649 |
> |
*dp++ = scanline[x][GRN]; |
| 650 |
> |
*dp++ = scanline[x][BLU]; |
| 651 |
> |
} |
| 652 |
> |
} |
| 653 |
|
} |
| 654 |
|
|
| 655 |
|
|
| 688 |
|
if (scanpos == NULL || scanpos[y] == -1) |
| 689 |
|
return(-1); |
| 690 |
|
if (fseek(fin, scanpos[y], 0) == -1) |
| 691 |
< |
quit("fseek error"); |
| 691 |
> |
quiterr("fseek error"); |
| 692 |
|
cury = y; |
| 693 |
|
} else if (scanpos != NULL) |
| 694 |
|
scanpos[y] = ftell(fin); |
