14 |
|
#include "color.h" |
15 |
|
#include "resolu.h" |
16 |
|
#include "lookup.h" |
17 |
+ |
#include "random.h" |
18 |
|
#include "calcomp.h" |
19 |
|
|
20 |
|
#ifndef MAXMODLIST |
21 |
|
#define MAXMODLIST 1024 /* maximum modifiers we'll track */ |
22 |
|
#endif |
23 |
|
|
24 |
< |
int treebufsiz = BUFSIZ; /* current tree buffer size */ |
24 |
> |
size_t treebufsiz = BUFSIZ; /* current tree buffer size */ |
25 |
|
|
26 |
|
typedef double DCOLOR[3]; /* double-precision color */ |
27 |
|
|
93 |
|
struct rtproc *next; /* next in list of processes */ |
94 |
|
SUBPROC pd; /* rtrace pipe descriptors */ |
95 |
|
unsigned long raynum; /* ray number for this tree */ |
96 |
< |
int bsiz; /* ray tree buffer length */ |
96 |
> |
size_t bsiz; /* ray tree buffer length */ |
97 |
|
char *buf; /* ray tree buffer */ |
98 |
< |
int nbr; /* number of bytes from rtrace */ |
98 |
> |
size_t nbr; /* number of bytes from rtrace */ |
99 |
|
}; /* rtrace process buffer */ |
100 |
|
|
101 |
|
/* rtrace command and defaults */ |
102 |
|
char *rtargv[256+2*MAXMODLIST] = { "rtrace", |
103 |
< |
"-dj", ".5", "-dr", "3", |
103 |
> |
"-dj", ".9", "-dr", "3", |
104 |
|
"-ab", "1", "-ad", "350", }; |
105 |
|
|
106 |
|
int rtargc = 9; |
132 |
|
int outfmt = 'a'; /* output format */ |
133 |
|
|
134 |
|
int header = 1; /* output header? */ |
134 |
– |
int accumulate = 0; /* accumulate ray values? */ |
135 |
|
int force_open = 0; /* truncate existing output? */ |
136 |
+ |
int recover = 0; /* recover previous output? */ |
137 |
+ |
int accumulate = 1; /* input rays per output record */ |
138 |
|
int xres = 0; /* horiz. output resolution */ |
139 |
|
int yres = 0; /* vert. output resolution */ |
140 |
|
|
141 |
+ |
int account; /* current accumulation count */ |
142 |
|
unsigned long raysleft; /* number of rays left to trace */ |
143 |
|
long waitflush; /* how long until next flush */ |
144 |
|
|
168 |
|
|
169 |
|
void put_contrib(const DCOLOR cnt, FILE *fout); |
170 |
|
void add_contrib(const char *modn); |
171 |
< |
void done_contrib(void); |
171 |
> |
void done_contrib(int navg); |
172 |
|
|
173 |
|
/* return number of open rtrace processes */ |
174 |
|
static int |
223 |
|
{ |
224 |
|
int contrib = 0; |
225 |
|
int nprocs = 1; |
223 |
– |
int recover = 0; |
226 |
|
char *curout = NULL; |
227 |
|
char *binval = NULL; |
228 |
|
int bincnt = 0; |
247 |
|
while ((j = expandarg(&argc, &argv, i)) > 0) |
248 |
|
; |
249 |
|
if (j < 0) { |
250 |
< |
fprintf(stderr, "%s: cannot expand '%s'", |
250 |
> |
fprintf(stderr, "%s: cannot expand '%s'\n", |
251 |
|
argv[0], argv[i]); |
252 |
|
exit(1); |
253 |
|
} |
276 |
|
continue; |
277 |
|
} |
278 |
|
break; |
279 |
< |
case 'c': /* accumulate ray values */ |
280 |
< |
switch (argv[i][2]) { |
281 |
< |
case '\0': |
282 |
< |
accumulate = !accumulate; |
281 |
< |
continue; |
282 |
< |
case '+': case '1': |
283 |
< |
case 'T': case 't': |
284 |
< |
case 'Y': case 'y': |
285 |
< |
accumulate = 1; |
286 |
< |
continue; |
287 |
< |
case '-': case '0': |
288 |
< |
case 'F': case 'f': |
289 |
< |
case 'N': case 'n': |
290 |
< |
accumulate = 0; |
291 |
< |
continue; |
292 |
< |
} |
293 |
< |
break; |
279 |
> |
case 'c': /* input rays per output */ |
280 |
> |
if (argv[i][2] || i >= argc-2) break; |
281 |
> |
accumulate = atoi(argv[++i]); |
282 |
> |
continue; |
283 |
|
case 'r': /* recover output */ |
284 |
|
if (argv[i][2]) break; |
285 |
< |
recover++; |
285 |
> |
recover = 1; |
286 |
|
continue; |
287 |
|
case 'h': /* output header? */ |
288 |
|
switch (argv[i][2]) { |
317 |
|
continue; |
318 |
|
} |
319 |
|
if (argv[i][2] == 'o') { |
320 |
< |
force_open++; |
320 |
> |
force_open = 1; |
321 |
|
continue; |
322 |
|
} |
323 |
|
setformat(argv[i]+2); |
341 |
|
case 'b': /* bin expression/count */ |
342 |
|
if (i >= argc-2) break; |
343 |
|
if (argv[i][2] == 'n') { |
344 |
< |
bincnt = atoi(argv[++i]); |
344 |
> |
bincnt = (int)(eval(argv[++i]) + .5); |
345 |
|
continue; |
346 |
|
} |
347 |
|
if (argv[i][2]) break; |
369 |
|
} |
370 |
|
rtargv[rtargc++] = argv[i]; /* assume rtrace option */ |
371 |
|
} |
372 |
< |
if (accumulate) /* no output flushing for single record */ |
372 |
> |
if (accumulate <= 0) /* no output flushing for single record */ |
373 |
|
xres = yres = 0; |
374 |
|
/* set global argument list */ |
375 |
|
gargc = argc; gargv = argv; |
379 |
|
rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF; |
380 |
|
/* just asking for defaults? */ |
381 |
|
if (!strcmp(argv[i], "-defaults")) { |
382 |
< |
char sxres[16], syres[16]; |
382 |
> |
char nps[8], sxres[16], syres[16]; |
383 |
|
char *rtpath; |
384 |
< |
printf("-n %-2d\t\t\t\t# number of processes\n", nprocs); |
384 |
> |
printf("-c %-5d\t\t\t# accumulated rays per record\n", |
385 |
> |
accumulate); |
386 |
|
printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-', |
387 |
|
contrib ? "contributions" : "coefficients"); |
398 |
– |
printf("-c%c\t\t\t\t# %s\n", accumulate ? '+' : '-', |
399 |
– |
accumulate ? "accumulate ray values" : |
400 |
– |
"one output record per ray"); |
388 |
|
fflush(stdout); /* report OUR options */ |
389 |
+ |
rtargv[rtargc++] = "-n"; |
390 |
+ |
sprintf(nps, "%d", nprocs); |
391 |
+ |
rtargv[rtargc++] = nps; |
392 |
|
rtargv[rtargc++] = header ? "-h+" : "-h-"; |
393 |
|
sprintf(fmt, "-f%c%c", inpfmt, outfmt); |
394 |
|
rtargv[rtargc++] = fmt; |
427 |
|
error(USER, "missing octree argument"); |
428 |
|
rtargv[rtargc++] = octree = argv[i]; |
429 |
|
rtargv[rtargc] = NULL; |
430 |
< |
/* start rtrace */ |
430 |
> |
/* start rtrace & recover if requested */ |
431 |
|
init(nprocs); |
432 |
< |
if (recover) /* perform recovery if requested */ |
433 |
< |
if ((force_open = accumulate)) |
434 |
< |
reload_output(); |
445 |
< |
else |
446 |
< |
recover_output(stdin); |
447 |
< |
trace_contribs(stdin); /* compute contributions */ |
432 |
> |
/* compute contributions */ |
433 |
> |
trace_contribs(stdin); |
434 |
> |
/* clean up */ |
435 |
|
quit(0); |
436 |
|
} |
437 |
|
|
544 |
|
raysleft = yres; |
545 |
|
} else |
546 |
|
raysleft = 0; |
547 |
< |
waitflush = xres; |
547 |
> |
if ((account = accumulate) > 0) |
548 |
> |
raysleft *= accumulate; |
549 |
> |
waitflush = (yres > 0) & (xres > 1) ? 0 : xres; |
550 |
> |
if (!recover) |
551 |
> |
return; |
552 |
> |
/* recover previous values */ |
553 |
> |
if (accumulate <= 0) |
554 |
> |
reload_output(); |
555 |
> |
else |
556 |
> |
recover_output(stdin); |
557 |
|
} |
558 |
|
|
559 |
|
/* grow modifier to accommodate more bins */ |
583 |
|
error(USER, errmsg); |
584 |
|
} |
585 |
|
if (nmods >= MAXMODLIST) |
586 |
< |
error(USER, "too many modifiers"); |
586 |
> |
error(INTERNAL, "too many modifiers"); |
587 |
|
modname[nmods++] = modn; /* XXX assumes static string */ |
588 |
|
lep->key = modn; /* XXX assumes static string */ |
589 |
|
mp = (MODCONT *)malloc(sizeof(MODCONT)); |
591 |
|
error(SYSTEM, "out of memory in addmodifier"); |
592 |
|
mp->outspec = outf; /* XXX assumes static string */ |
593 |
|
mp->modname = modn; /* XXX assumes static string */ |
594 |
< |
if (binv != NULL) |
595 |
< |
mp->binv = eparse(binv); |
596 |
< |
else |
597 |
< |
mp->binv = eparse("0"); |
598 |
< |
mp->nbins = 1; |
594 |
> |
if (binv == NULL) |
595 |
> |
binv = "0"; /* use single bin if unspecified */ |
596 |
> |
mp->binv = eparse(binv); |
597 |
> |
if (mp->binv->type == NUM) { /* check value if constant */ |
598 |
> |
bincnt = (int)(evalue(mp->binv) + 1.5); |
599 |
> |
if (bincnt != 1) { |
600 |
> |
sprintf(errmsg, "illegal non-zero constant for bin (%s)", |
601 |
> |
binv); |
602 |
> |
error(USER, errmsg); |
603 |
> |
} |
604 |
> |
} |
605 |
> |
mp->nbins = 1; /* initialize results holder */ |
606 |
|
setcolor(mp->cbin[0], 0., 0., 0.); |
607 |
< |
if (mp->binv->type == NUM) /* assume one bin if constant */ |
605 |
< |
bincnt = 1; |
606 |
< |
else if (bincnt > 1) |
607 |
> |
if (bincnt > 1) |
608 |
|
mp = growmodifier(mp, bincnt); |
609 |
|
lep->data = (char *)mp; |
610 |
|
/* allocate output streams */ |
667 |
|
mnp = cp; |
668 |
|
break; |
669 |
|
case 'd': |
670 |
+ |
case 'i': |
671 |
+ |
case 'o': |
672 |
+ |
case 'x': |
673 |
+ |
case 'X': |
674 |
|
if (bnp != NULL) |
675 |
|
return -1; |
676 |
|
bnp = cp; |
737 |
|
{ |
738 |
|
if ((xr > 0) & (yr > 0)) /* resolution string */ |
739 |
|
fprtresolu(xr, yr, fout); |
735 |
– |
if (xres > 0) /* global flush flag */ |
736 |
– |
fflush(fout); |
740 |
|
} |
741 |
|
|
742 |
|
/* Get output stream pointer (open and write header if new and noopen==0) */ |
757 |
|
if (header) |
758 |
|
printheader(stdout, NULL); |
759 |
|
printresolu(stdout, xres, yres); |
760 |
+ |
if (waitflush > 0) |
761 |
+ |
fflush(stdout); |
762 |
|
stdos.xr = xres; stdos.yr = yres; |
763 |
|
using_stdout = 1; |
764 |
|
} |
784 |
|
sop->ofp = NULL; /* open iff noopen==0 */ |
785 |
|
sop->xr = xres; sop->yr = yres; |
786 |
|
lep->data = (char *)sop; |
787 |
< |
if (!force_open && access(oname, F_OK) == 0) { |
787 |
> |
if (!sop->outpipe & !force_open & !recover && |
788 |
> |
access(oname, F_OK) == 0) { |
789 |
|
errno = EEXIST; /* file exists */ |
790 |
|
goto openerr; |
791 |
|
} |
814 |
|
*cp = '\0'; |
815 |
|
printheader(sop->ofp, info); |
816 |
|
} |
817 |
+ |
if (accumulate > 0) { /* global resolution */ |
818 |
+ |
sop->xr = xres; sop->yr = yres; |
819 |
+ |
} |
820 |
|
printresolu(sop->ofp, sop->xr, sop->yr); |
821 |
|
/* play catch-up */ |
822 |
< |
for (i = accumulate ? 0 : lastdone; i--; ) { |
822 |
> |
for (i = accumulate > 0 ? lastdone/accumulate : 0; i--; ) { |
823 |
|
int j = sop->reclen; |
824 |
|
if (j <= 0) j = 1; |
825 |
|
while (j--) |
827 |
|
if (outfmt == 'a') |
828 |
|
putc('\n', sop->ofp); |
829 |
|
} |
830 |
< |
if (xres > 0) |
830 |
> |
if (waitflush > 0) |
831 |
|
fflush(sop->ofp); |
832 |
|
} |
833 |
|
sop->reclen += noopen; /* add to length if noopen */ |
944 |
|
fprintf(fout, "%.6e\t%.6e\t%.6e\t", cnt[0], cnt[1], cnt[2]); |
945 |
|
break; |
946 |
|
case 'f': |
947 |
< |
fv[0] = cnt[0]; |
939 |
< |
fv[1] = cnt[1]; |
940 |
< |
fv[2] = cnt[2]; |
947 |
> |
copycolor(fv, cnt); |
948 |
|
fwrite(fv, sizeof(float), 3, fout); |
949 |
|
break; |
950 |
|
case 'd': |
957 |
|
default: |
958 |
|
error(INTERNAL, "botched output format"); |
959 |
|
} |
960 |
+ |
if (waitflush < 0 && frandom() < 0.001) |
961 |
+ |
fflush(fout); /* staggers writes */ |
962 |
|
} |
963 |
|
|
964 |
|
/* output ray tallies and clear for next accumulation */ |
965 |
|
void |
966 |
< |
done_contrib(void) |
966 |
> |
done_contrib(int navg) |
967 |
|
{ |
968 |
+ |
double sf = 1.; |
969 |
|
int i, j; |
970 |
|
MODCONT *mp; |
971 |
|
STREAMOUT *sop; |
972 |
+ |
/* set average scaling */ |
973 |
+ |
if (navg > 1) |
974 |
+ |
sf = 1. / (double)navg; |
975 |
|
/* output modifiers in order */ |
976 |
|
for (i = 0; i < nmods; i++) { |
977 |
|
mp = (MODCONT *)lu_find(&modconttab,modname[i])->data; |
978 |
+ |
if (navg > 1) /* average scaling */ |
979 |
+ |
for (j = mp->nbins; j--; ) |
980 |
+ |
scalecolor(mp->cbin[j], sf); |
981 |
|
sop = getostream(mp->outspec, mp->modname, 0,0); |
982 |
|
put_contrib(mp->cbin[0], sop->ofp); |
983 |
|
if (mp->nbins > 3 && /* minor optimization */ |
996 |
|
if (using_stdout & (outfmt == 'a')) |
997 |
|
putc('\n', stdout); |
998 |
|
if (!waitflush) { |
999 |
< |
waitflush = xres; |
999 |
> |
waitflush = (yres > 0) & (xres > 1) ? 0 : xres; |
1000 |
|
if (using_stdout) |
1001 |
|
fflush(stdout); |
1002 |
|
} |
1061 |
|
cp += sizeof(float)*9; n -= sizeof(float)*9; |
1062 |
|
add_contrib(modname); |
1063 |
|
} |
1064 |
< |
if (!accumulate) |
1065 |
< |
done_contrib(); /* sum up contributions & output */ |
1064 |
> |
/* time to produce record? */ |
1065 |
> |
if (account > 0 && !--account) |
1066 |
> |
done_contrib(account = accumulate); |
1067 |
|
lastdone = rtp->raynum; |
1068 |
|
if (rtp->buf != NULL) /* free up buffer space */ |
1069 |
|
free(rtp->buf); |
1078 |
|
{ |
1079 |
|
struct rtproc *rtfree = NULL; |
1080 |
|
fd_set readset, errset; |
1081 |
< |
int nr; |
1081 |
> |
ssize_t nr; |
1082 |
|
struct rtproc *rt; |
1083 |
|
int n; |
1084 |
|
|
1150 |
|
void |
1151 |
|
trace_contribs(FILE *fin) |
1152 |
|
{ |
1153 |
+ |
static int ignore_warning_given = 0; |
1154 |
|
char inpbuf[128]; |
1155 |
|
int iblen; |
1156 |
|
struct rtproc *rtp; |
1157 |
|
/* loop over input */ |
1158 |
|
while ((iblen = getinp(inpbuf, fin)) >= 0) { |
1159 |
< |
if (!iblen || /* need reset? */ |
1159 |
> |
if (!iblen && accumulate != 1) { |
1160 |
> |
if (!ignore_warning_given++) |
1161 |
> |
error(WARNING, |
1162 |
> |
"dummy ray(s) ignored during accumulation\n"); |
1163 |
> |
continue; |
1164 |
> |
} |
1165 |
> |
if (!iblen || /* need flush/reset? */ |
1166 |
|
queue_length() > 10*nrtprocs() || |
1167 |
|
lastray+1 < lastray) { |
1168 |
|
while (wait_rproc() != NULL) |
1175 |
|
if (iblen) { /* trace ray if valid */ |
1176 |
|
writebuf(rtp->pd.w, inpbuf, iblen); |
1177 |
|
} else { /* else bypass dummy ray */ |
1178 |
< |
queue_raytree(rtp); /* empty tree */ |
1179 |
< |
if ((yres <= 0) | (waitflush > 1)) |
1180 |
< |
waitflush = 1; /* flush after this */ |
1178 |
> |
queue_raytree(rtp); /* queue empty ray/record */ |
1179 |
> |
if ((yres <= 0) | (xres <= 0)) |
1180 |
> |
waitflush = 1; /* flush right after */ |
1181 |
|
} |
1182 |
|
process_queue(); /* catch up with results */ |
1183 |
|
if (raysleft && !--raysleft) |
1185 |
|
} |
1186 |
|
while (wait_rproc() != NULL) /* process outstanding rays */ |
1187 |
|
process_queue(); |
1188 |
< |
if (accumulate) |
1189 |
< |
done_contrib(); /* output tallies */ |
1188 |
> |
if (accumulate <= 0) |
1189 |
> |
done_contrib(0); /* output tallies */ |
1190 |
> |
else if (account < accumulate) { |
1191 |
> |
error(WARNING, "partial accumulation in final record"); |
1192 |
> |
done_contrib(accumulate - account); |
1193 |
> |
} |
1194 |
|
if (raysleft) |
1195 |
|
error(USER, "unexpected EOF on input"); |
1196 |
|
lu_done(&ofiletab); /* close output files */ |
1197 |
|
} |
1198 |
|
|
1199 |
< |
/* seek on the given output file */ |
1199 |
> |
/* get ray contribution from previous file */ |
1200 |
|
static int |
1201 |
< |
myseeko(const LUENT *e, void *p) |
1201 |
> |
get_contrib(DCOLOR cnt, FILE *finp) |
1202 |
|
{ |
1203 |
+ |
COLOR fv; |
1204 |
+ |
COLR cv; |
1205 |
+ |
|
1206 |
+ |
switch (outfmt) { |
1207 |
+ |
case 'a': |
1208 |
+ |
return(fscanf(finp,"%lf %lf %lf",&cnt[0],&cnt[1],&cnt[2]) == 3); |
1209 |
+ |
case 'f': |
1210 |
+ |
if (fread(fv, sizeof(fv[0]), 3, finp) != 3) |
1211 |
+ |
return(0); |
1212 |
+ |
copycolor(cnt, fv); |
1213 |
+ |
return(1); |
1214 |
+ |
case 'd': |
1215 |
+ |
return(fread(cnt, sizeof(cnt[0]), 3, finp) == 3); |
1216 |
+ |
case 'c': |
1217 |
+ |
if (fread(cv, sizeof(cv), 1, finp) != 1) |
1218 |
+ |
return(0); |
1219 |
+ |
colr_color(fv, cv); |
1220 |
+ |
copycolor(cnt, fv); |
1221 |
+ |
return(1); |
1222 |
+ |
default: |
1223 |
+ |
error(INTERNAL, "botched output format"); |
1224 |
+ |
} |
1225 |
+ |
return(0); /* pro forma return */ |
1226 |
+ |
} |
1227 |
+ |
|
1228 |
+ |
/* close output file opened for input */ |
1229 |
+ |
static int |
1230 |
+ |
myclose(const LUENT *e, void *p) |
1231 |
+ |
{ |
1232 |
|
STREAMOUT *sop = (STREAMOUT *)e->data; |
1176 |
– |
off_t nbytes = *(off_t *)p; |
1233 |
|
|
1234 |
< |
if (sop->reclen > 1) |
1235 |
< |
nbytes = nbytes * sop->reclen; |
1236 |
< |
if (fseeko(sop->ofp, nbytes, SEEK_CUR) < 0) { |
1237 |
< |
sprintf(errmsg, "seek error on file '%s'", e->key); |
1238 |
< |
error(SYSTEM, errmsg); |
1183 |
< |
} |
1184 |
< |
return 0; |
1234 |
> |
if (sop->ofp == NULL) |
1235 |
> |
return(0); |
1236 |
> |
fclose(sop->ofp); |
1237 |
> |
sop->ofp = NULL; |
1238 |
> |
return(0); |
1239 |
|
} |
1240 |
|
|
1241 |
|
/* load previously accumulated values */ |
1249 |
|
char *fmode = "rb"; |
1250 |
|
char *outvfmt; |
1251 |
|
LUENT *ment, *oent; |
1252 |
+ |
int xr, yr; |
1253 |
|
STREAMOUT sout; |
1254 |
+ |
DCOLOR rgbv; |
1255 |
|
|
1200 |
– |
error(INTERNAL, "-r option not yet implemented with -c"); |
1201 |
– |
|
1256 |
|
switch (outfmt) { |
1257 |
|
case 'a': |
1258 |
|
outvfmt = "ascii"; |
1271 |
|
error(INTERNAL, "botched output format"); |
1272 |
|
return; |
1273 |
|
} |
1274 |
< |
/* check modifier outputs */ |
1274 |
> |
/* reload modifier values */ |
1275 |
|
for (i = 0; i < nmods; i++) { |
1276 |
|
ment = lu_find(&modconttab,modname[i]); |
1277 |
|
mp = (MODCONT *)ment->data; |
1279 |
|
error(USER, "cannot reload from stdout"); |
1280 |
|
if (mp->outspec[0] == '!') |
1281 |
|
error(USER, "cannot reload from command"); |
1282 |
< |
for (j = 0; ; j++) { /* check each bin's file */ |
1282 |
> |
for (j = 0; ; j++) { /* load each modifier bin */ |
1283 |
|
ofl = ofname(oname, mp->outspec, mp->modname, j); |
1284 |
|
if (ofl < 0) |
1285 |
|
error(USER, "bad output file specification"); |
1288 |
|
sout = *(STREAMOUT *)oent->data; |
1289 |
|
} else { |
1290 |
|
sout.reclen = 0; |
1291 |
+ |
sout.outpipe = 0; |
1292 |
+ |
sout.xr = xres; sout.yr = yres; |
1293 |
|
sout.ofp = NULL; |
1294 |
|
} |
1295 |
< |
if (sout.ofp != NULL) { /* already open? */ |
1296 |
< |
if (ofl & OF_BIN) |
1297 |
< |
continue; |
1298 |
< |
break; |
1295 |
> |
if (sout.ofp == NULL) { /* open output as input */ |
1296 |
> |
sout.ofp = fopen(oname, fmode); |
1297 |
> |
if (sout.ofp == NULL) { |
1298 |
> |
if (j) |
1299 |
> |
break; /* assume end of modifier */ |
1300 |
> |
sprintf(errmsg, "missing reload file '%s'", |
1301 |
> |
oname); |
1302 |
> |
error(WARNING, errmsg); |
1303 |
> |
break; |
1304 |
> |
} |
1305 |
> |
if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) { |
1306 |
> |
sprintf(errmsg, "format mismatch for '%s'", |
1307 |
> |
oname); |
1308 |
> |
error(USER, errmsg); |
1309 |
> |
} |
1310 |
> |
if ((sout.xr > 0) & (sout.yr > 0) && |
1311 |
> |
(!fscnresolu(&xr, &yr, sout.ofp) || |
1312 |
> |
(xr != sout.xr) | |
1313 |
> |
(yr != sout.yr))) { |
1314 |
> |
sprintf(errmsg, "resolution mismatch for '%s'", |
1315 |
> |
oname); |
1316 |
> |
error(USER, errmsg); |
1317 |
> |
} |
1318 |
|
} |
1319 |
< |
/* open output */ |
1320 |
< |
sout.ofp = fopen(oname, fmode); |
1321 |
< |
if (sout.ofp == NULL) { |
1322 |
< |
if (j) |
1323 |
< |
break; /* assume end of modifier */ |
1324 |
< |
sprintf(errmsg, "missing reload file '%s'", |
1325 |
< |
oname); |
1326 |
< |
error(WARNING, errmsg); |
1319 |
> |
/* read in RGB value */ |
1320 |
> |
if (!get_contrib(rgbv, sout.ofp)) { |
1321 |
> |
if (!j) { |
1322 |
> |
fclose(sout.ofp); |
1323 |
> |
break; /* ignore empty file */ |
1324 |
> |
} |
1325 |
> |
if (j < mp->nbins) { |
1326 |
> |
sprintf(errmsg, "missing data in '%s'", |
1327 |
> |
oname); |
1328 |
> |
error(USER, errmsg); |
1329 |
> |
} |
1330 |
|
break; |
1331 |
|
} |
1332 |
< |
if (oent->key == NULL) /* new entry */ |
1332 |
> |
if (j >= mp->nbins) /* grow modifier size */ |
1333 |
> |
ment->data = (char *)(mp = growmodifier(mp, j+1)); |
1334 |
> |
copycolor(mp->cbin[j], rgbv); |
1335 |
> |
if (oent->key == NULL) /* new file entry */ |
1336 |
|
oent->key = strcpy((char *) |
1337 |
|
malloc(strlen(oname)+1), oname); |
1338 |
|
if (oent->data == NULL) |
1339 |
|
oent->data = (char *)malloc(sizeof(STREAMOUT)); |
1340 |
|
*(STREAMOUT *)oent->data = sout; |
1260 |
– |
if (!(ofl & OF_BIN)) |
1261 |
– |
break; /* no bin separation */ |
1341 |
|
} |
1263 |
– |
if (j > mp->nbins) /* reallocate modifier bins */ |
1264 |
– |
ment->data = (char *)(mp = growmodifier(mp, j)); |
1342 |
|
} |
1343 |
< |
lu_done(&ofiletab); /* close all files */ |
1343 |
> |
lu_doall(&ofiletab, myclose, NULL); /* close all files */ |
1344 |
|
} |
1345 |
|
|
1346 |
+ |
/* seek on the given output file */ |
1347 |
+ |
static int |
1348 |
+ |
myseeko(const LUENT *e, void *p) |
1349 |
+ |
{ |
1350 |
+ |
STREAMOUT *sop = (STREAMOUT *)e->data; |
1351 |
+ |
off_t nbytes = *(off_t *)p; |
1352 |
+ |
|
1353 |
+ |
if (sop->reclen > 1) |
1354 |
+ |
nbytes = nbytes * sop->reclen; |
1355 |
+ |
if (fseeko(sop->ofp, nbytes, SEEK_CUR) < 0) { |
1356 |
+ |
sprintf(errmsg, "seek error on file '%s'", e->key); |
1357 |
+ |
error(SYSTEM, errmsg); |
1358 |
+ |
} |
1359 |
+ |
return 0; |
1360 |
+ |
} |
1361 |
+ |
|
1362 |
|
/* recover output if possible */ |
1363 |
|
void |
1364 |
|
recover_output(FILE *fin) |
1412 |
|
sout = *(STREAMOUT *)oent->data; |
1413 |
|
} else { |
1414 |
|
sout.reclen = 0; |
1415 |
+ |
sout.outpipe = 0; |
1416 |
|
sout.ofp = NULL; |
1417 |
|
} |
1418 |
|
if (sout.ofp != NULL) { /* already open? */ |
1453 |
|
oname); |
1454 |
|
error(USER, errmsg); |
1455 |
|
} |
1456 |
< |
if ((xres > 0) & (yres > 0) && |
1456 |
> |
sout.xr = xres; sout.yr = yres; |
1457 |
> |
if ((sout.xr > 0) & (sout.yr > 0) && |
1458 |
|
(!fscnresolu(&xr, &yr, sout.ofp) || |
1459 |
< |
xr != xres || |
1460 |
< |
yr != yres)) { |
1459 |
> |
(xr != sout.xr) | |
1460 |
> |
(yr != sout.yr))) { |
1461 |
|
sprintf(errmsg, "resolution mismatch for '%s'", |
1462 |
|
oname); |
1463 |
|
error(USER, errmsg); |
1486 |
|
error(WARNING, "no output files to recover"); |
1487 |
|
return; |
1488 |
|
} |
1489 |
< |
if (raysleft && lastout >= raysleft) { |
1489 |
> |
if (raysleft && lastout >= raysleft/accumulate) { |
1490 |
|
error(WARNING, "output appears to be complete"); |
1491 |
|
/* XXX should read & discard input? */ |
1492 |
|
quit(0); |
1498 |
|
for (nvals = 0; nvals < lastout; nvals++) |
1499 |
|
if (getinp(oname, fin) < 0) |
1500 |
|
error(USER, "unexpected EOF on input"); |
1501 |
< |
lastray = lastdone = (unsigned long)lastout; |
1501 |
> |
lastray = lastdone = (unsigned long)lastout * accumulate; |
1502 |
|
if (raysleft) |
1503 |
|
raysleft -= lastray; |
1504 |
|
} |