| 39 |
|
|
| 40 |
|
#define PACKSIZ 256 /* max. calculation packet size */ |
| 41 |
|
|
| 42 |
< |
#define RTCOM "rtrace -h- -ovl -fff " |
| 42 |
> |
#define RTCOM "rtrace -h- -ovl -fff -ld- -i- -I- " |
| 43 |
|
|
| 44 |
|
#define ABS(x) ((x)>0?(x):-(x)) |
| 45 |
|
|
| 76 |
|
COLOR backcolor = BLKCOLOR; /* background color (float) */ |
| 77 |
|
double backz = 0.0; /* background z value */ |
| 78 |
|
int normdist = 1; /* i/o normalized distance? */ |
| 79 |
+ |
char ourfmt[LPICFMT+1] = PICFMT; /* original picture format */ |
| 80 |
|
double ourexp = -1; /* original picture exposure */ |
| 81 |
|
int expadj = 0; /* exposure adjustment (f-stops) */ |
| 82 |
|
double rexpadj = 1; /* real exposure adjustment */ |
| 252 |
|
rexpadj = pow(2.0, (double)expadj); |
| 253 |
|
} |
| 254 |
|
/* set view */ |
| 255 |
< |
if (nextview(doblur ? stdin : NULL) == EOF) { |
| 255 |
> |
if (nextview(doblur ? stdin : (FILE *)NULL) == EOF) { |
| 256 |
|
fprintf(stderr, "%s: no view on standard input!\n", |
| 257 |
|
progname); |
| 258 |
|
exit(1); |
| 309 |
|
ourexp = rexpadj; |
| 310 |
|
if (ourexp < .995 | ourexp > 1.005) |
| 311 |
|
fputexpos(ourexp, stdout); |
| 312 |
< |
fputformat(COLRFMT, stdout); |
| 312 |
> |
if (strcmp(ourfmt, PICFMT)) /* print format if known */ |
| 313 |
> |
fputformat(ourfmt, stdout); |
| 314 |
|
putc('\n', stdout); |
| 315 |
|
/* write picture */ |
| 316 |
|
writepicture(); |
| 328 |
|
} |
| 329 |
|
|
| 330 |
|
|
| 331 |
+ |
int |
| 332 |
|
headline(s) /* process header string */ |
| 333 |
|
char *s; |
| 334 |
|
{ |
| 335 |
|
char fmt[32]; |
| 336 |
|
|
| 337 |
|
if (isheadid(s)) |
| 338 |
< |
return; |
| 338 |
> |
return(0); |
| 339 |
|
if (formatval(fmt, s)) { |
| 340 |
< |
wrongformat = strcmp(fmt, COLRFMT); |
| 341 |
< |
return; |
| 340 |
> |
if (globmatch(ourfmt, fmt)) { |
| 341 |
> |
wrongformat = 0; |
| 342 |
> |
strcpy(ourfmt, fmt); |
| 343 |
> |
} else |
| 344 |
> |
wrongformat = 1; |
| 345 |
> |
return(0); |
| 346 |
|
} |
| 347 |
|
if (nvavg < 2) { |
| 348 |
|
putc('\t', stdout); |
| 350 |
|
} |
| 351 |
|
if (isexpos(s)) { |
| 352 |
|
theirexp *= exposval(s); |
| 353 |
< |
return; |
| 353 |
> |
return(0); |
| 354 |
|
} |
| 355 |
|
if (isview(s) && sscanview(&theirview, s) > 0) |
| 356 |
|
gotview++; |
| 357 |
+ |
return(0); |
| 358 |
|
} |
| 359 |
|
|
| 360 |
|
|
| 1171 |
|
} |
| 1172 |
|
/* mark end and get results */ |
| 1173 |
|
bzero((char *)fbp, 6*sizeof(float)); |
| 1174 |
< |
if (process(PDesc, fbuf, fbuf, 4*sizeof(float)*queuesiz, |
| 1174 |
> |
if (process(PDesc, fbuf, fbuf, 4*sizeof(float)*(queuesiz+1), |
| 1175 |
|
6*sizeof(float)*(queuesiz+1)) != |
| 1176 |
< |
4*sizeof(float)*queuesiz) { |
| 1176 |
> |
4*sizeof(float)*(queuesiz+1)) { |
| 1177 |
|
fprintf(stderr, "%s: error reading from rtrace process\n", |
| 1178 |
|
progname); |
| 1179 |
|
exit(1); |
