...

diff --git a/examples/Dijkstra_Maurer.cxx b/examples/Dijkstra_Maurer.cxx
index c67024a12fc0215b15f4e628c1e50ecdc44ca48c..0f011316cedefbed5df9083f30b5f89968e5450a 100644 (file)
--- a/examples/Dijkstra_Maurer.cxx
+++ b/examples/Dijkstra_Maurer.cxx
@@ -109,9 +109,12 @@ int main( int argc, char* argv[] )
 
   TMSTToImage::Pointer mst_image = TMSTToImage::New( );
   mst_image->SetInput( filter->GetMinimumSpanningTree( ) );
-  for( TIndex iseed: filter->GetSeeds( ) )
-    for( TIndex jseed: filter->GetSeeds( ) )
-      mst_image->AddPath( iseed, jseed, 255, 0, 0 );
+  TFilter::TSeedsInterface::TSeeds::const_iterator iseed =
+    filter->BeginSeeds( );
+  TFilter::TSeedsInterface::TSeeds::const_iterator jseed;
+  for( ; iseed != filter->EndSeeds( ); ++iseed )
+    for( jseed = filter->BeginSeeds( ); jseed != filter->EndSeeds( ); ++jseed )
+      mst_image->AddPath( *iseed, *jseed, 255, 0, 0 );
 
   TColorImageWriter::Pointer paths_writer = TColorImageWriter::New( );
   paths_writer->SetInput( mst_image->GetOutput( ) );

diff --git a/examples/RegionGrow_Mori.cxx b/examples/RegionGrow_Mori.cxx
index bdff6aa6b40d851685cff7bb6e91326da2d80c0e..2c36e8b6c1f5809dd9150740c8d61786efed8c3d 100644 (file)
--- a/examples/RegionGrow_Mori.cxx
+++ b/examples/RegionGrow_Mori.cxx
@@ -123,9 +123,10 @@ int main( int argc, char* argv[] )
 
   // Show data
   TFilter::TCurve curve = filter->GetCurve( );
-  for( TFilter::TCurveData data: curve )
+  TFilter::TCurve::const_iterator data = curve.begin( );
+  for( ; data != curve.end( ); ++data )
   {
-    std::cout << data.XValue << " " << data.YValue << " " << data.Diff1 << std::endl;
+    std::cout << data->XValue << " " << data->YValue << " " << data->Diff1 << std::endl;
   }
   std::cout
     << std::endl

diff --git a/lib/fpa/Base/Dijkstra.hxx b/lib/fpa/Base/Dijkstra.hxx
index 149363d64128543dd1bfa29de9edd04cf2b8cac3..765b9a8beaf2c984511f17fc7b28812e3bb28278 100644 (file)
--- a/lib/fpa/Base/Dijkstra.hxx
+++ b/lib/fpa/Base/Dijkstra.hxx
@@ -115,8 +115,9 @@ GenerateData( )
   // Init queue
   std::vector< _TNode > q;
   unsigned long frontId = 1;
-  for( TVertex seed: this->GetSeeds( ) )
-    q.push_back( _TNode( seed, seed, frontId++ ) );
+  typename TSeedsInterface::TSeeds::const_iterator sIt = this->BeginSeeds( );
+  for( ; sIt != this->EndSeeds( ); ++sIt )
+    q.push_back( _TNode( *sIt, *sIt, frontId++ ) );
 
   // Main loop
   while( q.size( ) > 0 )

