remove home-made 'uint', 'uchar', 'ushort', etc replace by uint32_t, uint8_t, uint16_t

[creaMaracasVisu.git] / lib / maracasVisuLib / include / matrix.h

diff --git a/lib/maracasVisuLib/include/matrix.h b/lib/maracasVisuLib/include/matrix.h
index 9689f5968abecca9da9951b55c0f06cd2c008790..40eaba861861acdb9953094682b7c740698a5dd1 100644 (file)
--- a/lib/maracasVisuLib/include/matrix.h
+++ b/lib/maracasVisuLib/include/matrix.h
@@ -50,11 +50,11 @@ namespace gtm
         */
        //@{
        /// Default constructor.
-       TMatrix( uint N = 3, uint M = 3, T data = ( T )0 );
+       TMatrix( uint32_t N = 3, uint32_t M = 3, T data = ( T )0 );
        /// Copy constructor.
        TMatrix( const TMatrix< T >& r );
        /// ANSI casting constructor.
-       TMatrix( T** block, uint N, uint M );
+       TMatrix( T** block, uint32_t N, uint32_t M );
        //@}
 
        /// Destructor.
@@ -87,15 +87,15 @@ namespace gtm
        //@}
 
        /// Reference operator.
-       T& operator()( uint i, uint j ) {
+       T& operator()( uint32_t i, uint32_t j ) {
            return( _matrix[ i ][ j ] );
        };
        /// Columns
-       uint GetN( ) {
+       uint32_t GetN( ) {
            return( _N );
        };
        /// Rows
-       uint GetM( ) {
+       uint32_t GetM( ) {
            return( _M );
        };
        /// Returns the ANSI (C/C++) reference.
@@ -178,9 +178,9 @@ namespace gtm
        /// Memory block.
        T** _matrix;
        /// Columns.
-       uint _N;
+       uint32_t _N;
        /// Rows.
-       uint _M;
+       uint32_t _M;
        //@}
 
     };
@@ -189,7 +189,7 @@ namespace gtm
     template< class T >
     TVector< T >& TVector< T >::operator=( TMatrix< T >& r )
     {
-       uint i, j, k, min;
+       uint32_t i, j, k, min;
 
        // This min calc. avoids to reserve temporary memory, so, be careful.
        min = GTM_MIN( r.GetN( ) * r.GetM( ), _N );
@@ -211,7 +211,7 @@ namespace gtm
 
 // -----------------------------------------------------------------------------
     template< class T >
-    TMatrix< T >::TMatrix( uint N, uint M, T data )
+    TMatrix< T >::TMatrix( uint32_t N, uint32_t M, T data )
     {
        _N = N;
        _M = M;
@@ -232,7 +232,7 @@ namespace gtm
 
 // -----------------------------------------------------------------------------
     template< class T >
-    TMatrix< T >::TMatrix( T** block, uint N, uint M )
+    TMatrix< T >::TMatrix( T** block, uint32_t N, uint32_t M )
     {
        _N = N;
        _M = M;
@@ -260,8 +260,8 @@ namespace gtm
     template< class T >
     TMatrix< T >& TMatrix< T >::operator=( TVector< T >& r )
     {
-       uint i;
-       uint n = r.GetN( );
+       uint32_t i;
+       uint32_t n = r.GetN( );
        bool column = ( r.GetType( ) == COL_VECTOR );
 
        MatrixFreeMemory< T >( _matrix, _N );
@@ -286,7 +286,7 @@ namespace gtm
     template< class T >
     bool TMatrix< T >::operator==( const TMatrix< T >& r )
     {
-       uint i, j;
+       uint32_t i, j;
        bool ret;
 
        for(
@@ -306,7 +306,7 @@ namespace gtm
     template< class T >
     bool TMatrix< T >::operator!=( const TMatrix< T >& r )
     {
-       uint i, j;
+       uint32_t i, j;
        bool ret;
 
        for(
@@ -393,7 +393,7 @@ namespace gtm
     TMatrix< T > TMatrix< T >::operator-( )
     {
        TMatrix< T > ret( _N, _M );
-       uint i, j;
+       uint32_t i, j;
   
        for( i = 0; i < _N; i++ )
            for( j = 0; j < _M; ret._matrix[ i ][ j ] = ( T )0 - _matrix[ i ][ j ], j++ );