Authors belong to:
- University of LYON http://www.universite-lyon.fr/
- - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
+ - Léon Bérard cancer center http://www.centreleonberard.fr
- CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
This software is distributed WITHOUT ANY WARRANTY; without even
- BSD See included LICENSE.txt file
- CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
#ifndef __clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD_txx
#define __clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD_txx
delete [] m_ThreaderDerivativeF;
}
m_ThreaderDerivativeF = new DerivativeType[this->m_NumberOfThreads];
- for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+ for(ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
m_ThreaderDerivativeF[threadID].SetSize( this->m_NumberOfParameters );
}
delete [] m_ThreaderDerivativeM;
}
m_ThreaderDerivativeM = new DerivativeType[this->m_NumberOfThreads];
- for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+ for(ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
m_ThreaderDerivativeM[threadID].SetSize( this->m_NumberOfParameters );
}
}
inline bool
NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
::GetValueThreadProcessSample(
- unsigned int threadID,
+ ThreadIdType threadID,
unsigned long fixedImageSample,
const MovingImagePointType & itkNotUsed(mappedPoint),
double movingImageValue) const
inline bool
NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
::GetValueAndDerivativeThreadProcessSample(
- unsigned int threadID,
+ ThreadIdType threadID,
unsigned long fixedImageSample,
const MovingImagePointType & itkNotUsed(mappedPoint),
double movingImageValue,
}
// Jacobian should be evaluated at the unmapped (fixed image) point.
+#if ITK_VERSION_MAJOR >= 4
+ TransformJacobianType jacobian;
+ transform->ComputeJacobianWithRespectToParameters( fixedImagePoint, jacobian );
+#else
const TransformJacobianType & jacobian = transform->GetJacobian( fixedImagePoint );
+#endif
// for(unsigned int par=0; par<this->m_NumberOfParameters; par++)
// {
}
memset( derivative.data_block(),
0,
- this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) );
+ this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );
- for( unsigned int threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
+ for( ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
memset( m_ThreaderDerivativeF[threadID].data_block(),
0,
- this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) );
+ this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );
memset( m_ThreaderDerivativeM[threadID].data_block(),
0,
- this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) );
+ this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );
}
// MUST BE CALLED TO INITIATE PROCESSING