ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.8 by greg, Mon Mar 10 17:26:26 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 52 | Line 49 | dfname(il, c)                  /* return data file name */
49   struct illum_args  *il;
50   int  c;
51   {
55 –        extern char  *getpath(), *strcpy();
52          char  fname[MAXSTR];
53          register char  *s;
54  
# Line 122 | Line 118 | FVECT  u, v, w;
118                                  il->matname, DSTSUF);
119                  printf("\n5 noneg");
120                  dfp = dfopen(il, 0);
121 <                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.+.5/n, .5/n, n+1,
121 >                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
122 >                                1.+.5/n, .5/n, n+1,
123                                  0., 2.*PI, m+1);
124                  brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp);
125                  brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
# Line 136 | Line 133 | FVECT  u, v, w;
133          printf("\t%f\t%f\t%f\n", v[0], v[1], v[2]);
134          printf("\t%f\t%f\t%f\n", w[0], w[1], w[2]);
135          il->dfnum++;
136 <        free((char *)Ninv);
136 >        free((void *)Ninv);
137   }
138  
139  
# Line 151 | Line 148 | int  n, m;
148  
149          if ((Ninv = (float *)malloc(3*m*sizeof(float))) == NULL ||
150                          (Sinv = (float *)malloc(3*m*sizeof(float))) == NULL)
151 <                error(SYSTEM, "out of memory in flatout");
151 >                error(SYSTEM, "out of memory in roundout");
152          compinv(Ninv, da, m);
153          compinv(Sinv, da+3*m*(n-1), m);
154          if (il->flags & IL_COLDST) {
# Line 175 | Line 172 | int  n, m;
172                                  il->matname, DSTSUF);
173                  printf("\n5 noneg");
174                  dfp = dfopen(il, 0);
175 <                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n,
175 >                fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
176 >                                1.+1./n, -1.-1./n, n+2,
177                                  0., 2.*PI, m+1);
178                  brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp);
179                  brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
# Line 187 | Line 185 | int  n, m;
185          printf("\n\t%s il_alt il_azi", FNCFNM);
186          printf("\n0\n0\n");
187          il->dfnum++;
188 <        free((char *)Ninv);
189 <        free((char *)Sinv);
188 >        free((void *)Ninv);
189 >        free((void *)Sinv);
190   }
191  
192  

Diff Legend

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