diff --git a/include/itkTileMergeImageFilter.h b/include/itkTileMergeImageFilter.h index f91537a7..be75c512 100644 --- a/include/itkTileMergeImageFilter.h +++ b/include/itkTileMergeImageFilter.h @@ -160,7 +160,7 @@ class ITK_TEMPLATE_EXPORT TileMergeImageFilter * To be called for each tile position in the mosaic * before the call to Update(). */ void - SetTileTransform(TileIndexType position, TransformConstPointer transform); + SetTileTransform(TileIndexType position, const TransformType * transform); /** Get/Set background value (used if CropToFill is false). * Default PixelType's value (usually zero) if not set. */ diff --git a/include/itkTileMergeImageFilter.hxx b/include/itkTileMergeImageFilter.hxx index 9af78418..6896143a 100644 --- a/include/itkTileMergeImageFilter.hxx +++ b/include/itkTileMergeImageFilter.hxx @@ -68,7 +68,7 @@ TileMergeImageFilter::SetMontag { m_Montage = montage; this->SetMontageSize(montage->m_MontageSize); - this->m_FinishedPairs = montage->m_FinishedPairs; + this->m_FinishedPairs.store(montage->m_FinishedPairs); this->m_OriginAdjustment = montage->m_OriginAdjustment; this->m_ForcedSpacing = montage->m_ForcedSpacing; @@ -136,7 +136,7 @@ TileMergeImageFilter::SetMontag template void TileMergeImageFilter::SetTileTransform(TileIndexType position, - TransformConstPointer transform) + const TransformType * transform) { SizeValueType linInd = this->nDIndexToLinearIndex(position); if (m_Transforms[linInd].IsNull() || m_Transforms[linInd]->GetParameters() != transform->GetParameters() || @@ -468,7 +468,7 @@ TileMergeImageFilter::ResampleS bool interpolate = false; if (m_Montage.IsNotNull()) // we can check whether interpolation was used { - const auto InterpolationNone = Superclass::PCMOptimizerType::PeakInterpolationMethod::None; + const auto InterpolationNone = Superclass::PCMOptimizerType::PeakInterpolationMethodEnum::None; interpolate = (m_Montage->GetPeakInterpolationMethod() != InterpolationNone); } else // examine alignment of image grids of all the contributing regions diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt index 1319a641..6fef40b2 100644 --- a/wrapping/CMakeLists.txt +++ b/wrapping/CMakeLists.txt @@ -4,6 +4,8 @@ set(WRAPPER_SUBMODULE_ORDER itkPhaseCorrelationOptimizer itkPhaseCorrelationImageRegistrationMethod itkMaxPhaseCorrelationOptimizer + itkTileConfiguration + itkTileMontage ) itk_auto_load_submodules() itk_end_wrap_module() diff --git a/wrapping/itkTileMergeImageFilter.wrap b/wrapping/itkTileMergeImageFilter.wrap new file mode 100644 index 00000000..ce34ffec --- /dev/null +++ b/wrapping/itkTileMergeImageFilter.wrap @@ -0,0 +1,7 @@ +itk_wrap_class("itk::TileMergeImageFilter" POINTER) + foreach(d ${ITK_WRAP_IMAGE_DIMS}) + foreach(t ${WRAP_ITK_SCALAR}) + itk_wrap_template("${ITKM_I${t}${d}}${ITKM_D}" "${ITKT_I${t}${d}},${ITKT_D}") + endforeach() + endforeach() +itk_end_wrap_class()