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.27 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.30 by greg, Wed Aug 7 05:10:09 2013 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include  <time.h>
11  
12   #include  "platform.h"
13 + #include  "paths.h"
14   #include  "standard.h"
15   #include  "color.h"
16   #include  "resolu.h"
# Line 19 | Line 20 | static const char      RCSid[] = "$Id$";
20                                  /* picture memory usage before warning */
21   #ifndef PSIZWARN
22   #ifdef SMLMEM
23 < #define PSIZWARN        1500000
23 > #define PSIZWARN        3000000
24   #else
25 < #define PSIZWARN        5000000
25 > #define PSIZWARN        10000000
26   #endif
27   #endif
28  
# Line 44 | Line 45 | getdata(                               /* get data array dname */
45   {
46          char  *dfname;
47          FILE  *fp;
48 <        int  asize;
48 >        int  asize=0;
49          register int  i, j;
50          register DATARRAY  *dp;
51                                                  /* look for array in list */
# Line 217 | Line 218 | getpict(                               /* get picture pname */
218          i = ns*sl*sizeof(COLR);
219   #if PSIZWARN
220          if (i > PSIZWARN) {                             /* memory warning */
221 <                sprintf(errmsg, "picture file \"%s\" using %d bytes of memory",
222 <                                pname, i);
221 >                sprintf(errmsg, "picture file \"%s\" using %.1f MB of memory",
222 >                                pname, i*(1.0/(1024*1024)));
223                  error(WARNING, errmsg);
224          }
225   #endif

Diff Legend

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