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

Comparing ray/src/px/ra_ps.c (file contents):
Revision 2.24 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.26 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include  <stdio.h>
9   #include  <math.h>
10   #include  <ctype.h>
11 < #ifdef MSDOS
12 < #include  <fcntl.h>
13 < #endif
11 >
12 > #include  "platform.h"
13   #include  "color.h"
14  
15   #define UPPER(c)        ((c)&~0x20)             /* ASCII trick */
# Line 156 | Line 155 | char  *argv[];
155                                  progname, argv[i+1]);
156                  exit(1);
157          }
158 < #ifdef MSDOS
160 <        setmode(fileno(stdin), O_BINARY);
161 < #endif
158 >        SET_FILE_BINARY(stdin);
159                                  /* get our header */
160          getheader(stdin, headline, NULL);
161          if (wrongformat || fgetresolu(&xmax, &ymax, stdin) < 0)
# Line 260 | Line 257 | char   *ps;
257                  height = atof(++s);
258                  width *= d;
259                  height *= d;
260 <                if (width >= 1. & height >= 1.)
260 >                if ((width >= 1.) & (height >= 1.))
261                          return;
262          } else                          /* check for match to standard size */
263                  for (pp = p; pp->n[0]; pp++)
# Line 303 | Line 300 | char  **av;
300          printf("%%%%Title: "); printargs(ac, av, stdout);
301          printf("%%%%Creator: %s\n", progname);
302          printf("%%%%Pages: %d\n", ncopies);
303 <        if (landscape = xmax > pixaspect*ymax)
303 >        if ( (landscape = xmax > pixaspect*ymax) )
304                  puts("%%Orientation: Landscape");
305          else
306                  puts("%%Orientation: Portrait");
307 <        if (rotate = PWIDTH > PHEIGHT ^ landscape) {
307 >        if ( (rotate = (PWIDTH > PHEIGHT) ^ landscape) ) {
308                  pwidth = PHEIGHT;
309                  pheight = PWIDTH;
310          } else {
311                  pwidth = PWIDTH;
312                  pheight = PHEIGHT;
313          }
314 <        if (dpi > 100 && pixaspect >= 0.99 & pixaspect <= 1.01)
314 >        if (dpi > 100 && (pixaspect >= 0.99) & (pixaspect <= 1.01))
315                  if (pheight/pwidth > ymax/xmax) {
316                          n = pwidth*dpi/xmax;    /* floor */
317                          iwidth = n > 0 ? (double)(n*xmax)/dpi : pwidth;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines