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

Comparing ray/src/px/pcompos.c (file contents):
Revision 1.9 by greg, Fri May 31 10:21:31 1991 UTC vs.
Revision 2.2 by greg, Thu Dec 19 14:51:50 1991 UTC

# Line 14 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14  
15   #include  "color.h"
16  
17 + #include  "resolu.h"
18  
19   #define  MAXFILE        32
20  
# Line 69 | Line 70 | main(argc, argv)
70   int  argc;
71   char  *argv[];
72   {
72 –        double  atof();
73          int  ncolumns = 0;
74          int  autolabel = 0;
75          int  curcol = 0, curx = 0, cury = 0;
# Line 181 | Line 181 | getfile:
181                  }
182                                                  /* get picture size */
183                  if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
184 <                                input[nfile].fp) != (YMAJOR|YDECR)) {
184 >                                input[nfile].fp) < 0) {
185                          fprintf(stderr, "%s: bad picture size\n",
186                                          input[nfile].name);
187                          quit(1);
# Line 229 | Line 229 | getfile:
229                                          /* add new header info. */
230          printargs(argc, argv, stdout);
231          fputformat(COLRFMT, stdout);
232 <        printf("\n-Y %d +X %d\n", ysiz, xsiz);
232 >        putchar('\n');
233 >        fprtresolu(xsiz, ysiz, stdout);
234  
235          compos();
236          
# Line 338 | Line 339 | int  *xp, *yp;
339                  return(NULL);
340          if (checkheader(fp, COLRFMT, NULL) < 0)
341                  goto err;
342 <        if (fgetresolu(xp, yp, fp) != (YMAJOR|YDECR))
342 >        if (fgetresolu(xp, yp, fp) < 0)
343                  goto err;
344          return(fp);
345   err:

Diff Legend

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