Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / gradient.cpp

diff --git a/synfig-core/trunk/src/synfig/gradient.cpp b/synfig-core/trunk/src/synfig/gradient.cpp
index 932f5cd..00f67b0 100644 (file)
--- a/synfig-core/trunk/src/synfig/gradient.cpp
+++ b/synfig-core/trunk/src/synfig/gradient.cpp
@@ -203,7 +203,7 @@ synfig::Gradient::operator+=(const Gradient &rhs)
                                // 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));
@@ -349,7 +349,7 @@ synfig::Gradient::operator()(const Real &x,float supersample)const
                //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;
 
@@ -405,7 +405,7 @@ synfig::Gradient::operator()(const Real &x,float supersample)const
        //! 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.