| 18 |
|
|
| 19 |
|
#include "rpaint.h" |
| 20 |
|
|
| 21 |
+ |
#include "resolu.h" |
| 22 |
+ |
|
| 23 |
|
#include <ctype.h> |
| 24 |
|
|
| 25 |
|
#define CTRL(c) ('c'-'@') |
| 144 |
|
if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ |
| 145 |
|
copystruct(&nv, &stdview); |
| 146 |
|
if ((fname = getpath(buf, NULL, 0)) == NULL || |
| 147 |
< |
(success = viewfile(fname, &nv, 0, 0)) == -1) { |
| 147 |
> |
(success = viewfile(fname, &nv, NULL)) == -1) { |
| 148 |
|
sprintf(errmsg, "cannot open \"%s\"", buf); |
| 149 |
|
error(COMMAND, errmsg); |
| 150 |
|
return; |
| 538 |
|
(*dev->comout)(buf); |
| 539 |
|
} |
| 540 |
|
(*dev->comin)(buf, NULL); |
| 541 |
< |
sprintf(buf, "with value (%.6g %.6g %.6g)", |
| 541 |
> |
sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)", |
| 542 |
|
colval(thisray.rcol,RED), |
| 543 |
|
colval(thisray.rcol,GRN), |
| 544 |
< |
colval(thisray.rcol,BLU)); |
| 544 |
> |
colval(thisray.rcol,BLU), |
| 545 |
> |
luminance(thisray.rcol)); |
| 546 |
|
(*dev->comout)(buf); |
| 547 |
|
} |
| 548 |
|
(*dev->comin)(buf, NULL); |
| 585 |
|
fputaspect(dev->pixaspect, fp); |
| 586 |
|
fputformat(COLRFMT, fp); |
| 587 |
|
putc('\n', fp); |
| 588 |
< |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp); |
| 588 |
> |
fprtresolu(hresolu, vresolu, fp); |
| 589 |
|
|
| 590 |
|
scanline = (COLR *)malloc(hresolu*sizeof(COLR)); |
| 591 |
|
if (scanline == NULL) { |
