drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix minor warnings.

Browse Source 
Add output directories to ignore list.
This commit is contained in:
Ignacio
2018-10-29 12:37:16 -07:00
parent 8a076c8e8d
commit a9a6f6968e
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvimage/ErrorMetric.cpp
View File

@ -93,9 +93,9 @@ float nv::averageColorError(const FloatImage * ref, const FloatImage * img, bool
float b1 = ref->pixel(i + count * 2);
float a1 = ref->pixel(i + count * 3);
float r = fabs(r0 - r1);
float g = fabs(g0 - g1);
float b = fabs(b0 - b1);
float r = fabsf(r0 - r1);
float g = fabsf(g0 - g1);
float b = fabsf(b0 - b1);
float a = 1;
if (alphaWeight) a = a1;
@ -125,7 +125,7 @@ float nv::averageAlphaError(const FloatImage * ref, const FloatImage * img)
float a = a0 - a1;
mae += fabs(a);
mae += fabsf(a);
}
return float(mae / count);

18
src/nvimage/Filter.cpp
View File

@ -52,7 +52,7 @@ namespace
return 1.0f + x*x*(-1.0f/6.0f + x*x*1.0f/120.0f);
}
else {
return sin(x) / x;
return sinf(x) / x;
}
}
@ -157,7 +157,7 @@ BoxFilter::BoxFilter(float width) : Filter(width) {}
float BoxFilter::evaluate(float x) const
{
if (fabs(x) <= m_width) return 1.0f;
if (fabsf(x) <= m_width) return 1.0f;
else return 0.0f;
}
@ -167,7 +167,7 @@ TriangleFilter::TriangleFilter(float width) : Filter(width) {}
float TriangleFilter::evaluate(float x) const
{
x = fabs(x);
x = fabsf(x);
if( x < m_width ) return m_width - x;
return 0.0f;
}
@ -177,7 +177,7 @@ QuadraticFilter::QuadraticFilter() : Filter(1.5f) {}
float QuadraticFilter::evaluate(float x) const
{
x = fabs(x);
x = fabsf(x);
if( x < 0.5f ) return 0.75f - x * x;
if( x < 1.5f ) {
float t = x - 1.5f;
@ -192,7 +192,7 @@ CubicFilter::CubicFilter() : Filter(1.0f) {}
float CubicFilter::evaluate(float x) const
{
// f(t) = 2|t|^3 - 3|t|^2 + 1, -1 <= t <= 1
x = fabs(x);
x = fabsf(x);
if( x < 1.0f ) return((2.0f * x - 3.0f) * x * x + 1.0f);
return 0.0f;
}
@ -202,7 +202,7 @@ BSplineFilter::BSplineFilter() : Filter(2.0f) {}
float BSplineFilter::evaluate(float x) const
{
x = fabs(x);
x = fabsf(x);
if( x < 1.0f ) return (4.0f + x * x * (-6.0f + x * 3.0f)) / 6.0f;
if( x < 2.0f ) {
float t = 2.0f - x;
@ -216,7 +216,7 @@ MitchellFilter::MitchellFilter() : Filter(2.0f) { setParameters(1.0f/3.0f, 1.0f/
float MitchellFilter::evaluate(float x) const
{
x = fabs(x);
x = fabsf(x);
if( x < 1.0f ) return p0 + x * x * (p2 + x * p3);
if( x < 2.0f ) return q0 + x * (q1 + x * (q2 + x * q3));
return 0.0f;
@ -238,7 +238,7 @@ LanczosFilter::LanczosFilter() : Filter(3.0f) {}
float LanczosFilter::evaluate(float x) const
{
x = fabs(x);
x = fabsf(x);
if( x < 3.0f ) return sincf(PI * x) * sincf(PI * x / 3.0f);
return 0.0f;
}
@ -357,7 +357,7 @@ void Kernel2::normalize()
{
float total = 0.0f;
for(uint i = 0; i < m_windowSize*m_windowSize; i++) {
total += fabs(m_data[i]);
total += fabsf(m_data[i]);
}
float inv = 1.0f / total;