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.72 by greg, Mon May 29 17:31:25 2006 UTC vs.
Revision 2.74 by greg, Fri May 20 02:06:39 2011 UTC

# Line 83 | Line 83 | int  gotview = 0;                      /* got parameters from file */
83  
84   COLR  *scanline;                        /* scan line buffer */
85   TMbright  *lscan;                       /* encoded luminance scanline */
86 < BYTE  *cscan;                           /* encoded chroma scanline */
87 < BYTE  *pscan;                           /* compute pixel scanline */
86 > uby8  *cscan;                           /* encoded chroma scanline */
87 > uby8  *pscan;                           /* compute pixel scanline */
88  
89   RESOLU  inpres;                         /* input resolution and ordering */
90   int  xmax, ymax;                        /* picture dimensions */
# Line 122 | Line 122 | char  *progname;
122  
123   char  errmsg[128];
124  
125 < BYTE  clrtab[256][3];                   /* global color map */
125 > uby8  clrtab[256][3];                   /* global color map */
126  
127  
128   Display  *thedisplay;
# Line 271 | Line 271 | main(int  argc, char  *argv[])
271                  getevent();             /* main loop */
272   userr:
273          fprintf(stderr,
274 < "Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e spec][-g gamcor][-s][-ospec][-t intvl] pic ..\n",
274 > "Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e spec][-g gamcor][-s][-ospec][-t intvl] hdr ..\n",
275                          progname);
276          exit(1);
277   }
# Line 1060 | Line 1060 | make_tonemap(void)                     /* initialize tone mapping */
1060                          goto memerr;
1061                  if (greyscale) {
1062                          cscan = TM_NOCHROM;
1063 <                        if ((pscan = (BYTE *)malloc(sizeof(BYTE)*xmax)) == NULL)
1063 >                        if ((pscan = (uby8 *)malloc(sizeof(uby8)*xmax)) == NULL)
1064                                  goto memerr;
1065 <                } else if ((pscan=cscan = (BYTE *)malloc(3*sizeof(BYTE)*xmax))
1065 >                } else if ((pscan=cscan = (uby8 *)malloc(3*sizeof(uby8)*xmax))
1066                                  == NULL)
1067                          goto memerr;
1068                                                  /* initialize tm library */
# Line 1100 | Line 1100 | tmap_colrs(            /* apply tone mapping to scanline */
1100          int  len
1101   )
1102   {
1103 <        register BYTE  *ps;
1103 >        register uby8  *ps;
1104  
1105          if (tmflags == TM_F_LINEAR) {
1106                  if (scale)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines