--- ray/src/px/pvalue.c 1989/02/02 10:49:31 1.1 +++ ray/src/px/pvalue.c 1990/01/05 17:52:54 1.3 @@ -129,14 +129,14 @@ unkopt: progname); quit(1); } - printf("-Y %d +X %d\n", yres, xres); /* resolution */ + fputresolu(YMAJOR|YDECR, xres, yres, stdout); valtopix(); } else { /* get header */ getheader(fin, checkhead); if (xres <= 0 || yres <= 0) /* get picture size */ - if (fscanf(fin, "-Y %d +X %d\n", &yres, &xres) != 2) { + if (fgetresolu(&xres, &yres, fin) != (YMAJOR|YDECR)) { fprintf(stderr, "%s: missing x and y resolution\n", progname); @@ -158,8 +158,8 @@ char *line; { if (header) fputs(line, stdout); - if (!strncmp(line, "EXPOSURE=", 9)) - exposure *= atof(line+9); + if (isexpos(line)) + exposure *= exposval(line); }