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

Comparing ray/src/hd/rhd_odraw.c (file contents):
Revision 3.14 by greg, Tue Mar 4 05:49:21 2003 UTC vs.
Revision 3.15 by greg, Fri Jun 20 00:25:49 2003 UTC

# Line 47 | Line 47 | static int     needmapping;    /* what needs doing with tone
47  
48  
49   #define SAMP32  (32*(2*sizeof(short)+sizeof(union ODfunion)+sizeof(TMbright)+\
50 <                        6*sizeof(BYTE))+sizeof(int4))
50 >                        6*sizeof(BYTE))+sizeof(int32))
51  
52   int
53   odInit(n)                               /* initialize drawing routines */
# Line 87 | Line 87 | int    n;
87                          return(0);
88                                  /* assign larger alignment types earlier */
89                  odS.f = (union ODfunion *)odS.base;
90 <                odS.redraw = (int4 *)(odS.f + n);
90 >                odS.redraw = (int32 *)(odS.f + n);
91                  odS.ip = (short (*)[2])(odS.redraw + n/32);
92                  odS.brt = (TMbright *)(odS.ip + n);
93                  odS.chr = (BYTE (*)[3])(odS.brt + n);
# Line 117 | Line 117 | int    n;
117                  if (odView[i].vlow < 1) odView[i].vlow = 1;
118                  odView[i].emap = NULL;
119                  odView[i].dmap = NULL;
120 <                odView[i].pmap = (int4 *)calloc(FL4NELS(res[0]*res[1]),
121 <                                sizeof(int4));
120 >                odView[i].pmap = (int32 *)calloc(FL4NELS(res[0]*res[1]),
121 >                                sizeof(int32));
122                  if (odView[i].pmap == NULL)
123                          return(0);
124                  j = odView[i].hlow*odView[i].vlow;
# Line 387 | Line 387 | GLfloat        *dm;
387                          "bad view number in odDepthMap");
388          odView[vn].dmap = dm;                   /* initialize edge map */
389          if (odView[vn].emap == NULL) {
390 <                odView[vn].emap = (int4 *)malloc(
391 <                        FL4NELS(odView[vn].hlow*odView[vn].vlow)*sizeof(int4));
390 >                odView[vn].emap = (int32 *)malloc(
391 >                        FL4NELS(odView[vn].hlow*odView[vn].vlow)*sizeof(int32));
392                  if (odView[vn].emap == NULL)
393                          error(SYSTEM, "out of memory in odDepthMap");
394          }

Diff Legend

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