delete [] m_ThreaderDerivativeF;
}
m_ThreaderDerivativeF = new DerivativeType[this->m_NumberOfThreads];
- for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+ for(itk::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(itk::ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
m_ThreaderDerivativeM[threadID].SetSize( this->m_NumberOfParameters );
}
}
inline bool
NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
::GetValueThreadProcessSample(
- unsigned int threadID,
+ itk::ThreadIdType threadID,
unsigned long fixedImageSample,
const MovingImagePointType & itkNotUsed(mappedPoint),
double movingImageValue) const
// Set up the parameters in the transform
this->m_Transform->SetParameters( parameters );
+#if ITK_VERSION_MAJOR < 4
this->m_Parameters = parameters;
+#endif
// MUST BE CALLED TO INITIATE PROCESSING
this->GetValueMultiThreadedInitiate();
// Set up the parameters in the transform
this->m_Transform->SetParameters( parameters );
+#if ITK_VERSION_MAJOR < 4
this->m_Parameters = parameters;
+#endif
// MUST BE CALLED TO INITIATE PROCESSING
this->GetValueMultiThreadedInitiate();
inline bool
NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
::GetValueAndDerivativeThreadProcessSample(
- unsigned int threadID,
+ itk::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++) {
RealType sumF = itk::NumericTraits< RealType >::Zero;
// Set up the parameters in the transform
this->m_Transform->SetParameters( parameters );
+#if ITK_VERSION_MAJOR < 4
this->m_Parameters = parameters;
+#endif
//We need the sums and the value to be calculated first
value=this->ComputeSums(parameters);
}
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( itk::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