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

Comparing ray/src/px/ximage.c (file contents):
Revision 1.6 by greg, Thu May 11 08:25:21 1989 UTC vs.
Revision 1.9 by greg, Tue Sep 12 13:04:42 1989 UTC

# Line 141 | Line 141 | char  *argv[];
141                                  /* get header */
142          getheader(fin, headline);
143                                  /* get picture dimensions */
144 <        if (fscanf(fin, "-Y %d +X %d\n", &ymax, &xmax) != 2)
144 >        if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
145                  quiterr("bad picture size");
146                                  /* set view parameters */
147          if (gotview) {
# Line 345 | Line 345 | redraw(x, y, w, h)                     /* redraw section of window */
345   int  x, y;
346   int  w, h;
347   {
348 <        if (map_rcolors(ourras) == NULL) {
348 >        if (ourras->ncolors && map_rcolors(ourras) == NULL) {
349                  fprintf(stderr, "%s: cannot allocate colors\n", progname);
350                  return(-1);
351          }
# Line 689 | Line 689 | pixel  *l;
689   }
690  
691  
692 < picreadcm(map)                  /* do gamcor correction */
692 > picreadcm(map)                  /* do gamma correction */
693   colormap  map;
694   {
695          extern double  pow();

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)