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 2.4 by greg, Tue Apr 28 09:40:36 1992 UTC vs.
Revision 2.11 by greg, Tue May 13 17:58:33 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1987 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  ximage.c - driver for X-windows
6   *
# Line 21 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18  
19   #include  <ctype.h>
20  
21 + #include  <time.h>
22 +
23   #include  "color.h"
24  
25   #include  "resolu.h"
# Line 86 | Line 85 | char  *progname;
85  
86   char  errmsg[128];
87  
89 – extern long  ftell();
88  
91 – extern char  *malloc(), *calloc();
92 –
93 – extern double  pow(), log();
94 –
95 –
89   main(argc, argv)
90   int  argc;
91   char  *argv[];
92   {
93 +        extern char  *getenv();
94 +        char  *gv;
95          int  headline();
96          int  i;
97          
98          progname = argv[0];
99 +        if ((gv = getenv("DISPLAY_GAMMA")) != NULL)
100 +                gamcor = atof(gv);
101  
102          for (i = 1; i < argc; i++)
103                  if (argv[i][0] == '-')
# Line 167 | Line 164 | userr:
164   }
165  
166  
167 + int
168   headline(s)             /* get relevant info from header */
169   char  *s;
170   {
# Line 179 | Line 177 | char  *s;
177                  wrongformat = strcmp(fmt, COLRFMT);
178          } else if (isview(s) && sscanview(&ourview, s) > 0)
179                  gotview++;
180 +        return(0);
181   }
182  
183  
# Line 247 | Line 246 | char  *err;
246   }
247  
248  
249 + void
250   eputs(s)
251   char    *s;
252   {
# Line 254 | Line 254 | char   *s;
254   }
255  
256  
257 + void
258   quit(code)
259   int  code;
260   {
# Line 567 | Line 568 | getmono()                      /* get monochrome data */
568                          cerr[x] = err + errp;
569                  }
570          }
571 <        free((char *)inl);
572 <        free((char *)cerr);
571 >        free((void *)inl);
572 >        free((void *)cerr);
573   }
574  
575  
# Line 596 | Line 597 | colormap       cmap;
597                          xr->cdefs[xr->ncolors].pixel = *p;
598                          xr->pmap[*p] = xr->ncolors++;
599                  }
600 <        xr->cdefs = (Color *)realloc((char *)xr->cdefs, xr->ncolors*sizeof(Color));
600 >        xr->cdefs = (Color *)realloc((void *)xr->cdefs, xr->ncolors*sizeof(Color));
601          if (xr->cdefs == NULL)
602                  return(0);
603          return(1);
# Line 640 | Line 641 | int  y;
641                  if (fseek(fin, scanpos[y], 0) == -1)
642                          quiterr("fseek error");
643                  cury = y;
644 <        } else if (scanpos != NULL)
644 >        } else if (scanpos != NULL && scanpos[y] == -1)
645                  scanpos[y] = ftell(fin);
646  
647          if (freadcolrs(scanline, xmax, fin) < 0)
# Line 673 | Line 674 | picwriteline(y, l)             /* add 8-bit scanline to image */
674   int  y;
675   pixel  *l;
676   {
677 <        bcopy((char *)l, (char *)ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
677 >        bcopy((void *)l, (void *)ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
678   }
679  
680  

Diff Legend

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