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.4 by greg, Tue Aug 5 21:45:05 2014 UTC vs.
Revision 2.8 by greg, Wed Jul 22 04:47:51 2015 UTC

# Line 22 | Line 22 | typedef struct {
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
# Line 165 | Line 164 | get_factors(double da[], int n, char *av[])
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);
# 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);
237 < #endif
234 >        if (outfmt == DTfromHeader)
235 >                outfmt = mres->dtype;
236   #ifdef _WIN32
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);
245 <        /* rmx_free(mres); mres = NULL; */
246 <        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)
251 <                fprintf(stderr, "%s: %ld bytes written\n", argv[0], nbw);
246 >        /* rmx_free(mres); mres = NULL; */
247          return(0);
248   userr:
249          fprintf(stderr,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines