// otherwise we sum the first in each, and the last in each
else
{
- if (print) printf("[copying %d from left %d and %d from right %d at %.2f]\n", iter1-left_same+1, tpos1, iter2-right_same+1, tpos2, left.pos);
+ if (print) printf("[copying %ld from left %d and %ld from right %d at %.2f]\n", iter1-left_same+1, tpos1, iter2-right_same+1, tpos2, left.pos);
// merge the front two cpoints
if (print) printf(" copy front from left %d right %d\n", tpos1++, tpos2++);
ret.push_back(CPoint(left.pos, left.color + right.color));
//return Color::blend(iterr->color,iterl->color,lambda,Color::BLEND_STRAIGHT);
}else
{
- //itegration madness
+ //integration madness
const_iterator i = iterl, ie = iterr+1;
Real wlast = left;
//! using a binary search.
for(;iter<end();iter=next++)
{
- if(next==end() || x>=iter->pos && x<next->pos && iter->pos!=next->pos)
+ if(next==end() || (x>=iter->pos && x<next->pos && iter->pos!=next->pos))
{
// If the supersample region falls square in between
// two CPoints, then we don't have to do anything special.