From e68d9f9f75956ecfee805a674f139033ded6bec6 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 1 Nov 2007 01:48:26 +0000 Subject: [PATCH] Commented out unused code. git-svn-id: http://svn.voria.com/code@1094 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/synfigapp/blineconvert.cpp | 171 +++++++++++---------- 1 file changed, 86 insertions(+), 85 deletions(-) diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index b3942cf..ec69a2e 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -99,94 +99,95 @@ inline void ThreePointdt(T &df, const T &f1, const T &f2, const T &f3, int bias) } } -template < class T > -inline void ThreePointddt(T &df, const T &f1, const T &f2, const T &f3, int bias) -{ - //a 3 point approximation pretends to have constant acceleration, so only one algorithm needed for left, middle, or right - df = (f1 -f2*2 + f3)*(1/2.0f); -} - -// WARNING -- totally broken -template < class T > -inline void FivePointddt(T &df, const T &f1, const T &f2, const T &f3, int bias) -{ - if(bias == 0) - { - assert(0); // !? - //middle - //df = (- f1 + f2*16 - f3*30 + f4*16 - f5)*(1/12.0f); - }/*else if(bias < 0) - { - //left - df = (f1*7 - f2*26*4 + f3*19*6 - f4*14*4 + f5*11)*(1/12.0f); - }else - { - //right - df = (f1*3 - f2*16 + f3*36 - f4*48 + f5*25)*(1/12.0f); - }*/ - //side ones don't work, use 3 point -} - -//implement an arbitrary derivative -//dumb algorithm -template < class T > -void DerivativeApprox(T &df, const T f[], const Real t[], int npoints, int indexval) -{ - /* - Lj(x) = PI_i!=j (x - xi) / PI_i!=j (xj - xi) - - so Lj'(x) = SUM_k PI_i!=j|k (x - xi) / PI_i!=j (xj - xi) - */ - - unsigned int i,j,k,i0,i1; - - Real Lpj,mult,div,tj; - Real tval = t[indexval]; - - //sum k - for(j=0;j +// inline void ThreePointddt(T &df, const T &f1, const T &f2, const T &f3, int bias) +// { +// // a 3 point approximation pretends to have constant acceleration, +// // so only one algorithm needed for left, middle, or right +// df = (f1 -f2*2 + f3)*(1/2.0f); +// } +// +// // WARNING -- totally broken +// template < class T > +// inline void FivePointddt(T &df, const T &f1, const T &f2, const T &f3, int bias) +// { +// if(bias == 0) +// { +// assert(0); // !? +// //middle +// //df = (- f1 + f2*16 - f3*30 + f4*16 - f5)*(1/12.0f); +// }/*else if(bias < 0) +// { +// //left +// df = (f1*7 - f2*26*4 + f3*19*6 - f4*14*4 + f5*11)*(1/12.0f); +// }else +// { +// //right +// df = (f1*3 - f2*16 + f3*36 - f4*48 + f5*25)*(1/12.0f); +// }*/ +// //side ones don't work, use 3 point +// } +// +// //implement an arbitrary derivative +// //dumb algorithm +// template < class T > +// void DerivativeApprox(T &df, const T f[], const Real t[], int npoints, int indexval) +// { +// /* +// Lj(x) = PI_i!=j (x - xi) / PI_i!=j (xj - xi) +// +// so Lj'(x) = SUM_k PI_i!=j|k (x - xi) / PI_i!=j (xj - xi) +// */ +// +// unsigned int i,j,k,i0,i1; +// +// Real Lpj,mult,div,tj; +// Real tval = t[indexval]; +// +// //sum k +// for(j=0;j -inline int sign(T f, T tol) -{ - if(f < -tol) return -1; - if(f > tol) return 1; - return 0; -} +// template < class T > +// inline int sign(T f, T tol) +// { +// if(f < -tol) return -1; +// if(f > tol) return 1; +// return 0; +// } void GetFirstDerivatives(const std::vector &f, unsigned int left, unsigned int right, char *out, unsigned int dfstride) { -- 2.7.4