22 |
|
int op; /* '*' or '+' */ |
23 |
|
} ROPERAT; /* matrix operation */ |
24 |
|
|
25 |
– |
int outfmt = DTfromHeader; /* output format */ |
25 |
|
int verbose = 0; /* verbose reporting? */ |
26 |
|
|
27 |
|
static void |
164 |
|
int |
165 |
|
main(int argc, char *argv[]) |
166 |
|
{ |
167 |
+ |
int outfmt = DTfromHeader; |
168 |
|
RMATRIX *mres = NULL; |
169 |
|
ROPERAT op; |
170 |
– |
long nbw; |
170 |
|
int i; |
171 |
|
/* initialize */ |
172 |
|
op_default(&op); |
231 |
|
if (mres == NULL) /* check that we got something */ |
232 |
|
goto userr; |
233 |
|
/* write result to stdout */ |
234 |
+ |
if (outfmt == DTfromHeader) |
235 |
+ |
outfmt = mres->dtype; |
236 |
+ |
#if defined(_WIN32) || defined(_WIN64) |
237 |
+ |
if (outfmt != DTascii) |
238 |
+ |
_setmode(fileno(stdout), _O_BINARY); |
239 |
+ |
#endif |
240 |
|
newheader("RADIANCE", stdout); |
241 |
|
printargs(argc, argv, stdout); |
242 |
< |
nbw = rmx_write(mres, outfmt, stdout); |
238 |
< |
/* rmx_free(mres); mres = NULL; */ |
239 |
< |
if (nbw <= 0) { |
242 |
> |
if (!rmx_write(mres, outfmt, stdout)) { |
243 |
|
fprintf(stderr, "%s: error writing result matrix\n", argv[0]); |
244 |
|
return(1); |
245 |
|
} |
246 |
< |
if (verbose) |
244 |
< |
fprintf(stderr, "%s: %ld bytes written\n", argv[0], nbw); |
246 |
> |
/* rmx_free(mres); mres = NULL; */ |
247 |
|
return(0); |
248 |
|
userr: |
249 |
|
fprintf(stderr, |