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

Comparing ray/src/util/rmtxop.c (file contents):
Revision 2.3 by greg, Sat Aug 2 17:10:43 2014 UTC vs.
Revision 2.5 by greg, Thu Sep 18 23:20:12 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 232 | Line 231 | main(int argc, char *argv[])
231          if (mres == NULL)               /* check that we got something */
232                  goto userr;
233                                          /* write result to stdout */
234 + #ifdef getc_unlocked
235 +        flockfile(stdout);
236 + #endif
237 + #ifdef _WIN32
238 +        if (outfmt != DTascii)
239 +                _setmode(fileno(stdout), _O_BINARY);
240 + #endif
241          newheader("RADIANCE", stdout);
242          printargs(argc, argv, stdout);
243 <        nbw = rmx_write(mres, outfmt, stdout);
238 <        /* rmx_free(mres); mres = NULL; */
239 <        if (nbw <= 0) {
243 >        if (!rmx_write(mres, outfmt, stdout)) {
244                  fprintf(stderr, "%s: error writing result matrix\n", argv[0]);
245                  return(1);
246          }
247 <        if (verbose)
244 <                fprintf(stderr, "%s: %ld bytes written\n", argv[0], nbw);
247 >        /* rmx_free(mres); mres = NULL; */
248          return(0);
249   userr:
250          fprintf(stderr,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines