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

Comparing src/common/readoct.c (file contents):
Revision 1.11 by greg, Thu Feb 7 11:00:42 1991 UTC vs.
Revision 1.12 by greg, Thu Apr 18 13:01:28 1991 UTC

# Line 37 | Line 37 | int  load;
37   CUBE  *scene;
38   char  *ofn[];
39   {
40 +        extern int  fputs();
41          char  sbuf[512];
42          int  nf;
43          OBJECT  fnobjects;
# Line 54 | Line 55 | char  *ofn[];
55                  }
56          }
57                                          /* get header */
58 <        if (load & IO_INFO)
59 <                copyheader(infp, stdout);
59 <        else
60 <                getheader(infp, NULL);
58 >        if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
59 >                octerror(USER, "not an octree");
60                                          /* check format */
61          if (getint(2) != OCTMAGIC)
62 <                octerror(USER, "invalid octree format");
62 >                octerror(USER, "incompatible octree format");
63                                          /* get boundaries */
64          if (load & IO_BOUNDS) {
65                  for (i = 0; i < 3; i++)

Diff Legend

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