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.16 by greg, Wed Jul 22 04:29:56 2015 UTC vs.
Revision 2.19 by greg, Tue Feb 2 18:02:32 2016 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10   #include <string.h>
11   #include <fcntl.h>
12   #include "resolu.h"
13 < #include "rtprocess.h"
13 > #include "paths.h"
14   #include "rmatrix.h"
15  
16   static char     rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
# Line 111 | Line 111 | static int
111   rmx_load_ascii(RMATRIX *rm, FILE *fp)
112   {
113          int     i, j, k;
114 < #ifdef _WIN32
115 <        _setmode(fileno(fp), _O_TEXT);
116 < #endif
114 >
115          for (i = 0; i < rm->nrows; i++)
116              for (j = 0; j < rm->ncols; j++)
117                  for (k = 0; k < rm->ncomp; k++)
# Line 216 | Line 214 | rmx_load(const char *inspec)
214                                  return(NULL);
215                          dnew = rmx_from_cmatrix(cm);
216                          cm_free(cm);
217 +                        dnew->dtype = DTascii;
218                          return(dnew);
219                  }
220                                                  /* else open it ourselves */
# Line 253 | Line 252 | rmx_load(const char *inspec)
252          dnew->info = dinfo.info;
253          switch (dinfo.dtype) {
254          case DTascii:
255 + #ifdef _WIN32
256 +                _setmode(fileno(fp), _O_TEXT);
257 + #endif
258                  if (!rmx_load_ascii(dnew, fp))
259                          goto loaderr;
260                  dnew->dtype = DTascii;          /* should leave double? */
# Line 300 | Line 302 | static int
302   rmx_write_ascii(const RMATRIX *rm, FILE *fp)
303   {
304          int     i, j, k;
305 < #ifdef _WIN32
304 <        _setmode(fileno(fp), _O_TEXT);
305 < #endif
305 >
306          for (i = 0; i < rm->nrows; i++) {
307              for (j = 0; j < rm->ncols; j++) {
308                  for (k = 0; k < rm->ncomp; k++)
# Line 385 | Line 385 | rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
385  
386          if ((rm == NULL) | (fp == NULL))
387                  return(0);
388 + #ifdef getc_unlocked
389 +        flockfile(fp);
390 + #endif
391                                                  /* complete header */
392          if (rm->info)
393                  fputs(rm->info, fp);
# Line 429 | Line 432 | rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
432                  return(0);
433          }
434          ok &= (fflush(fp) == 0);
435 + #ifdef getc_unlocked
436 +        funlockfile(fp);
437 + #endif
438          rmx_free(mydm);
439          return(ok);
440   }

Diff Legend

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