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

Comparing ray/src/rt/colortab.c (file contents):
Revision 2.11 by greg, Tue Jul 8 18:24:59 2014 UTC vs.
Revision 2.12 by schorsch, Fri Mar 18 22:52:05 2016 UTC

# Line 116 | Line 116 | get_pixel(     /* get pixel for color */
116                                                  /* find pixel in tree */
117          for (tp = ctree, h = 0; is_branch(*tp); h++)
118                  if (cv[prim(*tp)] < part(*tp))
119 <                        tp += 1<<h;             /* left branch */
119 >                        tp += (size_t)1<<h;             /* left branch */
120                  else
121 <                        tp += 1<<(h+1);         /* right branch */
121 >                        tp += (size_t)1<<(h+1);         /* right branch */
122          h = pval(*tp);
123                                                  /* add to color table */
124          clrtab[h].sum[RED] += r;
# Line 200 | Line 200 | int    c0, c1;
200          memcpy((void *)kb, (void *)box, sizeof(kb));
201                                                  /* do left (lesser) branch */
202          kb[prim(*tree)][1] = part(*tree);
203 <        cut(tree+(1<<level), level+1, kb, c0, (c0+c1)>>1);
203 >        cut(tree+((size_t)1<<level), level+1, kb, c0, (c0+c1)>>1);
204                                                  /* do right branch */
205          kb[prim(*tree)][0] = part(*tree);
206          kb[prim(*tree)][1] = box[prim(*tree)][1];
207 <        cut(tree+(1<<(level+1)), level+1, kb, (c0+c1)>>1, c1);
207 >        cut(tree+((size_t)1<<(level+1)), level+1, kb, (c0+c1)>>1, c1);
208   }
209  
210  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines