diff options
Diffstat (limited to 'intern/iksolver')
42 files changed, 51 insertions, 94 deletions
diff --git a/intern/iksolver/extern/IK_solver.h b/intern/iksolver/extern/IK_solver.h index 57d06a3ba32..7074c442cdf 100644 --- a/intern/iksolver/extern/IK_solver.h +++ b/intern/iksolver/extern/IK_solver.h @@ -204,4 +204,5 @@ extern void IK_FreeChain(IK_Chain_ExternPtr); } #endif -#endif // NAN_INCLUDED_IK_solver_h
\ No newline at end of file +#endif // NAN_INCLUDED_IK_solver_h + diff --git a/intern/iksolver/intern/IK_CGChainSolver.h b/intern/iksolver/intern/IK_CGChainSolver.h index f7aeee090a1..1a82e87df2a 100644 --- a/intern/iksolver/intern/IK_CGChainSolver.h +++ b/intern/iksolver/intern/IK_CGChainSolver.h @@ -174,5 +174,5 @@ private : MEM_SmartPtr<IK_ConjugateGradientSolver> m_grad_solver; }; +#endif -#endif
\ No newline at end of file diff --git a/intern/iksolver/intern/IK_Chain.h b/intern/iksolver/intern/IK_Chain.h index 40496b6087a..47d64fc3abf 100644 --- a/intern/iksolver/intern/IK_Chain.h +++ b/intern/iksolver/intern/IK_Chain.h @@ -190,5 +190,5 @@ private : }; +#endif -#endif
\ No newline at end of file diff --git a/intern/iksolver/intern/IK_ConjugateGradientSolver.h b/intern/iksolver/intern/IK_ConjugateGradientSolver.h index e50799a9fa1..190599f2271 100644 --- a/intern/iksolver/intern/IK_ConjugateGradientSolver.h +++ b/intern/iksolver/intern/IK_ConjugateGradientSolver.h @@ -192,4 +192,3 @@ private : #endif - diff --git a/intern/iksolver/intern/IK_JacobianSolver.h b/intern/iksolver/intern/IK_JacobianSolver.h index 3f3372a2cb7..4e1c3e7601e 100644 --- a/intern/iksolver/intern/IK_JacobianSolver.h +++ b/intern/iksolver/intern/IK_JacobianSolver.h @@ -162,10 +162,5 @@ private : }; - - - #endif - - diff --git a/intern/iksolver/intern/IK_LineMinimizer.h b/intern/iksolver/intern/IK_LineMinimizer.h index 635a5972c02..ed2ebf93a1b 100644 --- a/intern/iksolver/intern/IK_LineMinimizer.h +++ b/intern/iksolver/intern/IK_LineMinimizer.h @@ -293,6 +293,5 @@ private : #undef TINY #undef ZEPS - - #endif + diff --git a/intern/iksolver/intern/IK_QChain.h b/intern/iksolver/intern/IK_QChain.h index ed02bcce53e..df249fe3f67 100644 --- a/intern/iksolver/intern/IK_QChain.h +++ b/intern/iksolver/intern/IK_QChain.h @@ -207,5 +207,5 @@ private : }; +#endif -#endif
\ No newline at end of file diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h index 7e2f886d0c4..2a01fd05f83 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.h +++ b/intern/iksolver/intern/IK_QJacobianSolver.h @@ -175,10 +175,5 @@ private : }; - - - #endif - - diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h index 0c0e3a7f8bc..fdd8255c930 100644 --- a/intern/iksolver/intern/IK_QSegment.h +++ b/intern/iksolver/intern/IK_QSegment.h @@ -287,4 +287,5 @@ private : }; -#endif
\ No newline at end of file +#endif + diff --git a/intern/iksolver/intern/IK_QSolver_Class.h b/intern/iksolver/intern/IK_QSolver_Class.h index 91ad9f9c186..3f69140640d 100644 --- a/intern/iksolver/intern/IK_QSolver_Class.h +++ b/intern/iksolver/intern/IK_QSolver_Class.h @@ -105,3 +105,4 @@ private : }; #endif + diff --git a/intern/iksolver/intern/IK_Segment.h b/intern/iksolver/intern/IK_Segment.h index 35018df7859..d390684d516 100644 --- a/intern/iksolver/intern/IK_Segment.h +++ b/intern/iksolver/intern/IK_Segment.h @@ -214,4 +214,5 @@ private : }; -#endif
\ No newline at end of file +#endif + diff --git a/intern/iksolver/intern/IK_Solver_Class.h b/intern/iksolver/intern/IK_Solver_Class.h index 1ef6c22f946..f2f1af056f2 100644 --- a/intern/iksolver/intern/IK_Solver_Class.h +++ b/intern/iksolver/intern/IK_Solver_Class.h @@ -91,3 +91,4 @@ private : }; #endif + diff --git a/intern/iksolver/intern/MT_ExpMap.h b/intern/iksolver/intern/MT_ExpMap.h index 10cacb59b78..814932f42e0 100644 --- a/intern/iksolver/intern/MT_ExpMap.h +++ b/intern/iksolver/intern/MT_ExpMap.h @@ -211,9 +211,5 @@ private : }; - - #endif - - diff --git a/intern/iksolver/intern/TNT/cholesky.h b/intern/iksolver/intern/TNT/cholesky.h index a3e0118f4e5..669149ab45a 100644 --- a/intern/iksolver/intern/TNT/cholesky.h +++ b/intern/iksolver/intern/TNT/cholesky.h @@ -126,3 +126,4 @@ int Cholesky_upper_factorization(SPDMatrix &A, SymmMatrix &L) #endif // CHOLESKY_H + diff --git a/intern/iksolver/intern/TNT/cmat.h b/intern/iksolver/intern/TNT/cmat.h index 80a82417e47..e465397dea1 100644 --- a/intern/iksolver/intern/TNT/cmat.h +++ b/intern/iksolver/intern/TNT/cmat.h @@ -649,13 +649,7 @@ inline void matmultdiag( } } - - - } // namespace TNT +#endif // CMAT_H - - -#endif -// CMAT_H diff --git a/intern/iksolver/intern/TNT/fcscmat.h b/intern/iksolver/intern/TNT/fcscmat.h index 877364ad38c..7d18c634047 100644 --- a/intern/iksolver/intern/TNT/fcscmat.h +++ b/intern/iksolver/intern/TNT/fcscmat.h @@ -189,9 +189,7 @@ ostream& operator<<(ostream &s, const Fortran_Sparse_Col_Matrix<T> &A) } - } // namespace TNT -#endif -/* FCSCMAT_H */ +#endif /* FCSCMAT_H */ diff --git a/intern/iksolver/intern/TNT/fmat.h b/intern/iksolver/intern/TNT/fmat.h index 5de9a63813e..4f240a8f7f7 100644 --- a/intern/iksolver/intern/TNT/fmat.h +++ b/intern/iksolver/intern/TNT/fmat.h @@ -605,5 +605,6 @@ inline Fortran_Matrix<T> operator*(const Fortran_Matrix<T> &A, const T &x) } } // namespace TNT -#endif -// FMAT_H + +#endif // FMAT_H + diff --git a/intern/iksolver/intern/TNT/fortran.h b/intern/iksolver/intern/TNT/fortran.h index 4f513300588..b7b8613b2ab 100644 --- a/intern/iksolver/intern/TNT/fortran.h +++ b/intern/iksolver/intern/TNT/fortran.h @@ -89,11 +89,9 @@ typedef char *fch_; // (in/out) single character typedef char *cfch_; // (in) single character - #ifndef TNT_SUBSCRIPT_TYPE #define TNT_SUBSCRIPT_TYPE TNT::Fortran_integer #endif +#endif // FORTRAN_H -#endif -// FORTRAN_H diff --git a/intern/iksolver/intern/TNT/fspvec.h b/intern/iksolver/intern/TNT/fspvec.h index b8dde35b6c6..cf537df5edc 100644 --- a/intern/iksolver/intern/TNT/fspvec.h +++ b/intern/iksolver/intern/TNT/fspvec.h @@ -196,5 +196,5 @@ istream& operator>>(istream &s, Fortran_Sparse_Vector<T> &A) } // namespace TNT -#endif -// FSPVEC_H +#endif // FSPVEC_H + diff --git a/intern/iksolver/intern/TNT/lapack.h b/intern/iksolver/intern/TNT/lapack.h index d3556a96071..e25b9e5aa65 100644 --- a/intern/iksolver/intern/TNT/lapack.h +++ b/intern/iksolver/intern/TNT/lapack.h @@ -213,13 +213,5 @@ int eigenvalue_solve(const Fortran_Matrix<double> &A, return (info==0 ? 0: 1); } - - - - -#endif -// LAPACK_H - - - +#endif // LAPACK_H diff --git a/intern/iksolver/intern/TNT/lu.h b/intern/iksolver/intern/TNT/lu.h index b86027aa386..4dc80fdb7c4 100644 --- a/intern/iksolver/intern/TNT/lu.h +++ b/intern/iksolver/intern/TNT/lu.h @@ -232,5 +232,5 @@ int LU_solve(const MaTRiX &A, const VecToRSubscripts &indx, VecToR &b) } // namespace TNT -#endif -// LU_H +#endif // LU_H + diff --git a/intern/iksolver/intern/TNT/qr.h b/intern/iksolver/intern/TNT/qr.h index 074551896b9..787800ad34e 100644 --- a/intern/iksolver/intern/TNT/qr.h +++ b/intern/iksolver/intern/TNT/qr.h @@ -257,5 +257,5 @@ int QR_solve(const MaTRiX &A, const Vector &c, /*const*/ Vector &d, } // namespace TNT -#endif -// QR_H +#endif // QR_H + diff --git a/intern/iksolver/intern/TNT/region1d.h b/intern/iksolver/intern/TNT/region1d.h index 0307ee02c39..666b0920759 100644 --- a/intern/iksolver/intern/TNT/region1d.h +++ b/intern/iksolver/intern/TNT/region1d.h @@ -399,5 +399,5 @@ std::ostream& operator<<(std::ostream &s, const_Region1D<Array1D> &A) } // namespace TNT -#endif -// const_Region1D_H +#endif // const_Region1D_H + diff --git a/intern/iksolver/intern/TNT/region2d.h b/intern/iksolver/intern/TNT/region2d.h index d612dfdaa79..11908cdd6cf 100644 --- a/intern/iksolver/intern/TNT/region2d.h +++ b/intern/iksolver/intern/TNT/region2d.h @@ -495,5 +495,5 @@ std::ostream& operator<<(std::ostream &s, const Region2D<Array2D> &A) } // namespace TNT -#endif -// REGION2D_H +#endif // REGION2D_H + diff --git a/intern/iksolver/intern/TNT/stopwatch.h b/intern/iksolver/intern/TNT/stopwatch.h index 6079ec6f1b1..3d7425f0560 100644 --- a/intern/iksolver/intern/TNT/stopwatch.h +++ b/intern/iksolver/intern/TNT/stopwatch.h @@ -110,6 +110,4 @@ class stopwatch { } // namespace TNT #endif - - - + diff --git a/intern/iksolver/intern/TNT/subscript.h b/intern/iksolver/intern/TNT/subscript.h index 4728a79a168..3a978e3bed4 100644 --- a/intern/iksolver/intern/TNT/subscript.h +++ b/intern/iksolver/intern/TNT/subscript.h @@ -88,3 +88,4 @@ namespace TNT #define TNT_BASE_OFFSET (1) #endif + diff --git a/intern/iksolver/intern/TNT/svd.h b/intern/iksolver/intern/TNT/svd.h index 9028b79130d..78e46ebda00 100644 --- a/intern/iksolver/intern/TNT/svd.h +++ b/intern/iksolver/intern/TNT/svd.h @@ -467,5 +467,6 @@ void SVD_a( MaTRiX &a, VecToR &w, MaTRiX &v) { } } + #endif diff --git a/intern/iksolver/intern/TNT/tnt.h b/intern/iksolver/intern/TNT/tnt.h index df27079f87a..49cce9bce82 100644 --- a/intern/iksolver/intern/TNT/tnt.h +++ b/intern/iksolver/intern/TNT/tnt.h @@ -117,11 +117,5 @@ #include "tntmath.h" +#endif // TNT_H - - - - - -#endif -// TNT_H diff --git a/intern/iksolver/intern/TNT/tntmath.h b/intern/iksolver/intern/TNT/tntmath.h index 3342ff7f5c6..0c289cbe607 100644 --- a/intern/iksolver/intern/TNT/tntmath.h +++ b/intern/iksolver/intern/TNT/tntmath.h @@ -171,7 +171,5 @@ inline double pythag(double a, double b) } /* namespace TNT */ - -#endif -/* TNTMATH_H */ +#endif /* TNTMATH_H */ diff --git a/intern/iksolver/intern/TNT/tntreqs.h b/intern/iksolver/intern/TNT/tntreqs.h index c935902554e..f08dee67fd2 100644 --- a/intern/iksolver/intern/TNT/tntreqs.h +++ b/intern/iksolver/intern/TNT/tntreqs.h @@ -53,8 +53,6 @@ * */ - - // The requirements for a bare-bones vector class: // // @@ -100,3 +98,4 @@ // o) support () indexing // o) I/O // + diff --git a/intern/iksolver/intern/TNT/transv.h b/intern/iksolver/intern/TNT/transv.h index 47730350acc..d6168c43a08 100644 --- a/intern/iksolver/intern/TNT/transv.h +++ b/intern/iksolver/intern/TNT/transv.h @@ -188,5 +188,5 @@ std::ostream& operator<<(std::ostream &s, const Transpose_View<Matrix> &A) } // namespace TNT -#endif -// TRANSV_H +#endif // TRANSV_H + diff --git a/intern/iksolver/intern/TNT/triang.h b/intern/iksolver/intern/TNT/triang.h index 883caf138f7..15b35708a95 100644 --- a/intern/iksolver/intern/TNT/triang.h +++ b/intern/iksolver/intern/TNT/triang.h @@ -661,10 +661,5 @@ std::ostream& operator<<(std::ostream &s, } // namespace TNT - - - - -#endif -//TRIANG_H +#endif //TRIANG_H diff --git a/intern/iksolver/intern/TNT/trisolve.h b/intern/iksolver/intern/TNT/trisolve.h index 6a4f6e1a5b3..3054ff9d766 100644 --- a/intern/iksolver/intern/TNT/trisolve.h +++ b/intern/iksolver/intern/TNT/trisolve.h @@ -212,5 +212,5 @@ VecToR linear_solve(/*const*/ UnitUpperTriangularView<MaTriX> &A, } // namespace TNT -#endif -// TRISLV_H +#endif // TRISLV_H + diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h index beb034ce315..5e8925015bf 100644 --- a/intern/iksolver/intern/TNT/vec.h +++ b/intern/iksolver/intern/TNT/vec.h @@ -525,11 +525,7 @@ void vectorscale( A[i] *= B; } - - - - } /* namespace TNT */ -#endif -// VEC_H +#endif // VEC_H + diff --git a/intern/iksolver/intern/TNT/vecadaptor.h b/intern/iksolver/intern/TNT/vecadaptor.h index 337748c58bd..4ff0798e516 100644 --- a/intern/iksolver/intern/TNT/vecadaptor.h +++ b/intern/iksolver/intern/TNT/vecadaptor.h @@ -319,3 +319,4 @@ std::istream& operator>>(std::istream &s, Vector_Adaptor<BBVec> &A) } // namespace TNT #endif + diff --git a/intern/iksolver/intern/TNT/version.h b/intern/iksolver/intern/TNT/version.h index c2759e0ce44..68a56335ba5 100644 --- a/intern/iksolver/intern/TNT/version.h +++ b/intern/iksolver/intern/TNT/version.h @@ -50,3 +50,4 @@ #define TNT_VERSION_STRING "0.9.4" #endif + diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h index 7e56a02dd47..798f50be8ff 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h @@ -96,5 +96,5 @@ private : static MEM_SmartPtr<GlutDrawManager> m_s_instance; }; +#endif -#endif
\ No newline at end of file diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h index 39174b5ff1a..33343b74ebf 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h @@ -102,5 +102,5 @@ private : static MEM_SmartPtr<GlutKeyboardManager> m_s_instance; }; +#endif -#endif
\ No newline at end of file diff --git a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h index 95700bc14dd..fab68207c60 100644 --- a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h +++ b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h @@ -112,5 +112,5 @@ private : static MEM_SmartPtr<GlutMouseManager> m_s_instance; }; +#endif -#endif
\ No newline at end of file diff --git a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h index a164e686e37..b7e250a3ad0 100644 --- a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h +++ b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h @@ -382,6 +382,5 @@ private : }; +#endif - -#endif
\ No newline at end of file diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h index 5f88bda378c..b84d600079e 100644 --- a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h +++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h @@ -80,5 +80,6 @@ private : } }; + #endif diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h index e7d210beffb..a4c97538c9e 100644 --- a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h +++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h @@ -207,5 +207,5 @@ private : }; +#endif -#endif
\ No newline at end of file |