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

Comparing ray/src/common/readoct.c (file contents):
Revision 1.5 by greg, Sun Apr 23 19:38:51 1989 UTC vs.
Revision 1.11 by greg, Thu Feb 7 11:00:42 1991 UTC

# Line 18 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18  
19   #include  "otypes.h"
20  
21 < double  atof();
22 < double  getflt();
23 < long  getint();
24 < char  *getstr();
25 < OCTREE  getfullnode(), gettree();
21 > extern double  atof();
22 > static double  getflt();
23 > static long  getint();
24 > static char  *getstr();
25 > static OCTREE  getfullnode(), gettree();
26  
27   static char  *infn;                     /* input file name */
28   static FILE  *infp;                     /* input file stream */
# Line 37 | Line 37 | int  load;
37   CUBE  *scene;
38   char  *ofn[];
39   {
40 <        char  sbuf[128];
40 >        char  sbuf[512];
41          int  nf;
42 +        OBJECT  fnobjects;
43          register int  i;
44          
45          if (fname == NULL) {
# Line 80 | Line 81 | char  *ofn[];
81          }
82          if (load & IO_FILES)
83                  ofn[nf] = NULL;
84 +                                        /* get number of objects */
85 +        fnobjects = getint(sizeof(OBJECT));
86  
87          if (load & IO_TREE) {
88                                                  /* get the octree */
# Line 97 | Line 100 | char  *ofn[];
100                  }
101          }
102          fclose(infp);
103 +                                        /* consistency checks */
104 +        if (load & IO_SCENE) {
105 +                                        /* check object count */
106 +                if (nobjects != objorig+fnobjects)
107 +                        octerror(USER, "bad object count; octree stale?");
108 +                                        /* check for non-surfaces */
109 +                if (nonsurfinset(objorig, fnobjects))
110 +                        octerror(USER, "non-surface in set; octree stale?");
111 +        }
112          return(nf);
113   }
114  
# Line 139 | Line 151 | register int  siz;
151          register int  c;
152          register long  r;
153  
154 <        c = getc(infp);
155 <        r = c&0x80 ? -1L : 0L;          /* sign extend */
156 <        ungetc(c, infp);
157 <        while (siz--) {
154 >        if ((c = getc(infp)) == EOF)
155 >                goto end_file;
156 >        r = 0x80&c ? -1<<8|c : c;               /* sign extend */
157 >        while (--siz > 0) {
158                  if ((c = getc(infp)) == EOF)
159 <                        octerror(USER, "truncated octree");
159 >                        goto end_file;
160                  r <<= 8;
161                  r |= c;
162          }
163          return(r);
164 + end_file:
165 +        octerror(USER, "truncated octree");
166   }
167  
168  
# Line 159 | Line 173 | getflt()                       /* get a floating point number */
173          double  d;
174  
175          d = (double)getint(4)/0x7fffffff;
176 <        return(ldexp(d, getint(1)));
176 >        return(ldexp(d, (int)getint(1)));
177   }
178          
179  

Diff Legend

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