diff --git a/lib/fpa/Base/Graph.hxx b/lib/fpa/Base/Graph.hxx
index 89fec7bd6d3e12473e6f92c3cb0cdaf7e800f41f..03f85a802d3622e3128aa7230711af4429e3d4bf 100644 (file)
--- a/lib/fpa/Base/Graph.hxx
+++ b/lib/fpa/Base/Graph.hxx
@@ -20,8 +20,8 @@ template< class _TVertex, class _TCost, class _TIndex, class _TIndexCompare >
 bool fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 RenameVertex( const TIndex& old_index, const TIndex& new_index )
 {
-  auto old_v = this->m_Vertices.find( old_index );
-  auto new_v = this->m_Vertices.find( new_index );
+  typename TVertices::iterator old_v = this->m_Vertices.find( old_index );
+  typename TVertices::iterator new_v = this->m_Vertices.find( new_index );
   if( old_v != this->m_Vertices.end( ) && new_v == this->m_Vertices.end( ) )
   {
     // Replace vertex
@@ -29,14 +29,14 @@ RenameVertex( const TIndex& old_index, const TIndex& new_index )
     this->m_Vertices.erase( old_index );
 
     // Duplicate edges
-    auto mIt = this->m_Matrix.begin( );
-    auto found_row = this->m_Matrix.end( );
+    typename TMatrix::iterator mIt = this->m_Matrix.begin( );
+    typename TMatrix::iterator found_row = this->m_Matrix.end( );
     for( ; mIt != this->m_Matrix.end( ); ++mIt )
     {
       if( mIt->first == old_index )
         found_row = mIt;
 
-      auto rIt = mIt->second.begin( );
+      typename TMatrixRow::iterator rIt = mIt->second.begin( );
       for( ; rIt != mIt->second.end( ); ++rIt )
       {
         if( mIt->first == old_index )
@@ -55,7 +55,7 @@ RenameVertex( const TIndex& old_index, const TIndex& new_index )
     mIt = this->m_Matrix.begin( );
     for( ; mIt != this->m_Matrix.end( ); ++mIt )
     {
-      auto rIt = mIt->second.begin( );
+      typename TMatrixRow::iterator rIt = mIt->second.begin( );
       while( rIt != mIt->second.end( ) )
       {
         if( rIt->first == old_index )
@@ -80,14 +80,14 @@ template< class _TVertex, class _TCost, class _TIndex, class _TIndexCompare >
 void fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 RemoveVertex( const TIndex& index )
 {
-  auto i = this->m_Vertices.find( index );
+  typename TVertices::iterator i = this->m_Vertices.find( index );
   if( i != this->m_Vertices.end( ) )
   {
     // Delete vertex
     this->m_Vertices.erase( i );
 
     // Delete edges starting from given vertex
-    auto mIt = this->m_Matrix.find( index );
+    typename TMatrix::iterator mIt = this->m_Matrix.find( index );
     if( mIt != this->m_Matrix.end( ) )
       this->m_Matrix.erase( mIt );
 
@@ -95,7 +95,7 @@ RemoveVertex( const TIndex& index )
     mIt = this->m_Matrix.begin( );
     for( ; mIt != this->m_Matrix.end( ); ++mIt )
     {
-      auto rIt = mIt->second.begin( );
+      typename TMatrixRow::iterator rIt = mIt->second.begin( );
       while( rIt != mIt->second.end( ) )
       {
         if( rIt->first == index )
@@ -122,10 +122,10 @@ fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 GetEdges( const TIndex& orig, const TIndex& dest )
 {
   static TEdges null_edges;
-  auto o = this->m_Matrix.find( orig );
+  typename TMatrix::iterator o = this->m_Matrix.find( orig );
   if( o != this->m_Matrix.find( orig ) )
   {
-    auto d = o->second.find( dest );
+    typename TMatrixRow::iterator d = o->second.find( dest );
     if( d == o->second.end( ) )
     {
       null_edges.clear( );
@@ -151,10 +151,10 @@ fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 GetEdges( const TIndex& orig, const TIndex& dest ) const
 {
   static const TEdges null_edges;
-  auto o = this->m_Matrix.find( orig );
+  typename TMatrix::iterator o = this->m_Matrix.find( orig );
   if( o != this->m_Matrix.find( orig ) )
   {
-    auto d = o->second.find( dest );
+    typename TMatrixRow::iterator d = o->second.find( dest );
     if( d == o->second.end( ) )
       return( null_edges );
     else
@@ -169,7 +169,7 @@ template< class _TVertex, class _TCost, class _TIndex, class _TIndexCompare >
 bool fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 HasEdge( const TIndex& orig, const TIndex& dest ) const
 {
-  auto mIt = this->m_Matrix.find( orig );
+  typename TMatrix::const_iterator mIt = this->m_Matrix.find( orig );
   if( mIt != this->m_Matrix.end( ) )
     return( mIt->second.find( dest ) != mIt->second.end( ) );
   else
@@ -181,15 +181,15 @@ template< class _TVertex, class _TCost, class _TIndex, class _TIndexCompare >
 void fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 RemoveEdge( const TIndex& orig, const TIndex& dest, const TCost& cost )
 {
-  auto m = this->m_Matrix.find( orig );
+  typename TMatrix::iterator m = this->m_Matrix.find( orig );
   if( m != this->m_Matrix.end( ) )
   {
-    auto r = m->second.find( dest );
+    typename TMatrixRow::iterator r = m->second.find( dest );
     if( r != m->second.end( ) )
     {
-      auto e = r->second.end( );
+      typename TEdges::iterator e = r->second.end( );
       for(
-        auto i = r->second.begin( );
+        typename TEdges::iterator i = r->second.begin( );
         i != r->second.end( ) && e == r->second.end( );
         ++i
         )
@@ -218,10 +218,10 @@ template< class _TVertex, class _TCost, class _TIndex, class _TIndexCompare >
 void fpa::Base::Graph< _TVertex, _TCost, _TIndex, _TIndexCompare >::
 RemoveEdges( const TIndex& orig, const TIndex& dest )
 {
-  auto m = this->m_Matrix.find( orig );
+  typename TMatrix::iterator m = this->m_Matrix.find( orig );
   if( m != this->m_Matrix.end( ) )
   {
-    auto r = m->second.find( dest );
+    typename TMatrixRow::iterator r = m->second.find( dest );
     if( r != m->second.end( ) )
     {
       m->second.erase( r );
@@ -242,10 +242,10 @@ GetSinks( ) const
 {
   std::set< _TIndex, _TIndexCompare > sinks;
 
-  auto vIt = this->m_Vertices.begin( );
+  typename TVertices::iterator vIt = this->m_Vertices.begin( );
   for( ; vIt != this->m_Vertices.end( ); ++vIt )
     sinks.insert( vIt->first );
-  auto mIt = this->m_Matrix.begin( );
+  typename TMatrix::iterator mIt = this->m_Matrix.begin( );
   for( ; mIt != this->m_Matrix.end( ); ++mIt )
     sinks.erase( mIt->first );
 

diff --git a/lib/fpa/Base/MarksInterface.hxx b/lib/fpa/Base/MarksInterface.hxx
index 56de375583ca8a962028650ae8a77199235babac..5e7a3bc56bfc9c2065b6c7774f0c3772b366de20 100644 (file)
--- a/lib/fpa/Base/MarksInterface.hxx
+++ b/lib/fpa/Base/MarksInterface.hxx
@@ -81,8 +81,8 @@ template< class _TVertex >
 unsigned long fpa::Base::MarksInterface< _TVertex >::
 _Collisions( const TVertex& a, const TVertex& b )
 {
-  auto ma = this->_GetMark( a );
-  auto mb = this->_GetMark( b );
+  unsigned long ma = this->_GetMark( a );
+  unsigned long mb = this->_GetMark( b );
   if( ma == mb || ma == 0 || mb == 0 )
     return( this->m_NumberOfFronts );
 

diff --git a/lib/fpa/Base/MoriRegionGrow.hxx b/lib/fpa/Base/MoriRegionGrow.hxx
index b619bce665c8bed3242332a36e7a96ef104bc5c4..3b7d83949c9cf3262c5f5c1590c433730aecdd2b 100644 (file)
--- a/lib/fpa/Base/MoriRegionGrow.hxx
+++ b/lib/fpa/Base/MoriRegionGrow.hxx
@@ -65,8 +65,9 @@ GenerateData( )
   typedef std::pair< TVertex, unsigned long > _TNode;
   std::queue< _TNode > queues[ 2 ];
   unsigned long frontId = 1;
-  for( TVertex seed: this->GetSeeds( ) )
-    queues[ 0 ].push( _TNode( seed, frontId++ ) );
+  typename TSeedsInterface::TSeeds::const_iterator sIt = this->BeginSeeds( );
+  for( ; sIt != this->EndSeeds( ); ++sIt )
+    queues[ 0 ].push( _TNode( *sIt, frontId++ ) );
   unsigned int cur_queue = 0;
   unsigned int aux_queue = 1;
 
@@ -104,8 +105,10 @@ GenerateData( )
 
       // Add neighborhood
       TVertices neighbors = this->_GetNeighbors( node.first );
-      for( TVertex neigh: neighbors )
+      typename TVertices::const_iterator neighIt = neighbors.begin( );
+      for( ; neighIt != neighbors.end( ); ++neighIt )
       {
+        TVertex neigh = *neighIt;
         if( this->_IsMarked( neigh ) )
         {
           // Invoke stop at collisions

diff --git a/lib/fpa/Base/RegionGrow.hxx b/lib/fpa/Base/RegionGrow.hxx
index 9e7bb7b801276b1db0a853c042f3ce1cdc77c1c7..b942dfd9eb1fb6f1fb4eb7c6bd6b667f68847388 100644 (file)
--- a/lib/fpa/Base/RegionGrow.hxx
+++ b/lib/fpa/Base/RegionGrow.hxx
@@ -91,8 +91,9 @@ GenerateData( )
   typedef std::pair< TVertex, unsigned long > _TNode;
   std::queue< _TNode > q;
   unsigned long frontId = 1;
-  for( TVertex seed: this->GetSeeds( ) )
-    q.push( _TNode( seed, frontId++ ) );
+  typename TSeedsInterface::TSeeds::const_iterator sIt = this->BeginSeeds( );
+  for( ; sIt != this->EndSeeds( ); ++sIt )
+    q.push( _TNode( *sIt, frontId++ ) );
 
   // Main loop
   while( q.size( ) > 0 )
@@ -119,8 +120,10 @@ GenerateData( )
 
     // Add neighborhood
     TVertices neighbors = this->_GetNeighbors( node.first );
-    for( TVertex neigh: neighbors )
+    typename TVertices::const_iterator neighIt = neighbors.begin( );
+    for( ; neighIt != neighbors.end( ); ++neighIt )
     {
+      TVertex neigh = *neighIt;
       if( this->_IsMarked( neigh ) )
       {
         // Invoke stop at collisions

diff --git a/lib/fpa/Base/Skeleton.hxx b/lib/fpa/Base/Skeleton.hxx
index 91ec404cf4d0644785dfa7120706378e991fa56f..494eca3a9e58011e94a474b6be0d5b8187dc7d49 100644 (file)
--- a/lib/fpa/Base/Skeleton.hxx
+++ b/lib/fpa/Base/Skeleton.hxx
@@ -50,7 +50,7 @@ fpa::Base::Skeleton< _VDim >::
 GetEndPoints( ) const
 {
   std::vector< TIndex > res;
-  auto mIt = this->BeginEdgesRows( );
+  typename Superclass::TMatrix::const_iterator mIt = this->BeginEdgesRows( );
   for( ; mIt != this->EndEdgesRows( ); ++mIt )
   {
     unsigned long count = mIt->second.size( );
@@ -68,7 +68,7 @@ fpa::Base::Skeleton< _VDim >::
 GetBifurcations( ) const
 {
   std::vector< TIndex > res;
-  auto mIt = this->BeginEdgesRows( );
+  typename Superclass::TMatrix::const_iterator mIt = this->BeginEdgesRows( );
   for( ; mIt != this->EndEdgesRows( ); ++mIt )
   {
     unsigned long count = mIt->second.size( );

diff --git a/lib/fpa/Base/SkeletonWriter.h b/lib/fpa/Base/SkeletonWriter.h
index ab07bba8c38d2e8724610f07bf35df94daa676b3..26c4972ece50dd620490d39188e11689640f5025 100644 (file)
--- a/lib/fpa/Base/SkeletonWriter.h
+++ b/lib/fpa/Base/SkeletonWriter.h
@@ -26,6 +26,11 @@ namespace fpa
       typedef itk::SmartPointer< const Self > ConstPointer;
 
       typedef _TSkeleton TSkeleton;
+      typedef typename TSkeleton::TEdges     TEdges;
+      typedef typename TSkeleton::TMatrix    TMatrix;
+      typedef typename TSkeleton::TMatrixRow TMatrixRow;
+      typedef typename TSkeleton::TPath      TPath;
+      typedef typename TSkeleton::TVertex    TVertex;
 
     public:
       itkNewMacro( Self );

diff --git a/lib/fpa/Base/SkeletonWriter.hxx b/lib/fpa/Base/SkeletonWriter.hxx
index e99d9ce5631e537726c09403ad8bdfa70985f628..e060cccfa0b6424f3e8db78b3b7800af0ce18b04 100644 (file)
--- a/lib/fpa/Base/SkeletonWriter.hxx
+++ b/lib/fpa/Base/SkeletonWriter.hxx
@@ -69,46 +69,48 @@ void fpa::Base::SkeletonWriter< _TSkeleton >::
 GenerateData( )
 {
   const TSkeleton* sk = this->GetInput( );
-  auto mIt = sk->BeginEdgesRows( );
-  auto rIt = mIt->second.begin( );
-  auto eIt = rIt->second.begin( );
-  auto path = *eIt;
+  typename TMatrix::const_iterator mIt = sk->BeginEdgesRows( );
+  typename TMatrixRow::const_iterator rIt = mIt->second.begin( );
+  typename TEdges::const_iterator eIt = rIt->second.begin( );
+  const TPath* path = *eIt;
 
   // Write base information
   std::stringstream out1, out2;
   out1 << TSkeleton::Dimension << std::endl;
-  auto spa = path->GetSpacing( );
+  typename TPath::TSpacing spa = path->GetSpacing( );
   for( unsigned int d = 0; d < TSkeleton::Dimension; ++d )
     out1 << spa[ d ] << " ";
   out1 << std::endl;
-  auto dir = path->GetDirection( );
+  typename TPath::TDirection dir = path->GetDirection( );
   for( unsigned int d = 0; d < TSkeleton::Dimension; ++d )
     for( unsigned int e = 0; e < TSkeleton::Dimension; ++e )
       out1 << dir[ d ][ e ] << " ";
   out1 << std::endl;
-  auto ori = path->GetOrigin( );
+  typename TPath::TPoint ori = path->GetOrigin( );
   for( unsigned int d = 0; d < TSkeleton::Dimension; ++d )
     out1 << ori[ d ] << " ";
   out1 << std::endl;
 
   // End points
-  auto end_points = sk->GetEndPoints( );
+  std::vector< TVertex > end_points = sk->GetEndPoints( );
   out1 << end_points.size( ) << std::endl;
-  for( auto point : end_points )
+  typename std::vector< TVertex >::const_iterator epIt = end_points.begin( );
+  for( ; epIt != end_points.end( ); ++epIt )
   {
     for( unsigned int d = 0; d < TSkeleton::Dimension; ++d )
-      out1 << point[ d ] << " ";
+      out1 << ( *epIt )[ d ] << " ";
     out1 << std::endl;
 
   } // rof
 
   // Bifurcations
-  auto bifurcations = sk->GetBifurcations( );
+  std::vector< TVertex > bifurcations = sk->GetBifurcations( );
   out1 << bifurcations.size( ) << std::endl;
-  for( auto point : bifurcations )
+  typename std::vector< TVertex >::const_iterator bIt = bifurcations.begin( );
+  for( ; bIt != bifurcations.end( ); ++bIt )
   {
     for( unsigned int d = 0; d < TSkeleton::Dimension; ++d )
-      out1 << point[ d ] << " ";
+      out1 << ( *bIt )[ d ] << " ";
     out1 << std::endl;
 
   } // rof
@@ -118,19 +120,19 @@ GenerateData( )
   mIt = sk->BeginEdgesRows( );
   for( ; mIt != sk->EndEdgesRows( ); ++mIt )
   {
-    auto rIt = mIt->second.begin( );
+    typename TMatrixRow::const_iterator rIt = mIt->second.begin( );
     for( ; rIt != mIt->second.end( ); ++rIt )
     {
-      auto eIt = rIt->second.begin( );
+      typename TEdges::const_iterator eIt = rIt->second.begin( );
       for( ; eIt != rIt->second.end( ); ++eIt )
       {
-        auto path = *eIt;
+        TPath* path = *eIt;
         pathCount++;
         unsigned int size = path->GetSize( );
         out2 << size << std::endl;
         for( unsigned int i = 0; i < path->GetSize( ); ++i )
         {
-          auto v = path->GetVertex( i );
+          TVertex v = path->GetVertex( i );
           for( unsigned int d = 0; d < TSkeleton::Dimension; ++d )
             out2 << v[ d ] << " ";
 

diff --git a/lib/fpa/Image/MinimumSpanningTreeToImageFilter.hxx b/lib/fpa/Image/MinimumSpanningTreeToImageFilter.hxx
index 1ef00392f2112f459b852f962f02180b43b5fec1..f52e75996f1083e07645f2347b93be16d55ab52a 100644 (file)
--- a/lib/fpa/Image/MinimumSpanningTreeToImageFilter.hxx
+++ b/lib/fpa/Image/MinimumSpanningTreeToImageFilter.hxx
@@ -59,15 +59,17 @@ GenerateData( )
   output->Allocate( );
   output->FillBuffer( color );
 
-  for( TPathData d: this->m_Paths )
+  typename TPaths::const_iterator d = this->m_Paths.begin( );
+  for( ; d != this->m_Paths.end( ); ++d )
   {
-    typename TMST::TVertices path = mst->GetPath( d.Start, d.End );
-    color[ 0 ] = d.Red;
-    color[ 1 ] = d.Green;
-    color[ 2 ] = d.Blue;
+    typename TMST::TVertices path = mst->GetPath( d->Start, d->End );
+    color[ 0 ] = d->Red;
+    color[ 1 ] = d->Green;
+    color[ 2 ] = d->Blue;
     color[ 3 ] = std::numeric_limits< TOutputPixelValue >::max( );
-    for( TIndex i: path )
-      output->SetPixel( i, color );
+    typename TMST::TVertices::const_iterator i = path.begin( );
+    for( ; i != path.end( ); ++i )
+      output->SetPixel( *i, color );
 
   } // rof
 }

diff --git a/lib/fpa/Image/SkeletonFilter.hxx b/lib/fpa/Image/SkeletonFilter.hxx
index 7e38fa25a4fd79c07a1ab0e1dfe4cb12c0f7566a..f1e315fe6ca3506f83956194614b9bf75b7f2e27 100644 (file)
--- a/lib/fpa/Image/SkeletonFilter.hxx
+++ b/lib/fpa/Image/SkeletonFilter.hxx
@@ -237,8 +237,10 @@ _Skeleton( const std::vector< TVertex >& end_points, _TAdjacencies& A )
   tags->SetBufferedRegion( mst->GetBufferedRegion( ) );
   tags->Allocate( );
   tags->FillBuffer( 0 );
-  for( TVertex it: end_points )
+  typename std::vector< TVertex >::const_iterator eIt = end_points.begin( );
+  for( ; eIt != end_points.end( ); ++eIt )
   {
+    TVertex it = *eIt;
     TVertex p = mst->GetParent( it );
     while( it != p )
     {
@@ -252,8 +254,10 @@ _Skeleton( const std::vector< TVertex >& end_points, _TAdjacencies& A )
   } // rof
 
   // Build paths (branches)
-  for( TVertex it: end_points )
+  eIt = end_points.begin( );
+  for( ; eIt != end_points.end( ); ++eIt )
   {
+    TVertex it = *eIt;
     TVertex p = mst->GetParent( it );
     TVertex sIdx = it;
     typename _TPath::Pointer path = _TPath::New( );