[Toon-members] TooN helpers.h so3.h

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Gerhard Reitmayr <gerhard>      11/11/01 16:37:16

Modified files:
        .              : helpers.h so3.h 

Log message:
        fixed some more compiler complaints

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/helpers.h?cvsroot=toon&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/TooN/so3.h?cvsroot=toon&r1=1.50&r2=1.51

Patches:
Index: helpers.h
===================================================================
RCS file: /cvsroot/toon/TooN/helpers.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- helpers.h   31 Mar 2011 21:04:43 -0000      1.92
+++ helpers.h   1 Nov 2011 16:37:16 -0000       1.93
@@ -176,7 +176,7 @@
        \overload
        */
        template<int R, int C, typename Precision, typename Base> inline 
Matrix<R-1, C, Precision> project( const Matrix<R,C, Precision, Base> & m){
-        Matrix<R-1, C, Precision> result = m.template 
slice(0,0,R-1,m.num_cols());
+        Matrix<R-1, C, Precision> result = m.slice(0,0,R-1,m.num_cols());
         for( int c = 0; c < m.num_cols(); ++c ) {
             result.slice(0,c,R-1,1) /= m[R-1][c];
         }
@@ -184,7 +184,7 @@
     }
 
     template<int C, typename Precision, typename Base> inline Matrix<-1, C, 
Precision> project( const Matrix<-1,C, Precision, Base> & m){
-        Matrix<-1, C, Precision> result = m.template 
slice(0,0,m.num_rows()-1,m.num_cols());
+        Matrix<-1, C, Precision> result = 
m.slice(0,0,m.num_rows()-1,m.num_cols());
         for( int c = 0; c < m.num_cols(); ++c ) {
             result.slice(0,c,m.num_rows()-1,1) /= m[m.num_rows()-1][c];
         }
@@ -203,7 +203,7 @@
 
     template<int C, typename Precision, typename Base> inline Matrix<-1, C, 
Precision> unproject( const Matrix<-1, C, Precision, Base> & m){
         Matrix<-1, C, Precision> result( m.num_rows()+1, m.num_cols() );
-        result.template slice(0,0,m.num_rows(),m.num_cols()) = m;
+        result.slice(0,0,m.num_rows(),m.num_cols()) = m;
         result[m.num_rows()] = Ones;
         return result;
     }

Index: so3.h
===================================================================
RCS file: /cvsroot/toon/TooN/so3.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- so3.h       29 Jun 2011 20:20:00 -0000      1.50
+++ so3.h       1 Nov 2011 16:37:16 -0000       1.51
@@ -200,8 +200,9 @@
 /// @relates SO3
 template <typename Precision>
 inline std::istream& operator>>(std::istream& is, SO3<Precision>& rhs){
-       return is >> rhs.my_matrix;
+       is >> rhs.my_matrix;
        rhs.coerce();
+       return is;
 }
 
 ///Compute a rotation exponential using the Rodrigues Formula.