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

Comparing ray/src/rt/data.c (file contents):
Revision 2.17 by greg, Tue May 13 17:58:33 2003 UTC vs.
Revision 2.22 by greg, Wed Jul 16 01:32:53 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  <time.h>
11  
12 + #include  "standard.h"
13 + #include  "platform.h"
14   #include  "color.h"
13
15   #include  "resolu.h"
15
16   #include  "data.h"
17  
18                                  /* picture memory usage before warning */
19   #ifndef PSIZWARN
20 < #ifdef BIGMEM
21 < #define PSIZWARN        5000000
22 < #else
20 > #ifdef SMLMEM
21   #define PSIZWARN        1500000
22 + #else
23 + #define PSIZWARN        5000000
24   #endif
25   #endif
26  
# Line 162 | Line 162 | char  *pname;
162          COLR  *scanin;
163          int  sl, ns;
164          RESOLU  inpres;
165 <        FLOAT  loc[2];
165 >        RREAL  loc[2];
166          int  y;
167          register int  x, i;
168          register DATARRAY  *pp;
# Line 184 | Line 184 | char  *pname;
184                  sprintf(errmsg, "cannot open picture file \"%s\"", pfname);
185                  error(SYSTEM, errmsg);
186          }
187 < #ifdef MSDOS
188 <        setmode(fileno(fp), O_BINARY);
189 < #endif
187 >        SET_FILE_BINARY(fp);
188                                                  /* get dimensions */
189          inpaspect = 1.0;
190          getheader(fp, headaspect, (char *)&inpaspect);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines