From 940010a60d70573254f7a68697f81e0ebc8548f7 Mon Sep 17 00:00:00 2001 From: srit Date: Sun, 27 Mar 2011 00:41:47 +0000 Subject: [PATCH] Last errors --- ...tkDemonsDeformableRegistrationGenericFilter.txx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/registration/clitkDemonsDeformableRegistrationGenericFilter.txx b/registration/clitkDemonsDeformableRegistrationGenericFilter.txx index 887676e..ac95ce1 100755 --- a/registration/clitkDemonsDeformableRegistrationGenericFilter.txx +++ b/registration/clitkDemonsDeformableRegistrationGenericFilter.txx @@ -369,7 +369,7 @@ namespace clitk //------------------------------------ //Set the max RMS error for the field update //------------------------------------ - itk::Array maxRMSError(nLevels); + std::vector maxRMSError(nLevels); for (unsigned int i=0 ; i stop(nLevels); + std::vector stop(nLevels); for (unsigned int i=0; i::Pointer levelObserver = CommandResolutionLevelUpdate::New(); multiResolutionFilter->AddObserver( itk::IterationEvent(), levelObserver ); - levelObserver->SetMaxRMSError(maxRMSError); + levelObserver->SetMaxRMSError(&(maxRMSError[0])); levelObserver->SetMaxStep(m_ArgsInfo.maxStep_arg); levelObserver->SetSD(sd); levelObserver->SetScaleStep(m_ArgsInfo.scaleStep_flag); @@ -464,7 +464,7 @@ namespace clitk m->SetIntensityDifferenceThreshold( m_ArgsInfo.intThreshold_arg); m->SetUseMovingImageGradient( m_ArgsInfo.movGrad_flag); typename CommandIterationUpdate::Pointer observer = CommandIterationUpdate::New(); - observer->SetStop(stop); + observer->SetStop(&(stop[0])); observer->SetLevelObserver(levelObserver); m->AddObserver( itk::IterationEvent(), observer ); if (m_Verbose) std::cout<<"Using the demons registration filter..."<SetIntensityDifferenceThreshold( m_ArgsInfo.intThreshold_arg); typename CommandIterationUpdate::Pointer observer = CommandIterationUpdate::New(); - observer->SetStop(stop); + observer->SetStop(&(stop[0])); observer->SetLevelObserver(levelObserver); m->AddObserver( itk::IterationEvent(), observer ); if (m_Verbose) std::cout<<"Using the symmetric forces demons registration filter..."<SetMaximumUpdateStepLength( m_ArgsInfo.maxStep_arg); m->SetUseGradientType(grad); typename CommandIterationUpdate::Pointer observer = CommandIterationUpdate::New(); - observer->SetStop(stop); + observer->SetStop(&(stop[0])); observer->SetLevelObserver(levelObserver); m->AddObserver( itk::IterationEvent(), observer ); if (m_Verbose) std::cout<<"Using the fast symmetric forces demons registration filter..."<SetUseFirstOrderExp(m_ArgsInfo.firstOrder_flag); m->SetUseGradientType(grad); typename CommandIterationUpdate::Pointer observer = CommandIterationUpdate::New(); - observer->SetStop(stop); + observer->SetStop(&(stop[0])); observer->SetLevelObserver(levelObserver); m->AddObserver( itk::IterationEvent(), observer ); if (m_Verbose) std::cout<<"Using the diffeomorphic demons registration filter..."<