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; |
246 |
|
getexposure(s) /* get new exposure */ |
247 |
|
char *s; |
248 |
|
{ |
247 |
– |
double atof(), pow(), fabs(); |
249 |
|
char buf[128]; |
250 |
|
register char *cp; |
251 |
|
register PNODE *p; |
340 |
|
case 'b': /* boolean */ |
341 |
|
if (sscanf(str, "%1s", buf) != 1) { |
342 |
|
(*dev->comout)(dsc); |
343 |
< |
sprintf(buf, " (%c): ", ptr->i ? 'y' : 'n'); |
343 |
> |
sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n'); |
344 |
|
(*dev->comout)(buf); |
345 |
|
(*dev->comin)(buf, NULL); |
346 |
|
if (buf[0] == '\0' || |
537 |
|
(*dev->comout)(buf); |
538 |
|
} |
539 |
|
(*dev->comin)(buf, NULL); |
540 |
< |
sprintf(buf, "with value (%.6g %.6g %.6g)", |
540 |
> |
sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)", |
541 |
|
colval(thisray.rcol,RED), |
542 |
|
colval(thisray.rcol,GRN), |
543 |
< |
colval(thisray.rcol,BLU)); |
543 |
> |
colval(thisray.rcol,BLU), |
544 |
> |
luminance(thisray.rcol)); |
545 |
|
(*dev->comout)(buf); |
546 |
|
} |
547 |
|
(*dev->comin)(buf, NULL); |
584 |
|
fputaspect(dev->pixaspect, fp); |
585 |
|
fputformat(COLRFMT, fp); |
586 |
|
putc('\n', fp); |
587 |
< |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp); |
587 |
> |
fprtresolu(hresolu, vresolu, fp); |
588 |
|
|
589 |
|
scanline = (COLR *)malloc(hresolu*sizeof(COLR)); |
590 |
|
if (scanline == NULL) { |