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

Comparing ray/src/cv/arch2rad.c (file contents):
Revision 1.6 by greg, Mon Mar 11 13:10:26 1991 UTC vs.
Revision 2.2 by greg, Sat Feb 22 02:07:23 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1990 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   * Convert Architrion file to Radiance
6   *
# Line 12 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9  
10   #include <stdio.h>
11  
12 + #include <stdlib.h>
13 +
14   #include "trans.h"
15  
16   #define DEFMAPFILE      "/usr/local/lib/ray/lib/arch.map"
# Line 348 | Line 347 | register BLOCK *bp;
347          if (bp->nopenings > 0) {
348                  for (i = 0; i < bp->nopenings; i++)
349                          doneid(&bp->opening[i].frame);
350 <                free((char *)bp->opening);
350 >                free((void *)bp->opening);
351          }
352          doneid(&bp->refid);
353   }
# Line 426 | Line 425 | FILE   *fp;
425                                          /* check for repeats */
426          rept = 0; nrepts = 0;
427          for (i = 0; i < nm; i++) {
428 <                if (ml[i] == sm) {
428 >                if (ml[i] == sm || !strcmp(ml[i], VOIDID)) {
429                          rept |= 1<<i;
430                          nrepts++;
431 +                        continue;
432                  }
433                  for (j = 0; j < i; j++)
434 <                        if (ml[j] == ml[i]) {
434 >                        if (!(rept & 1<<j) && ml[j] == ml[i]) {
435                                  rept |= 1<<j;
436                                  nrepts++;
437                          }
438          }
439                                          /* print antimatter and modlist */
440 <        fprintf(fp, "\nvoid antimatter %s\n", openmod);
440 >        fprintf(fp, "\n%s antimatter %s\n", VOIDID, openmod);
441          fprintf(fp, "%d %s", 1+nm-nrepts, sm);
442          for (i = 0; i < nm; i++)
443                  if (!(rept & 1<<i))
# Line 705 | Line 705 | FILE   *fp;
705   }
706  
707  
708 + void
709   eputs(s)
710   char    *s;
711   {
# Line 712 | Line 713 | char   *s;
713   }
714  
715  
716 + void
717   quit(code)
718   int     code;
719   {

Diff Legend

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