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.2 by greg, Sat May 31 19:21:21 2014 UTC vs.
Revision 2.10 by greg, Thu Aug 18 17:57:57 2016 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10   #include "rtio.h"
11   #include "resolu.h"
12   #include "rmatrix.h"
13 + #include "platform.h"
14  
15   #define MAXCOMP         50              /* #components we support */
16  
# Line 22 | Line 23 | typedef struct {
23          int             op;                     /* '*' or '+' */
24   } ROPERAT;                              /* matrix operation */
25  
25 int     outfmt = DTascii;               /* output format */
26   int     verbose = 0;                    /* verbose reporting? */
27  
28   static void
# Line 165 | Line 165 | get_factors(double da[], int n, char *av[])
165   int
166   main(int argc, char *argv[])
167   {
168 +        int     outfmt = DTfromHeader;
169          RMATRIX *mres = NULL;
170          ROPERAT op;
170        long    nbw;
171          int     i;
172                                          /* initialize */
173          op_default(&op);
# Line 232 | Line 232 | main(int argc, char *argv[])
232          if (mres == NULL)               /* check that we got something */
233                  goto userr;
234                                          /* write result to stdout */
235 +        if (outfmt == DTfromHeader)
236 +                outfmt = mres->dtype;
237 +        if (outfmt != DTascii)
238 +                SET_FILE_BINARY(stdout);
239          newheader("RADIANCE", stdout);
240          printargs(argc, argv, stdout);
241 <        nbw = rmx_write(mres, outfmt, stdout);
238 <        /* rmx_free(mres); mres = NULL; */
239 <        if (nbw <= 0) {
241 >        if (!rmx_write(mres, outfmt, stdout)) {
242                  fprintf(stderr, "%s: error writing result matrix\n", argv[0]);
243                  return(1);
244          }
245 <        if (verbose)
244 <                fprintf(stderr, "%s: %ld bytes written\n", argv[0], nbw);
245 >        /* rmx_free(mres); mres = NULL; */
246          return(0);
247   userr:
248          fprintf(stderr,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines