18 |
|
|
19 |
|
#include "rpaint.h" |
20 |
|
|
21 |
+ |
#include "resolu.h" |
22 |
+ |
|
23 |
|
#include <ctype.h> |
24 |
|
|
25 |
< |
#define CTRL(c) ('c'-'@') |
25 |
> |
#define CTRL(c) ((c)-'@') |
26 |
|
|
27 |
|
extern char VersionID[]; |
28 |
|
extern char *progname; |
75 |
|
sprintf(buf, "view type (%c): ", ourview.type); |
76 |
|
(*dev->comout)(buf); |
77 |
|
(*dev->comin)(buf, NULL); |
78 |
< |
if (buf[0] == CTRL(C)) return; |
78 |
> |
if (buf[0] == CTRL('C')) return; |
79 |
|
if (buf[0] && buf[0] != ourview.type) { |
80 |
|
nv.type = buf[0]; |
81 |
|
change++; |
85 |
|
ourview.vp[0], ourview.vp[1], ourview.vp[2]); |
86 |
|
(*dev->comout)(buf); |
87 |
|
(*dev->comin)(buf, NULL); |
88 |
< |
if (buf[0] == CTRL(C)) return; |
88 |
> |
if (buf[0] == CTRL('C')) return; |
89 |
|
if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3) |
90 |
|
change++; |
91 |
|
else |
94 |
|
ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]); |
95 |
|
(*dev->comout)(buf); |
96 |
|
(*dev->comin)(buf, NULL); |
97 |
< |
if (buf[0] == CTRL(C)) return; |
97 |
> |
if (buf[0] == CTRL('C')) return; |
98 |
|
if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3) |
99 |
|
change++; |
100 |
|
else |
103 |
|
ourview.vup[0], ourview.vup[1], ourview.vup[2]); |
104 |
|
(*dev->comout)(buf); |
105 |
|
(*dev->comin)(buf, NULL); |
106 |
< |
if (buf[0] == CTRL(C)) return; |
106 |
> |
if (buf[0] == CTRL('C')) return; |
107 |
|
if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3) |
108 |
|
change++; |
109 |
|
else |
112 |
|
ourview.horiz, ourview.vert); |
113 |
|
(*dev->comout)(buf); |
114 |
|
(*dev->comin)(buf, NULL); |
115 |
< |
if (buf[0] == CTRL(C)) return; |
115 |
> |
if (buf[0] == CTRL('C')) return; |
116 |
|
if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2) |
117 |
|
change++; |
118 |
|
else { |
122 |
|
ourview.hoff, ourview.voff); |
123 |
|
(*dev->comout)(buf); |
124 |
|
(*dev->comin)(buf, NULL); |
125 |
< |
if (buf[0] == CTRL(C)) return; |
125 |
> |
if (buf[0] == CTRL('C')) return; |
126 |
|
if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2) |
127 |
|
change++; |
128 |
|
else { |
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) { |