ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.52 by gwlarson, Mon Aug 17 18:00:11 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 736 | Line 733 | XKeyPressedEvent  *ekey;
733          case 't':                               /* trace */
734                  return(traceray(ekey->x, ekey->y));
735          case 'a':                               /* auto exposure */
736 +                if (fname == NULL)
737 +                        return(-1);
738                  tmflags = TM_F_CAMERA;
739                  strcpy(buf, "auto exposure...");
740                  goto remap;
741          case 'h':                               /* human response */
742 +                if (fname == NULL)
743 +                        return(-1);
744                  tmflags = TM_F_HUMAN;
745                  strcpy(buf, "human exposure...");
746                  goto remap;

Diff Legend

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