//=========================================================================================================================
//update the output for the outputRegionForThread
template<class InputImageType, class OutputImageType>
- void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+ void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
{
//Get pointer to the output
{
// The following block is equivalent to the following line without
// having to call floor. (Only for positive inputs, we already now that is in the image)
- // baseIndex[dim] = (long) vcl_floor(contIndex[dim] );
+ // baseIndex[dim] = (long) std::floor(contIndex[dim] );
baseIndex[dim] = (long) contIndex[dim];
distance[dim] = contIndex[dim] - double( baseIndex[dim] );
// get neighbor index and overlap fraction
- for( dim = 0; dim < 3; dim++ )
+ bool neighbIndexSupZero = 1;
+ for( dim = 0; dim < ImageDimension; dim++ )
{
if ( upper & 1 )
{
neighIndex[dim] = baseIndex[dim];
overlap *= 1.0 - distance[dim];
}
+ if (neighIndex[dim] < 0)
+ neighbIndexSupZero = 0;
upper >>= 1;
}
//JV shouldn't we verify that the index is not over the upper border instead of zero?
// Set neighbor value only if overlap is not zero and index is still in image
- if( overlap>0.0 && neighIndex[0]>=0 && neighIndex[1]>=0 && neighIndex[2]>=0 )
+ if ( overlap>0.0 && neighbIndexSupZero )
{
//what to store? the weighted displacement vector of Input2?
totalDisplacement+=m_Input2->GetPixel(neighIndex)*overlap;