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

Comparing ray/src/ot/wfconv.c (file contents):
Revision 2.3 by greg, Fri Mar 14 21:27:46 2003 UTC vs.
Revision 2.6 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 21 | Line 21 | static FVECT   *vlist;         /* our vertex list */
21   static int      nvs;            /* number of vertices in our list */
22   static FVECT    *vnlist;        /* vertex normal list */
23   static int      nvns;
24 < static FLOAT    (*vtlist)[2];   /* map vertex list */
24 > static RREAL    (*vtlist)[2];   /* map vertex list */
25   static int      nvts;
26  
27   static char     *inpfile;       /* input file name */
# Line 66 | Line 66 | char   *objfn;
66          group[0] = '\0';
67          lineno = 0; faceno = 0;
68                                          /* scan until EOF */
69 <        while (argc = getstmt(argv, fp)) {
69 >        while ( (argc = getstmt(argv, fp)) ) {
70                  switch (argv[0][0]) {
71                  case 'v':               /* vertex */
72                          switch (argv[0][1]) {
# Line 289 | Line 289 | puttri(v1, v2, v3)                     /* convert a triangle */
289   char    *v1, *v2, *v3;
290   {
291          VNDX    v1i, v2i, v3i;
292 <        FLOAT   *v1c, *v2c, *v3c;
293 <        FLOAT   *v1n, *v2n, *v3n;
292 >        RREAL   *v1c, *v2c, *v3c;
293 >        RREAL   *v1n, *v2n, *v3n;
294          
295          if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
296                  return(0);
# Line 340 | Line 340 | double x, y, z;
340                  if (nvs == 0)
341                          vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT));
342                  else
343 <                        vlist = (FVECT *)realloc((char *)vlist,
343 >                        vlist = (FVECT *)realloc((void *)vlist,
344                                          (nvs+CHUNKSIZ)*sizeof(FVECT));
345                  if (vlist == NULL)
346                          error(SYSTEM, "out of memory in newv");
# Line 361 | Line 361 | double x, y, z;
361                  if (nvns == 0)
362                          vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT));
363                  else
364 <                        vnlist = (FVECT *)realloc((char *)vnlist,
364 >                        vnlist = (FVECT *)realloc((void *)vnlist,
365                                          (nvns+CHUNKSIZ)*sizeof(FVECT));
366                  if (vnlist == NULL)
367                          error(SYSTEM, "out of memory in newvn");
# Line 382 | Line 382 | double x, y;
382   {
383          if (!(nvts%CHUNKSIZ)) {         /* allocate next block */
384                  if (nvts == 0)
385 <                        vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT));
385 >                        vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL));
386                  else
387 <                        vtlist = (FLOAT (*)[2])realloc((char *)vtlist,
388 <                                        (nvts+CHUNKSIZ)*2*sizeof(FLOAT));
387 >                        vtlist = (RREAL (*)[2])realloc((void *)vtlist,
388 >                                        (nvts+CHUNKSIZ)*2*sizeof(RREAL));
389                  if (vtlist == NULL)
390                          error(SYSTEM, "out of memory in newvt");
391          }

Diff Legend

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