Skip to content
Snippets Groups Projects
Commit 008e6e8b authored by Andreas Schenk's avatar Andreas Schenk
Browse files

silenced some implicit conversion warnings

parent a4d74a03
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ public:
Vec3 d=is.GetSampling().GetPixelSampling();
Real F=calcF(Point(it),d);
Real value = (F <= limit_ ? 1.0 : 0.0);
is.Value(it)*=value;
is.Value(it)*=Val2Val<Real,T>(value);
}
}
......@@ -91,7 +91,7 @@ public:
Vec3 d=is.GetSampling().GetPixelSampling();
Real F=calcF(Point(it),d);
Real value= (F >= limit_ ? 1.0 : 0.0);
is.Value(it)*=value;
is.Value(it)*=Val2Val<Real,T>(value);
}
}
......@@ -123,7 +123,7 @@ public:
Vec3 d=is.GetSampling().GetPixelSampling();
Real F=calcF(Point(it),d);
Real value=exp(-F*F/(2.0*limit_*limit_));
is.Value(it)*=value;
is.Value(it)*=Val2Val<Real,T>(value);
}
}
......@@ -155,7 +155,7 @@ public:
Vec3 d=is.GetSampling().GetPixelSampling();
Real F=calcF(Point(it),d);
Real value=1.0-exp(-F*F/(2.0*limit_*limit_));
is.Value(it)*=value;
is.Value(it)*=Val2Val<Real,T>(value);
}
}
......@@ -195,7 +195,7 @@ public:
Real F=calcF(Point(it),d);
Real teff=t_*t_/l2*F*(t_>=0?1.0:-1.0);
Real value=1.0/(1.0+exp((F-limit_)/(teff)));
is.Value(it)*=value;
is.Value(it)*=Val2Val<Real,T>(value);
}
}
}
......@@ -235,7 +235,7 @@ public:
Vec3 d=is.GetSampling().GetPixelSampling();
Real F=calcF(Point(it),d);
Real value=(1.0/(sqrt(1+pow(F/rad,Real(2.0)*order))));
is.Value(it)*=value;
is.Value(it)*=Val2Val<Real,T>(value);
}
}
......
......@@ -41,7 +41,7 @@ MaskPtr ExtentMask::Clone()
}
bool ExtentMask::IsInside(const Vec2& v)
{
return Contains(Point(floor(v[0]),floor(v[1])));
return Contains(Point(static_cast<int>(floor(v[0])),static_cast<int>(floor(v[1]))));
}
void ExtentMask::Shift(const Vec2& v)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment