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.7 by greg, Tue May 23 10:46:32 1989 UTC vs.
Revision 1.10 by greg, Wed Sep 13 15:41:52 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) {
148 <                ourview.hresolu = xmax;
149 <                ourview.vresolu = ymax;
147 >        if (gotview)
148                  if (setview(&ourview) != NULL)
149                          gotview = 0;
150 <        }
150 >
151          if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL)
152                  quiterr("out of memory");
153  
# Line 689 | Line 687 | pixel  *l;
687   }
688  
689  
690 < picreadcm(map)                  /* do gamcor correction */
690 > picreadcm(map)                  /* do gamma correction */
691   colormap  map;
692   {
693          extern double  pow();

Diff Legend

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