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

Comparing ray/src/hd/rhpict.c (file contents):
Revision 3.13 by schorsch, Mon Jul 21 22:30:18 2003 UTC vs.
Revision 3.14 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 56 | Line 56 | char   *argv[];
56                                  pixaspect = atof(argv[++i]);
57                          else if (argv[i][2] == 'e') {
58                                  expval = atof(argv[++i]);
59 <                                if (argv[i][0] == '-' | argv[i][0] == '+')
59 >                                if ((argv[i][0] == '-') | (argv[i][0] == '+'))
60                                          expval = pow(2., expval);
61                          } else
62                                  goto userr;
# Line 212 | Line 212 | int    fn;
212          fputs(VIEWSTR, stdout);
213          fprintview(&myview, stdout);
214          fputc('\n', stdout);
215 <        if (pa < 0.99 | pa > 1.01)
215 >        if ((pa < 0.99) | (pa > 1.01))
216                  fputaspect(pa, stdout);
217 <        if (expval < 0.99 | expval > 1.01)
217 >        if ((expval < 0.99) | (expval > 1.01))
218                  fputexpos(expval, stdout);
219          fputformat(COLRFMT, stdout);
220          fputc('\n', stdout);
# Line 292 | Line 292 | initialize()                   /* initialize holodeck and buffers */
292          mypixel = (COLOR *)bmalloc(xres*yres*sizeof(COLOR));
293          myweight = (float *)bmalloc(xres*yres*sizeof(float));
294          mydepth = (float *)bmalloc(xres*yres*sizeof(float));
295 <        if (mypixel == NULL | myweight == NULL | mydepth == NULL)
295 >        if ((mypixel == NULL) | (myweight == NULL) | (mydepth == NULL))
296                  error(SYSTEM, "out of memory in initialize");
297   }
298  

Diff Legend

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