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.5 by greg, Fri Oct 9 10:26:28 1992 UTC vs.
Revision 2.9 by greg, Thu Apr 14 05:02:06 1994 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 51 | Line 49 | char  **argv;
49          extern char  *getenv();
50          FVECT  bbmin, bbmax;
51          char  *infile = NULL;
52 +        int  inpfrozen = 0;
53          int  outflags = IO_ALL;
54          OBJECT  startobj;
55          int  i;
56  
57          progname = argv[0] = fixargv0(argv[0]);
58  
60 –        if ((libpath = getenv(ULIBVAR)) == NULL)
61 –                libpath = DEFPATH;
62 –
59          initotypes();
60  
61          for (i = 1; i < argc && argv[i][0] == '-'; i++)
62                  switch (argv[i][1]) {
63                  case '\0':                              /* scene from stdin */
64 +                        outflags &= ~IO_FILES;
65                          goto breakopt;
66                  case 'i':                               /* input octree */
67                          infile = argv[++i];
# Line 100 | Line 97 | breakopt:
97                  if (thescene.cusize > FTINY)
98                          error(USER, "only one of '-b' or '-i'");
99                  nfiles = readoct(infile, IO_ALL, &thescene, ofname);
100 <                if (nfiles == 0 && outflags & IO_FILES) {
101 <                        error(WARNING, "frozen octree");
102 <                        outflags &= ~IO_FILES;
103 <                }
104 <        }
108 <
109 <        printargs(argc, argv, stdout);  /* info. header */
100 >                if (nfiles == 0)
101 >                        inpfrozen++;
102 >        } else
103 >                newheader("RADIANCE", stdout);  /* new binary file header */
104 >        printargs(argc, argv, stdout);
105          fputformat(OCTFMT, stdout);
106          printf("\n");
107  
# Line 123 | Line 118 | breakopt:
118                  }
119  
120          ofname[nfiles] = NULL;
121 +
122 +        if (inpfrozen && outflags & IO_FILES) {
123 +                error(WARNING, "frozen octree");
124 +                outflags &= ~IO_FILES;
125 +        }
126                                                  /* find bounding box */
127          bbmin[0] = bbmin[1] = bbmin[2] = FHUGE;
128          bbmax[0] = bbmax[1] = bbmax[2] = -FHUGE;

Diff Legend

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