48 |
|
error(SYSTEM, errmsg); |
49 |
|
} |
50 |
|
dt = DTfromHeader; |
51 |
< |
if ((err = cm_getheader(&dt, NULL, NULL, NULL, fp)) != NULL) |
51 |
> |
if ((err = cm_getheader(&dt, NULL, NULL, NULL, NULL, fp)) != NULL) |
52 |
|
error(USER, err); |
53 |
|
if ((dt != DTrgbe) & (dt != DTxyze) || |
54 |
|
!fscnresolu(&xr, &yr, fp)) { |
64 |
|
pmat = cm_alloc(myYR, myXR); |
65 |
|
memset(pmat->cmem, 0, sizeof(COLOR)*myXR*myYR); |
66 |
|
/* finish header */ |
67 |
< |
fputformat((char *)cm_fmt_id[myDT], fout); |
67 |
> |
fputformat(cm_fmt_id[myDT], fout); |
68 |
|
fputc('\n', fout); |
69 |
|
fflush(fout); |
70 |
|
} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) { |
107 |
|
return(i); |
108 |
|
} |
109 |
|
|
110 |
+ |
/* adjust matrix dimensions according to user size(s) */ |
111 |
+ |
static int |
112 |
+ |
alt_dim(CMATRIX *cm, int nr, int nc) |
113 |
+ |
{ |
114 |
+ |
if ((nr <= 0) & (nc <= 0)) |
115 |
+ |
return(0); |
116 |
+ |
if ((nr == cm->nrows) & (nc == cm->ncols)) |
117 |
+ |
return(0); |
118 |
+ |
if (nr > 0) { |
119 |
+ |
if (nc <= 0) |
120 |
+ |
nc = cm->nrows*cm->ncols/nr; |
121 |
+ |
if (nr*nc != cm->nrows*cm->ncols) { |
122 |
+ |
fprintf(stderr, "Bad dimensions: %dx%d != %dx%d\n", |
123 |
+ |
nr, nc, cm->nrows, cm->ncols); |
124 |
+ |
return(-1); |
125 |
+ |
} |
126 |
+ |
} else /* nc > 0 */ { |
127 |
+ |
nr = cm->nrows*cm->ncols/nc; |
128 |
+ |
if (nc*nr != cm->nrows*cm->ncols) { |
129 |
+ |
fprintf(stderr, "Bad dimensions: %d does not divide %dx%d evenly\n", |
130 |
+ |
nc, cm->nrows, cm->ncols); |
131 |
+ |
return(-1); |
132 |
+ |
} |
133 |
+ |
} |
134 |
+ |
cm->nrows = nr; |
135 |
+ |
cm->ncols = nc; |
136 |
+ |
return(1); |
137 |
+ |
} |
138 |
+ |
|
139 |
|
/* check to see if a string contains a %d or %o specification */ |
140 |
|
static int |
141 |
|
hasNumberFormat(const char *s) |
170 |
|
int nsteps = 0; |
171 |
|
char *ofspec = NULL; |
172 |
|
FILE *ofp = stdout; |
173 |
+ |
int xres=0, yres=0; |
174 |
|
CMATRIX *cmtx; /* component vector/matrix result */ |
175 |
|
char fnbuf[256]; |
176 |
|
int a, i; |
224 |
|
goto userr; |
225 |
|
} |
226 |
|
break; |
227 |
+ |
case 'x': |
228 |
+ |
xres = atoi(argv[++a]); |
229 |
+ |
break; |
230 |
+ |
case 'y': |
231 |
+ |
yres = atoi(argv[++a]); |
232 |
+ |
break; |
233 |
|
default: |
234 |
|
goto userr; |
235 |
|
} |
325 |
|
const char *wtype = (outfmt==DTascii) ? "w" : "wb"; |
326 |
|
for (i = 0; i < nsteps; i++) { |
327 |
|
CMATRIX *rvec = cm_column(rmtx, i); |
328 |
+ |
if (alt_dim(rvec, yres, xres) < 0) |
329 |
+ |
return(1); |
330 |
|
sprintf(fnbuf, ofspec, i); |
331 |
|
if ((ofp = fopen(fnbuf, wtype)) == NULL) { |
332 |
|
fprintf(stderr, |
342 |
|
printargs(argc, argv, ofp); |
343 |
|
fputnow(ofp); |
344 |
|
fprintf(ofp, "FRAME=%d\n", i); |
345 |
< |
fprintf(ofp, "NROWS=%d\n", rvec->nrows); |
346 |
< |
fputs("NCOLS=1\nNCOMP=3\n", ofp); |
347 |
< |
if ((outfmt == 'f') | (outfmt == 'd')) |
345 |
> |
if ((outfmt != DTrgbe) & (outfmt != DTxyze)) { |
346 |
> |
fprintf(ofp, "NROWS=%d\n", rvec->nrows); |
347 |
> |
fprintf(ofp, "NCOLS=%d\n", rvec->ncols); |
348 |
> |
fputs("NCOMP=3\n", ofp); |
349 |
> |
} |
350 |
> |
if ((outfmt == DTfloat) | (outfmt == DTdouble)) |
351 |
|
fputendian(ofp); |
352 |
< |
fputformat((char *)cm_fmt_id[outfmt], ofp); |
352 |
> |
fputformat(cm_fmt_id[outfmt], ofp); |
353 |
|
fputc('\n', ofp); |
354 |
|
} |
355 |
|
cm_write(rvec, outfmt, ofp); |
368 |
|
#endif |
369 |
|
if (outfmt != DTascii) |
370 |
|
SET_FILE_BINARY(ofp); |
371 |
+ |
if (alt_dim(rmtx, yres, xres) < 0) |
372 |
+ |
return(1); |
373 |
|
if (headout) { /* header output */ |
374 |
|
newheader("RADIANCE", ofp); |
375 |
|
printargs(argc, argv, ofp); |
376 |
|
fputnow(ofp); |
377 |
< |
fprintf(ofp, "NROWS=%d\n", rmtx->nrows); |
378 |
< |
fprintf(ofp, "NCOLS=%d\n", rmtx->ncols); |
379 |
< |
fputs("NCOMP=3\n", ofp); |
380 |
< |
if ((outfmt == 'f') | (outfmt == 'd')) |
377 |
> |
if ((outfmt != DTrgbe) & (outfmt != DTxyze)) { |
378 |
> |
fprintf(ofp, "NROWS=%d\n", rmtx->nrows); |
379 |
> |
fprintf(ofp, "NCOLS=%d\n", rmtx->ncols); |
380 |
> |
fputs("NCOMP=3\n", ofp); |
381 |
> |
} |
382 |
> |
if ((outfmt == DTfloat) | (outfmt == DTdouble)) |
383 |
|
fputendian(ofp); |
384 |
< |
fputformat((char *)cm_fmt_id[outfmt], ofp); |
384 |
> |
fputformat(cm_fmt_id[outfmt], ofp); |
385 |
|
fputc('\n', ofp); |
386 |
|
} |
387 |
|
cm_write(rmtx, outfmt, ofp); |
395 |
|
cm_free(cmtx); |
396 |
|
return(0); |
397 |
|
userr: |
398 |
< |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d|c}] DCspec [skyf]\n", |
398 |
> |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-x xr][-y yr][-i{f|d|h}][-o{f|d|c}] DCspec [skyf]\n", |
399 |
|
progname); |
400 |
< |
fprintf(stderr, " or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d|c}] Vspec Tbsdf Dmat.dat [skyf]\n", |
400 |
> |
fprintf(stderr, " or: %s [-n nsteps][-o ospec][-x xr][-y yr][-i{f|d|h}][-o{f|d|c}] Vspec Tbsdf Dmat.dat [skyf]\n", |
401 |
|
progname); |
402 |
|
return(1); |
403 |
|
} |