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

Comparing ray/src/util/glareval.c (file contents):
Revision 1.21 by greg, Mon Nov 11 15:09:42 1991 UTC vs.
Revision 2.9 by schorsch, Mon Jun 30 14:59:13 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 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   * Compute pixels for glare calculation
6   */
7  
8 + #include "copyright.h"
9 +
10 + #include <string.h>
11 +
12 + #include "rtprocess.h" /* Windows: must come first because of conflicts */
13   #include "glare.h"
14 < #include "resolu.h"
14 >
15                                          /* maximum rtrace buffer size */
16   #define MAXPIX          (4096/(6*sizeof(float)))
17  
# Line 17 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19   #define HSIZE           317     /* size of scanline hash table */
20   #define NRETIRE         16      /* number of scanlines to retire at once */
21  
22 < int     rt_pd[3] = {-1,-1,-1};  /* process id & descriptors for rtrace */
22 > static SUBPROC  rt_pd = SP_INACTIVE; /* process id & descriptors for rtrace */
23  
24   FILE    *pictfp = NULL;         /* picture file pointer */
25   double  exposure;               /* picture exposure */
# Line 41 | Line 43 | static int     maxpix;         /* maximum number of pixels to buf
43   static SCAN     *freelist;              /* scanline free list */
44   static SCAN     *hashtab[HSIZE];        /* scanline hash table */
45  
46 + static long     scanbufsiz;             /* size of allocated scanline buffer */
47 +
48   static long     ncall = 0L;     /* number of calls to getpictscan */
49   static long     nread = 0L;     /* number of scanlines read */
50   static long     nrecl = 0L;     /* number of scanlines reclaimed */
# Line 184 | Line 188 | int    vh, vv;
188          npixinvw++;
189          if ((res = pict_val(dir)) >= 0.0)
190                  return(res);
191 <        if (rt_pd[0] == -1) {
191 >        if (rt_pd.r == -1) {
192                  npixmiss++;
193                  return(-1.0);
194          }
# Line 223 | Line 227 | float  *vb;
227                  npixinvw++;
228                  if ((vb[vh+hsize] = pict_val(dir)) >= 0.0)
229                          continue;
230 <                if (rt_pd[0] == -1) {           /* missing information */
230 >                if (rt_pd.r == -1) {            /* missing information */
231                          npixmiss++;
232                          continue;
233                  }
# Line 262 | Line 266 | int    np;
266                  fprintf(stderr, "%s: sending %d samples to rtrace...\n",
267                                  progname, np);
268   #endif
269 <        bzero(pb+6*np, 6*sizeof(float));
270 <        if (process(rt_pd, pb, pb, 3*sizeof(float)*np,
271 <                        6*sizeof(float)*(np+1)) < 3*sizeof(float)*np) {
269 >        memset(pb+6*np, '\0', 6*sizeof(float));
270 >        if (process(&rt_pd, (char *)pb, (char *)pb, 3*sizeof(float)*(np+1),
271 >                        6*sizeof(float)*(np+1)) < 3*sizeof(float)*(np+1)) {
272                  fprintf(stderr, "%s: rtrace communication error\n",
273                                  progname);
274                  exit(1);
# Line 272 | Line 276 | int    np;
276   }
277  
278  
279 + int
280   getexpos(s)                     /* get exposure from header line */
281   char    *s;
282   {
# Line 283 | Line 288 | char   *s;
288                  formatval(fmt, s);
289                  wrongformat = strcmp(fmt, COLRFMT);
290          }
291 +        return(0);
292   }
293  
294  
# Line 290 | Line 296 | open_pict(fn)                  /* open picture file */
296   char    *fn;
297   {
298          if ((pictfp = fopen(fn, "r")) == NULL) {
299 <                fprintf("%s: cannot open\n", fn);
299 >                fprintf(stderr, "%s: cannot open\n", fn);
300                  exit(1);
301          }
302          exposure = 1.0;
# Line 318 | Line 324 | char   *av[];
324   {
325          int     rval;
326  
327 <        rval = open_process(rt_pd, av);
327 >        rval = open_process(&rt_pd, av);
328          if (rval < 0) {
329                  perror(progname);
330                  exit(1);
# Line 338 | Line 344 | done_rtrace()                  /* wait for rtrace to finish */
344   {
345          int     status;
346  
347 <        status = close_process(rt_pd);
347 >        status = close_process(&rt_pd);
348          if (status > 0) {
349                  fprintf(stderr, "%s: bad status (%d) from rtrace\n",
350                                  progname, status);
351                  exit(1);
352          }
353 <        rt_pd[0] = -1;
353 >        rt_pd.r = -1;
354   }
355  
356  
# Line 398 | Line 404 | initscans()                            /* initialize scanline buffers */
404          register SCAN   *ptr;
405          register int    i;
406                                          /* initialize positions */
407 <        scanpos = (long *)malloc(pysiz*sizeof(long));
407 >        scanpos = (long *)bmalloc(pysiz*sizeof(long));
408          if (scanpos == NULL)
409                  memerr("scanline positions");
410          for (i = pysiz-1; i >= 0; i--)
# Line 409 | Line 415 | initscans()                            /* initialize scanline buffers */
415                  hashtab[i] = NULL;
416                                          /* allocate scanline buffers */
417          scansize = sizeof(SCAN) + pxsiz*sizeof(COLR);
418 < #ifdef ALIGN
419 <        scansize = scansize+(sizeof(ALIGN)-1) & ~(sizeof(ALIGN)-1);
418 > #ifdef ALIGNT
419 >        scansize = scansize+(sizeof(ALIGNT)-1) & ~(sizeof(ALIGNT)-1);
420   #endif
421          i = MAXSBUF / scansize;         /* compute number to allocate */
422          if (i > HSIZE)
423                  i = HSIZE;
424 <        scan_buf = malloc(i*scansize);  /* get in one big chunk */
424 >        scanbufsiz = i*scansize;
425 >        scan_buf = bmalloc(scanbufsiz); /* get in one big chunk */
426          if (scan_buf == NULL)
427                  memerr("scanline buffers");
428          ptr = (SCAN *)scan_buf;
# Line 432 | Line 439 | initscans()                            /* initialize scanline buffers */
439  
440   donescans()                             /* free up scanlines */
441   {
442 <        free(scan_buf);
443 <        free((char *)scanpos);
442 >        bfree(scan_buf, scanbufsiz);
443 >        bfree((char *)scanpos, pysiz*sizeof(long));
444   }

Diff Legend

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