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.18 by greg, Thu Aug 27 04:07:05 2015 UTC vs.
Revision 2.21 by greg, Thu Aug 18 00:52:48 2016 UTC

# Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9   #include <stdlib.h>
10   #include <string.h>
11   #include <fcntl.h>
12 + #include "rtio.h"
13 + #include "platform.h"
14   #include "resolu.h"
15 < #include "rtprocess.h"
15 > #include "paths.h"
16   #include "rmatrix.h"
17  
18   static char     rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
# Line 132 | Line 134 | rmx_load_float(RMATRIX *rm, FILE *fp)
134          }
135          for (i = 0; i < rm->nrows; i++)
136              for (j = 0; j < rm->ncols; j++) {
137 <                if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
137 >                if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
138                      return(0);
139                  for (k = rm->ncomp; k--; )
140                       rmx_lval(rm,i,j,k) = val[k];
# Line 152 | Line 154 | rmx_load_double(RMATRIX *rm, FILE *fp)
154          }
155          for (i = 0; i < rm->nrows; i++)
156              for (j = 0; j < rm->ncols; j++) {
157 <                if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
157 >                if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
158                      return(0);
159                  for (k = rm->ncomp; k--; )
160                       rmx_lval(rm,i,j,k) = val[k];
# Line 193 | Line 195 | rmx_load(const char *inspec)
195  
196          if (inspec == NULL) {                   /* reading from stdin? */
197                  inspec = "<stdin>";
198 < #ifdef _WIN32
198 > #if defined(_WIN32) || defined(_WIN64)
199                  _setmode(fileno(stdin), _O_BINARY);
200   #endif
201          } else if (inspec[0] == '!') {
202                  if ((fp = popen(inspec+1, "r")) == NULL)
203                          return(NULL);
204 < #ifdef _WIN32
204 > #if defined(_WIN32) || defined(_WIN64)
205                  _setmode(fileno(fp), _O_BINARY);
206   #endif
207          } else {
# Line 252 | Line 254 | rmx_load(const char *inspec)
254          dnew->info = dinfo.info;
255          switch (dinfo.dtype) {
256          case DTascii:
257 < #ifdef _WIN32
257 > #if defined(_WIN32) || defined(_WIN64)
258                  _setmode(fileno(fp), _O_TEXT);
259   #endif
260                  if (!rmx_load_ascii(dnew, fp))
# Line 328 | Line 330 | rmx_write_float(const RMATRIX *rm, FILE *fp)
330              for (j = 0; j < rm->ncols; j++) {
331                  for (k = rm->ncomp; k--; )
332                      val[k] = (float)rmx_lval(rm,i,j,k);
333 <                if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
333 >                if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
334                          return(0);
335              }
336          return(1);
# Line 348 | Line 350 | rmx_write_double(const RMATRIX *rm, FILE *fp)
350              for (j = 0; j < rm->ncols; j++) {
351                  for (k = rm->ncomp; k--; )
352                      val[k] = rmx_lval(rm,i,j,k);
353 <                if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
353 >                if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
354                          return(0);
355              }
356          return(1);

Diff Legend

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