ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/ambient.c
(Generate patch)

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.99 by greg, Thu Mar 3 22:44:10 2016 UTC vs.
Revision 2.101 by schorsch, Sun Mar 6 01:13:17 2016 UTC

# Line 184 | Line 184 | setambient(void)                               /* initialize calculation */
184                                          (flen - lastpos)/AMBVALSIZ);
185                          error(WARNING, errmsg);
186                          fseek(ambfp, lastpos, SEEK_SET);
187 – #ifndef _WIN32 /* XXX we need a replacement for that one */
187                          ftruncate(fileno(ambfp), (off_t)lastpos);
189 – #endif
188                  }
189          } else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
190                  initambfile(1);                 /* else create new file */
# Line 217 | Line 215 | ambdone(void)                  /* close ambient file and free memory
215          }
216                                          /* free ambient tree */
217          unloadatree(&atrunk, avfree);
220 –        freeambtree(NULL);
218                                          /* reset state variables */
219          avsum = 0.;
220          navsum = 0;
# Line 1085 | Line 1082 | freeambtree(                   /* free 8 ambient tree structs */
1082          AMBTREE  *atp
1083   )
1084   {
1085 <        if (atp == NULL) {      /* freeing free list? */
1089 <                while ((atp = atfreelist) != NULL) {
1090 <                        atfreelist = atp->kid;
1091 <                        free(atp);
1092 <                }
1093 <                return;
1094 <        }
1095 <        atp->kid = atfreelist;  /* else push node onto free list */
1085 >        atp->kid = atfreelist;
1086          atfreelist = atp;
1087   }
1088  

Diff Legend

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