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

Comparing ray/src/hd/rhpict2.c (file contents):
Revision 3.9 by gwlarson, Wed Mar 10 16:15:19 1999 UTC vs.
Revision 3.12 by schorsch, Mon Jun 30 14:59:12 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1999 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Rendering routines for rhpict.
6   */
7  
8 + #include <string.h>
9 +
10   #include "holo.h"
11   #include "view.h"
12   #include "random.h"
# Line 38 | Line 37 | static char SCCSid[] = "$SunId$ SGI";
37   #define CLR4(f,i)       FL4OP(f,i,&=~)
38   #define TGL4(f,i)       FL4OP(f,i,^=)
39   #define FL4NELS(n)      (((n)+0x1f)>>5)
40 < #define CLR4ALL(f,n)    bzero((char *)(f),FL4NELS(n)*sizeof(int4))
40 > #define CLR4ALL(f,n)    memset((char *)(f),'\0',FL4NELS(n)*sizeof(int32))
41   #endif
42  
43 < static int4     *pixFlags;      /* pixel occupancy flags */
43 > static int32    *pixFlags;      /* pixel occupancy flags */
44   static float    pixWeight[MAXRAD2];     /* pixel weighting function */
45   static short    isqrttab[MAXRAD2];      /* integer square root table */
46  
# Line 64 | Line 63 | register HDBEAMI       *hb;
63          double  d, prox;
64          COLOR   col;
65          int     n;
66 <        register int4   p;
66 >        register int32  p;
67  
68          if (!hdbcoord(gc, hb->h, hb->b))
69                  error(CONSISTENCY, "bad beam in render_beam");
# Line 121 | Line 120 | int    n;
120          short   forequad[2][2];
121          int     d;
122          register int    i;
123 <        register int4   p;
123 >        register int32  p;
124  
125          if (n <= 0) {
126   #ifdef DEBUG
# Line 155 | Line 154 | int    n;
154          COLOR   mykern[MAXRAD2];
155          int     maxr2;
156          double  d;
157 <        register int4   p;
157 >        register int32  p;
158          register int    r2;
159          int     i, r, maxr, h2, v2;
160  
# Line 216 | Line 215 | double *rf;
215   {
216          float   rnt[NNEIGH];
217          double  rvar;
218 <        register int4   p, pn;
218 >        register int32  p, pn;
219          register int    ni;
220  
221          if (n <= 0)
# Line 252 | Line 251 | double ransamp;
251                  meet_neighbors(0,random_samp,&ransamp);
252          else
253                  meet_neighbors(1,smooth_samp,NULL);
254 <        free((char *)pixFlags);         /* free pixel flags */
254 >        free((void *)pixFlags);         /* free pixel flags */
255          pixFlags = NULL;
256   }
257  
258  
259   reset_flags()                   /* allocate/set/reset occupancy flags */
260   {
261 <        register int4   p;
261 >        register int32  p;
262  
263          if (pixFlags == NULL) {
264 <                pixFlags = (int4 *)calloc(FL4NELS(hres*vres), sizeof(int4));
264 >                pixFlags = (int32 *)calloc(FL4NELS(hres*vres), sizeof(int32));
265                  CHECK(pixFlags==NULL, SYSTEM, "out of memory in reset_flags");
266          } else
267                  CLR4ALL(pixFlags, hres*vres);
# Line 373 | Line 372 | char   *dp;
372                                  }
373                          }
374          }
375 <        free((char *)rnl);              /* free row list */
375 >        free((void *)rnl);              /* free row list */
376   }

Diff Legend

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