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

Comparing ray/src/util/cmatrix.c (file contents):
Revision 2.31 by greg, Fri Jan 15 18:31:38 2021 UTC vs.
Revision 2.33 by greg, Fri Jan 22 16:19:15 2021 UTC

# Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15   #include "paths.h"
16   #include "resolu.h"
17  
18 + const char      stdin_name[] = "<stdin>";
19 +
20   const char      *cm_fmt_id[] = {
21                          "unknown", COLRFMT, CIEFMT,
22                          "float", "ascii", "double"
# Line 212 | Line 214 | CMATRIX *
214   cm_load(const char *inspec, int nrows, int ncols, int dtype)
215   {
216          const int       ROWINC = 2048;
215        FILE            *fp = stdin;
217          int             swap = 0;
218 +        FILE            *fp;
219          COLOR           scale;
220          CMATRIX         *cm;
221  
222          if (!inspec)
223 <                inspec = "<stdin>";
224 <        else if (inspec[0] == '!') {
223 >                inspec = stdin_name;
224 >        else if (!*inspec)
225 >                return(NULL);
226 >        if (inspec == stdin_name) {             /* reading from stdin? */
227 >                fp = stdin;
228 >        } else if (inspec[0] == '!') {
229                  fp = popen(inspec+1, "r");
230                  if (!fp) {
231                          sprintf(errmsg, "cannot start command '%s'", inspec);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines