diff options
author | Chris Want <cwant@ualberta.ca> | 2005-09-15 01:50:37 +0400 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2005-09-15 01:50:37 +0400 |
commit | 0a2b71a3a4c18d80058e0b67fee9d41fced7c261 (patch) | |
tree | f1801ae4ecda3122abd3204139b8c236ff5c5d52 /intern | |
parent | 902b11b84c34a229f94c976d385b6b033837172f (diff) |
Getting blender to compile for IRIX, in particular:
IK: needed to change abs() to TNT::abs() (thanks brecht!)
Freetype: FT_ENCODING_UNICODE typecast to FT_CharMap (thanks intrr!)
header_image: missing include for liballoc stuff
Ketsji: needed to declare m_hitObject as public in KX_MouseFocusSensor.h.
This is probably the wrong thing to do, but KX_MouseFocusSensor.cpp
compilation fails on line 279 otherwise.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/iksolver/intern/TNT/svd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/iksolver/intern/TNT/svd.h b/intern/iksolver/intern/TNT/svd.h index 1b25361811e..af281d0fce0 100644 --- a/intern/iksolver/intern/TNT/svd.h +++ b/intern/iksolver/intern/TNT/svd.h @@ -232,7 +232,7 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work if (k == -1) { break; } - if (abs(e[k]) <= eps*(abs(s[k]) + abs(s[k+1]))) { + if (TNT::abs(e[k]) <= eps*(TNT::abs(s[k]) + TNT::abs(s[k+1]))) { e[k] = 0.0; break; } @@ -245,9 +245,9 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work if (ks == k) { break; } - typename MaTRiX::value_type t = (ks != p ? abs(e[ks]) : 0.) + - (ks != k+1 ? abs(e[ks-1]) : 0.); - if (abs(s[ks]) <= eps*t) { + typename MaTRiX::value_type t = (ks != p ? TNT::abs(e[ks]) : 0.) + + (ks != k+1 ? TNT::abs(e[ks-1]) : 0.); + if (TNT::abs(s[ks]) <= eps*t) { s[ks] = 0.0; break; } @@ -320,8 +320,8 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work // Calculate the shift. typename MaTRiX::value_type scale = max(max(max(max( - abs(s[p-1]),abs(s[p-2])),abs(e[p-2])), - abs(s[k])),abs(e[k])); + TNT::abs(s[p-1]),TNT::abs(s[p-2])),TNT::abs(e[p-2])), + TNT::abs(s[k])),TNT::abs(e[k])); typename MaTRiX::value_type sp = s[p-1]/scale; typename MaTRiX::value_type spm1 = s[p-2]/scale; typename MaTRiX::value_type epm1 = e[p-2]/scale; |