diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
| commit | 942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch) | |
| tree | 02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/llmath/tests/v4coloru_test.cpp | |
| parent | 2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge
Diffstat (limited to 'indra/llmath/tests/v4coloru_test.cpp')
| -rwxr-xr-x | indra/llmath/tests/v4coloru_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmath/tests/v4coloru_test.cpp b/indra/llmath/tests/v4coloru_test.cpp index 128f6f3564..12e607a820 100755 --- a/indra/llmath/tests/v4coloru_test.cpp +++ b/indra/llmath/tests/v4coloru_test.cpp @@ -300,8 +300,8 @@ namespace tut LLColor4U llcolor4u(r,g,b,a),llcolor4u1; const F32 fVal = 3.f; llcolor4u1 = llcolor4u.multAll(fVal); - ensure("multAll:Fail to multiply ", (((U8)llround(r * fVal) == llcolor4u1.mV[VX]) && (U8)llround(g * fVal) == llcolor4u1.mV[VY] - && ((U8)llround(b * fVal) == llcolor4u1.mV[VZ])&& ((U8)llround(a * fVal) == llcolor4u1.mV[VW]))); + ensure("multAll:Fail to multiply ", (((U8)ll_round(r * fVal) == llcolor4u1.mV[VX]) && (U8)ll_round(g * fVal) == llcolor4u1.mV[VY] + && ((U8)ll_round(b * fVal) == llcolor4u1.mV[VZ])&& ((U8)ll_round(a * fVal) == llcolor4u1.mV[VW]))); } template<> template<> @@ -329,8 +329,8 @@ namespace tut llcolor4u.setVecScaleClamp(color3); const S32 MAX_COLOR = 255; F32 color_scale_factor = MAX_COLOR/r; - S32 r2 = llround(r * color_scale_factor); - S32 g2 = llround(g * color_scale_factor); + S32 r2 = ll_round(r * color_scale_factor); + S32 g2 = ll_round(g * color_scale_factor); ensure("setVecScaleClamp():Fail to add the value ", ((r2 == llcolor4u.mV[VX]) && (g2 == llcolor4u.mV[VY]) && (0 == llcolor4u.mV[VZ])&& (255 == llcolor4u.mV[VW]))); } } |