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

Comparing ray/src/px/ximage.c (file contents):
Revision 1.8 by greg, Mon Jul 24 10:45:12 1989 UTC vs.
Revision 1.11 by greg, Tue Oct 3 09:11:43 1989 UTC

# Line 38 | Line 38 | static char SCCSid[] = "$SunId$ LBL";
38   #define  BORWIDTH       5               /* border width */
39   #define  BARHEIGHT      25              /* menu bar size */
40  
41 < double  gamcor = 2.0;                   /* gamma correction */
41 > double  gamcor = 2.2;                   /* gamma correction */
42  
43   XRASTER  *ourras = NULL;                /* our stored raster image */
44  
# 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  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines