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.26 by schorsch, Fri Jan 2 11:43:42 2004 UTC vs.
Revision 2.28 by schorsch, Sat Oct 23 18:55:52 2004 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"
17 + #include  "view.h"
18   #include  "data.h"
19  
20                                  /* picture memory usage before warning */
# Line 36 | Line 38 | static DATARRAY         *dtab[TABSIZ];         /* data array list */
38   static gethfunc headaspect;
39  
40  
41 < DATARRAY *
42 < getdata(dname)                          /* get data array dname */
43 < char  *dname;
41 > extern DATARRAY *
42 > getdata(                                /* get data array dname */
43 >        char  *dname
44 > )
45   {
46          char  *dfname;
47          FILE  *fp;
# Line 136 | Line 139 | scanerr:
139          sprintf(errmsg, "%s in data file \"%s\"",
140                          feof(fp) ? "unexpected EOF" : "bad format", dfname);
141          error(USER, errmsg);
142 +        return NULL; /* pro forma return */
143   }
144  
145  
# Line 155 | Line 159 | headaspect(                    /* check string for aspect ratio */
159   }
160  
161  
162 < DATARRAY *
163 < getpict(pname)                          /* get picture pname */
164 < char  *pname;
162 > extern DATARRAY *
163 > getpict(                                /* get picture pname */
164 >        char  *pname
165 > )
166   {
167          double  inpaspect;
168          char  *pfname;
# Line 249 | Line 254 | memerr:
254   readerr:
255          sprintf(errmsg, "bad picture file \"%s\"", pfname);
256          error(USER, errmsg);
257 +        return NULL; /* pro forma return */
258   }
259  
260  
261 < void
262 < freedata(dta)                   /* release data array reference */
263 < DATARRAY  *dta;
261 > extern void
262 > freedata(                       /* release data array reference */
263 >        DATARRAY  *dta
264 > )
265   {
266          DATARRAY  head;
267          int  hval, nents;
# Line 288 | Line 295 | DATARRAY  *dta;
295   }
296  
297  
298 < double
299 < datavalue(dp, pt)               /* interpolate data value at a point */
300 < register DATARRAY  *dp;
301 < double  *pt;
298 > extern double
299 > datavalue(              /* interpolate data value at a point */
300 >        register DATARRAY  *dp,
301 >        double  *pt
302 > )
303   {
304          DATARRAY  sd;
305          int  asize;

Diff Legend

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