diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-22 11:50:19 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-22 11:50:19 -0500 |
| commit | 764412f9b5e8d69950f9866a60299b1b458339c6 (patch) | |
| tree | 7e9d634faddd40edf8ed715e7b479d1336ed7697 /indra/llmath/tests/v4color_test.cpp | |
| parent | b15dca22637b0b2c1947b758a93f51163fb48cf1 (diff) | |
| parent | 0349d1f29197ca00c9eb7278d97bd56ea4d2050a (diff) | |
merge
Diffstat (limited to 'indra/llmath/tests/v4color_test.cpp')
| -rw-r--r-- | indra/llmath/tests/v4color_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/tests/v4color_test.cpp b/indra/llmath/tests/v4color_test.cpp index fbd43625d1..d7eec3c87f 100644 --- a/indra/llmath/tests/v4color_test.cpp +++ b/indra/llmath/tests/v4color_test.cpp @@ -155,7 +155,7 @@ namespace tut F32 r = 0x20, g = 0xFFFF, b = 0xFF; LLColor4 llcolor4(r,g,b); ensure("magVecSquared:Fail ", is_approx_equal(llcolor4.magVecSquared(), (r*r + g*g + b*b))); - ensure("magVec:Fail ", is_approx_equal(llcolor4.magVec(), fsqrtf(r*r + g*g + b*b))); + ensure("magVec:Fail ", is_approx_equal(llcolor4.magVec(), (F32) sqrt(r*r + g*g + b*b))); } template<> template<> @@ -164,7 +164,7 @@ namespace tut F32 r = 0x20, g = 0xFFFF, b = 0xFF; LLColor4 llcolor4(r,g,b); F32 vecMag = llcolor4.normVec(); - F32 mag = fsqrtf(r*r + g*g + b*b); + F32 mag = (F32) sqrt(r*r + g*g + b*b); F32 oomag = 1.f / mag; F32 val1 = r * oomag, val2 = g * oomag, val3 = b * oomag; ensure("1:normVec failed ", (is_approx_equal(val1, llcolor4.mV[0]) && is_approx_equal(val2, llcolor4.mV[1]) && is_approx_equal(val3, llcolor4.mV[2]) && is_approx_equal(vecMag, mag))); |