← Back to branch summary

~ubuntu-branches/ubuntu/precise/insighttoolkit/precise

« back to all changes in this revision

Viewing changes to Code/Algorithms/itkImageRegistrationMethod.txx

  • Committer: Bazaar Package Importer
  • Author(s): Steve M. Robbins
  • Date: 2008-05-31 12:07:29 UTC
  • mfrom: (3.1.3 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080531120729-7g7layn480le43ko
Tags: 3.6.0-3
http://bugs.debian.org/478500
http://bugs.debian.org/478940
http://bugs.debian.org/483312
* debian/patches/gccxml-workaround.patch: New.  Work around gccxml issue
  with #include_next; c.f. http://www.gccxml.org/Bug/view.php?id=7134.  
* debian/patches/gcc43.patch: include <cstring> in itkNeighbourhood.h.
  This only showed up in the tcl wrapping step.

* Above two entries fix FTBFS for GCC 4.3-based systems.
  Closes: #478500.

* debian/patches/sharedforward.patch: New.  Ensure that linux/sparc
  systems are not also configured as a SUN sparc system, which requires
  SUN header sys/isa_defs.h.  Closes: #478940, #483312.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Code/Algorithms/itkImageRegistrationMethod.txx
3
3
  Program:   Insight Segmentation & Registration Toolkit
4
4
  Module:    $RCSfile: itkImageRegistrationMethod.txx,v $
5
5
  Language:  C++
6
 
  Date:      $Date: 2006/06/08 20:30:45 $
7
 
  Version:   $Revision: 1.25 $
 
6
  Date:      $Date: 2007-12-17 16:34:08 $
 
7
  Version:   $Revision: 1.28 $
8
8
 
9
9
  Copyright (c) Insight Software Consortium. All rights reserved.
10
10
  See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
55
55
                                  this->MakeOutput(0).GetPointer() );
56
56
 
57
57
  this->ProcessObject::SetNthOutput( 0, transformDecorator.GetPointer() );
 
58
 
 
59
#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
 
60
  this->SetNumberOfThreads( this->GetMultiThreader()->GetNumberOfThreads() );
 
61
#else
 
62
  this->SetNumberOfThreads( 1 );
 
63
  this->GetMultiThreader()->SetNumberOfThreads( this->GetNumberOfThreads() );
 
64
#endif
58
65
}
59
66
 
60
67
 
190
197
    }
191
198
 
192
199
  // Setup the metric
 
200
#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
 
201
  this->GetMultiThreader()->SetNumberOfThreads( this->GetNumberOfThreads() );
 
202
  this->m_Metric->SetNumberOfThreads( this->GetNumberOfThreads() );
 
203
#endif
193
204
  m_Metric->SetMovingImage( m_MovingImage );
194
205
  m_Metric->SetFixedImage( m_FixedImage );
195
206
  m_Metric->SetTransform( m_Transform );
275
286
ImageRegistrationMethod<TFixedImage,TMovingImage>
276
287
::StartOptimization( void )
277
288
{ 
 
289
 
278
290
  try
279
291
    {
280
292
    // do the optimization