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

Comparing ray/src/util/findglare.c (file contents):
Revision 1.24 by greg, Tue Jul 30 15:42:56 1991 UTC vs.
Revision 2.3 by greg, Fri Nov 13 13:19:16 1992 UTC

# Line 12 | Line 12 | static char SCCSid[] = "$SunId$ LBL";
12  
13   #include "glare.h"
14  
15 < #define FEQ(a,b)        ((a)-(b)<=FTINY&&(a)-(b)<=FTINY)
15 > #define FEQ(a,b)        ((a)-(b)<=FTINY&&(b)-(a)<=FTINY)
16   #define VEQ(v1,v2)      (FEQ((v1)[0],(v2)[0])&&FEQ((v1)[1],(v2)[1]) \
17                                  &&FEQ((v1)[2],(v2)[2]))
18  
# Line 75 | Line 75 | char   *argv[];
75                          }
76                          if (argv[i][2] != 'f')
77                                  goto userr;
78 <                        rval = viewfile(argv[++i], &ourview, 0, 0);
78 >                        rval = viewfile(argv[++i], &ourview, NULL);
79                          if (rval < 0) {
80                                  fprintf(stderr,
81                                  "%s: cannot open view file \"%s\"\n",
# Line 106 | Line 106 | char   *argv[];
106                          break;
107                  case 'd':
108                  case 'l':
109 +                case 's':
110                          rtargv[rtargc++] = argv[i];
111                          rtargv[rtargc++] = argv[++i];
112                          break;
# Line 130 | Line 131 | char   *argv[];
131          }
132                                                  /* get view */
133          if (picture != NULL) {
134 <                rval = viewfile(picture, &pictview, 0, 0);
134 >                rval = viewfile(picture, &pictview, NULL);
135                  if (rval < 0) {
136                          fprintf(stderr, "%s: cannot open picture file \"%s\"\n",
137                                          progname, picture);
# Line 305 | Line 306 | cleanup()                              /* close files, wait for children */
306          if (octree != NULL)
307                  done_rtrace();
308          if (npixinvw < 100*npixmiss)
309 <                fprintf(stderr, "%s: warning -- missing %ld%% of samples\n",
310 <                                progname, 100L*npixmiss/npixinvw);
309 >                fprintf(stderr, "%s: warning -- missing %d%% of samples\n",
310 >                                progname, (int)(100L*npixmiss/npixinvw));
311   }
312  
313  

Diff Legend

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