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

Comparing ray/src/px/pcomb.c (file contents):
Revision 1.4 by greg, Tue Jul 11 18:05:05 1989 UTC vs.
Revision 1.5 by greg, Tue Sep 12 13:04:22 1989 UTC

# Line 129 | Line 129 | getfiles:
129                  fputs(input[nfiles].name, stdout);
130                  fputs(":\n", stdout);
131                  getheader(input[nfiles].fp, tputs);
132 <                if (fscanf(input[nfiles].fp, "-Y %d +X %d\n", &ypos, &xpos) != 2) {
132 >                if (fgetresolu(&xpos, &ypos, input[nfiles].fp) !=
133 >                                (YMAJOR|YDECR)) {
134                          eputs(input[nfiles].name);
135                          eputs(": bad picture size\n");
136                          quit(1);
# Line 147 | Line 148 | getfiles:
148          }
149          printargs(argc, argv, stdout);
150          putchar('\n');
151 <        printf("-Y %d +X %d\n", yres, xres);
151 >        fputresolu(YMAJOR|YDECR, xres, yres, stdout);
152          combine();
153          quit(0);
154   usage:

Diff Legend

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