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

Comparing ray/src/gen/mkillum3.c (file contents):
Revision 2.5 by greg, Wed Aug 12 14:18:04 1992 UTC vs.
Revision 2.7 by greg, Sat Feb 22 02:07:24 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Routines to print mkillum objects
6   */
# Line 122 | Line 119 | FVECT  u, v, w;
119                                  il->matname, DSTSUF);
120                  printf("\n5 noneg");
121                  dfp = dfopen(il, 0);
122 <                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.+.5/n, .5/n, n+1,
122 >                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
123 >                                1.+.5/n, .5/n, n+1,
124                                  0., 2.*PI, m+1);
125                  brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp);
126                  brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
# Line 136 | Line 134 | FVECT  u, v, w;
134          printf("\t%f\t%f\t%f\n", v[0], v[1], v[2]);
135          printf("\t%f\t%f\t%f\n", w[0], w[1], w[2]);
136          il->dfnum++;
137 <        free((char *)Ninv);
137 >        free((void *)Ninv);
138   }
139  
140  
# Line 151 | Line 149 | int  n, m;
149  
150          if ((Ninv = (float *)malloc(3*m*sizeof(float))) == NULL ||
151                          (Sinv = (float *)malloc(3*m*sizeof(float))) == NULL)
152 <                error(SYSTEM, "out of memory in flatout");
152 >                error(SYSTEM, "out of memory in roundout");
153          compinv(Ninv, da, m);
154          compinv(Sinv, da+3*m*(n-1), m);
155          if (il->flags & IL_COLDST) {
# Line 175 | Line 173 | int  n, m;
173                                  il->matname, DSTSUF);
174                  printf("\n5 noneg");
175                  dfp = dfopen(il, 0);
176 <                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n,
176 >                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
177 >                                1.+1./n, -1.-1./n, n+2,
178                                  0., 2.*PI, m+1);
179                  brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp);
180                  brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
# Line 187 | Line 186 | int  n, m;
186          printf("\n\t%s il_alt il_azi", FNCFNM);
187          printf("\n0\n0\n");
188          il->dfnum++;
189 <        free((char *)Ninv);
190 <        free((char *)Sinv);
189 >        free((void *)Ninv);
190 >        free((void *)Sinv);
191   }
192  
193  

Diff Legend

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