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

Comparing ray/src/ot/oconv.c (file contents):
Revision 2.6 by greg, Fri Feb 12 18:43:24 1993 UTC vs.
Revision 2.10 by greg, Fri Jan 6 10:13:04 1995 UTC

# Line 26 | Line 26 | static char SCCSid[] = "$SunId$ LBL";
26  
27   char  *progname;                        /* argv[0] */
28  
29 char  *libpath;                         /* library search path */
30
29   int  nowarn = 0;                        /* supress warnings? */
30  
31   int  objlim = 5;                        /* # of objects before split */
# Line 46 | Line 44 | int  (*addobjnotify[])() = {NULL};     /* new object notif
44  
45   main(argc, argv)                /* convert object files to an octree */
46   int  argc;
47 < char  **argv;
47 > char  *argv[];
48   {
51        extern char  *getenv();
49          FVECT  bbmin, bbmax;
50          char  *infile = NULL;
51          int  inpfrozen = 0;
# Line 58 | Line 55 | char  **argv;
55  
56          progname = argv[0] = fixargv0(argv[0]);
57  
61        if ((libpath = getenv(ULIBVAR)) == NULL)
62                libpath = DEFPATH;
63
58          initotypes();
59  
60          for (i = 1; i < argc && argv[i][0] == '-'; i++)
61                  switch (argv[i][1]) {
62                  case '\0':                              /* scene from stdin */
69                        outflags &= ~IO_FILES;
63                          goto breakopt;
64                  case 'i':                               /* input octree */
65                          infile = argv[++i];
# Line 104 | Line 97 | breakopt:
97                  nfiles = readoct(infile, IO_ALL, &thescene, ofname);
98                  if (nfiles == 0)
99                          inpfrozen++;
100 <        }
101 <
102 <        printargs(argc, argv, stdout);  /* info. header */
100 >        } else
101 >                newheader("RADIANCE", stdout);  /* new binary file header */
102 >        printargs(argc, argv, stdout);
103          fputformat(OCTFMT, stdout);
104          printf("\n");
105  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines