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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.35 by greg, Wed Aug 14 18:20:02 2019 UTC vs.
Revision 2.38 by greg, Tue Sep 10 17:22:55 2019 UTC

# Line 32 | Line 32 | rmx_alloc(int nr, int nc, int n)
32                  return(NULL);
33          dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
34          dnew->dtype = DTdouble;
35 +        dnew->swapin = 0;
36          dnew->info = NULL;
37          return(dnew);
38   }
# Line 201 | Line 202 | rmx_load(const char *inspec)
202          } else if (inspec[0] == '!') {
203                  if (!(fp = popen(inspec+1, "r")))
204                          return(NULL);
205 <                SET_FILE_BINARY(stdin);
205 >                SET_FILE_BINARY(fp);
206          } else {
207                  const char      *sp = inspec;   /* check suffix */
208                  while (*sp)
# Line 253 | Line 254 | rmx_load(const char *inspec)
254          dnew->info = dinfo.info;
255          switch (dinfo.dtype) {
256          case DTascii:
257 <                SET_FILE_TEXT(stdin);
257 >                SET_FILE_TEXT(fp);
258                  if (!rmx_load_ascii(dnew, fp))
259                          goto loaderr;
260                  dnew->dtype = DTascii;          /* should leave double? */
# Line 654 | Line 655 | rmx_transform(const RMATRIX *msrc, int n, const double
655                  return(NULL);
656          if (msrc->info) {
657                  char    buf[128];
658 <                sprintf(buf, "Applied %dx%d matrix transform\n",
658 >                sprintf(buf, "Applied %dx%d component transform\n",
659                                  dnew->ncomp, msrc->ncomp);
660                  rmx_addinfo(dnew, msrc->info);
661                  rmx_addinfo(dnew, buf);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines