aboutsummaryrefslogtreecommitdiff
path: root/redist
diff options
context:
space:
mode:
authorcnlohr <lohr85@gmail.com>2017-03-24 01:05:07 -0400
committercnlohr <lohr85@gmail.com>2017-03-24 01:05:07 -0400
commit5404526ae8da8c5fdff81b8ee8120ffe73647747 (patch)
treef8a435f2aece4ddc80f1868d983ede626d9d17b0 /redist
parent39ef5af74702c8825a82f65cf68e6af875a814ee (diff)
downloadlibsurvive-5404526ae8da8c5fdff81b8ee8120ffe73647747.tar.gz
libsurvive-5404526ae8da8c5fdff81b8ee8120ffe73647747.tar.bz2
Dave's affine solve is getting close.
Diffstat (limited to 'redist')
-rw-r--r--redist/linmath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/redist/linmath.c b/redist/linmath.c
index eefcd5f..1724a13 100644
--- a/redist/linmath.c
+++ b/redist/linmath.c
@@ -215,7 +215,7 @@ void quatfrommatrix( FLT * q, const FLT * matrix44 )
q[1] = (matrix44[9] - matrix44[6]) / S;
q[2] = (matrix44[2] - matrix44[8]) / S;
q[3] = (matrix44[4] - matrix44[1]) / S;
- } else if ((matrix44[0] > matrix44[5])&(matrix44[0] > matrix44[10])) {
+ } else if ((matrix44[0] > matrix44[5])&&(matrix44[0] > matrix44[10])) {
FLT S = FLT_SQRT(1.0 + matrix44[0] - matrix44[5] - matrix44[10]) * 2.; // S=4*qx
q[0] = (matrix44[9] - matrix44[6]) / S;
q[1] = 0.25f * S;