ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/rmtxop.c
(Generate patch)

Comparing ray/src/util/rmtxop.c (file contents):
Revision 2.4 by greg, Tue Aug 5 21:45:05 2014 UTC vs.
Revision 2.6 by greg, Tue Dec 16 20:21:46 2014 UTC

# Line 167 | Line 167 | main(int argc, char *argv[])
167   {
168          RMATRIX *mres = NULL;
169          ROPERAT op;
170 –        long    nbw;
170          int     i;
171                                          /* initialize */
172          op_default(&op);
# Line 235 | Line 234 | main(int argc, char *argv[])
234   #ifdef getc_unlocked
235          flockfile(stdout);
236   #endif
237 +        if (outfmt == DTfromHeader)
238 +                outfmt = mres->dtype;
239   #ifdef _WIN32
240          if (outfmt != DTascii)
241                  _setmode(fileno(stdout), _O_BINARY);
242   #endif
243          newheader("RADIANCE", stdout);
244          printargs(argc, argv, stdout);
245 <        nbw = rmx_write(mres, outfmt, stdout);
245 <        /* rmx_free(mres); mres = NULL; */
246 <        if (nbw <= 0) {
245 >        if (!rmx_write(mres, outfmt, stdout)) {
246                  fprintf(stderr, "%s: error writing result matrix\n", argv[0]);
247                  return(1);
248          }
249 <        if (verbose)
251 <                fprintf(stderr, "%s: %ld bytes written\n", argv[0], nbw);
249 >        /* rmx_free(mres); mres = NULL; */
250          return(0);
251   userr:
252          fprintf(stderr,

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)