ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.21 by schorsch, Thu Jun 26 00:58:10 2003 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)