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

Comparing ray/src/px/x11image.c (file contents):
Revision 2.50 by gregl, Thu Jul 31 21:00:57 1997 UTC vs.
Revision 2.53 by gwlarson, Tue Oct 27 09:08:28 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 29 | Line 29 | static char SCCSid[] = "$SunId$ SGI";
29  
30   #undef  NOPROTO
31   #define NOPROTO 1
32 + #include  "color.h"
33   #include  "tonemap.h"
34   #include  "view.h"
35   #include  "x11raster.h"
36   #include  "random.h"
37   #include  "resolu.h"
38  
38 #ifndef  int4
39 #define  int4           int             /* most int's are 32-bit */
40 #endif
41
39   #define  FONTNAME       "8x13"          /* text font we'll use */
40  
41   #define  CTRL(c)        ((c)-'@')
# Line 253 | Line 250 | userr:
250   }
251  
252  
253 + int
254   headline(s)             /* get relevant info from header */
255   char  *s;
256   {
# Line 264 | Line 262 | char  *s;
262                  wrongformat = strcmp(fmt, COLRFMT);
263          else if (isview(s) && sscanview(&ourview, s) > 0)
264                  gotview++;
265 +        return(0);
266   }
267  
268  
# Line 736 | Line 735 | XKeyPressedEvent  *ekey;
735          case 't':                               /* trace */
736                  return(traceray(ekey->x, ekey->y));
737          case 'a':                               /* auto exposure */
738 +                if (fname == NULL)
739 +                        return(-1);
740                  tmflags = TM_F_CAMERA;
741                  strcpy(buf, "auto exposure...");
742                  goto remap;
743          case 'h':                               /* human response */
744 +                if (fname == NULL)
745 +                        return(-1);
746                  tmflags = TM_F_HUMAN;
747                  strcpy(buf, "human exposure...");
748                  goto remap;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines