...

diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index dc09633f5e0a5b9a54f69eb49c3433c646f7f596..8dacb5d6a80b9435c93eb521968c26c840f7eb67 100644 (file)
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -3,7 +3,7 @@
 ## ===============================
 
 SET(cpPlugins_CONFIG_NUMBER_OF_FILES "10" CACHE STRING "Number of compiled files.")
-SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "2;3" CACHE STRING "Accepted processing dimensions.")
+SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "1;2;3" CACHE STRING "Accepted processing dimensions.")
 SET(cpPlugins_CONFIG_VISUAL_DIMENSIONS "2;3" CACHE STRING "Accepted visual dimensions.")
 
 SET(

diff --git a/lib/cpInstances/ITKNeighborhoodImageIterators.i b/lib/cpInstances/ITKNeighborhoodImageIterators.i
index 74312fc9317bbb58d08716881e5e0fee989061ba..dd592ce0a4dc5c2f6c5984fa1d353c2c0473fa92 100644 (file)
--- a/lib/cpInstances/ITKNeighborhoodImageIterators.i
+++ b/lib/cpInstances/ITKNeighborhoodImageIterators.i
@@ -20,13 +20,14 @@ tinclude itk#co#:h|hxx
 tinclude itk#op#:h|hxx
 tinclude itk#it#:h|hxx
 
+instances itk::NeighborhoodAllocator< #scalar_types#* >
 instances itk::NeighborhoodAllocator< #pi# >
+instances itk::Neighborhood< #scalar_types#*, #pdims#, itk::NeighborhoodAllocator< #scalar_types#* > >
+
 instances itk::#op#< #pi#, #pdims#, itk::NeighborhoodAllocator< #pi# > >
 instances itk::#co#< itk::Image< #pi#, #pdims# >, itk::Image< #pi#, #pdims# > >
 instances itk::#it#< itk::Image< #pi#, #pdims# >, itk::#co#< itk::Image< #pi#, #pdims# >, itk::Image< #pi#, #pdims# > > >
 
-instances itk::Neighborhood< #scalar_types#*, #pdims#, itk::NeighborhoodAllocator< #scalar_types#* > >
-
 tinclude itkNeighborhoodAlgorithm:h|hxx
 instances itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< itk::Image< #pi#, #pdims# > >
 

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9c5005e5b1e1774ec6ffa1c9c9f77973d324535f..c39894952492de5db063edf1b5be96ac99e888af 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -17,9 +17,10 @@ SET(
   ITKFiniteDifference
   ITKLevelSetFilters
   ITKDistanceMapFilters
+  ITKSeparableFilters
+  ITKMorphology
   ITKParaMorphology
   #ITKSliceFilters
-  #ITKSeparableFilters
   #ITKGenericFilters
   #ImageParaMorphologyFilters
   #ImageThresholdFilters
@@ -62,6 +63,15 @@ TARGET_LINK_LIBRARIES(
 TARGET_LINK_LIBRARIES(
   cpPluginsITKDistanceMapFilters
   cpPluginsITKUnaryFunctorFilters
+  cpPluginsITKBinaryFunctorFilters
+  )
+TARGET_LINK_LIBRARIES(
+  cpPluginsITKSeparableFilters
+  cpPluginsITKImageGenericFilters_1
+  )
+TARGET_LINK_LIBRARIES(
+  cpPluginsITKMorphology
+  cpPluginsITKUnaryFunctorFilters
   )
 
 ## eof - $RCSfile$

diff --git a/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i b/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i
index 1bb91eb328ced94e61cb4c7c71e7802bcb4d4ec3..6a703adda6b434a6e09eeb2cd21de9d581a9a1d9 100644 (file)
--- a/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i
+++ b/plugins/ITKDistanceMapFilters/ITKDistanceMapFilters.i
@@ -5,10 +5,11 @@ tinclude itkImageRegionIterator:h|h
 tinclude itkProgressReporter:h|h
 
 tinclude itkBinaryContourImageFilter:h|hxx
-instances itk::BinaryContourImageFilter< itk::Image< #scalar_types#, #pdims# >, itk::Image< #scalar_types#, #pdims# > >
+instances itk::BinaryContourImageFilter< itk::Image< #scalar_types#, #vdims# >, itk::Image< #scalar_types#, #vdims# > >
 
 define filters=SignedMaurerDistanceMapImageFilter
+** ;DanielssonDistanceMapImageFilter;SignedDanielssonDistanceMapImageFilter
 tinclude itk#filters#:h|hxx
-instances itk::#filters#< itk::Image< #scalar_types#, #pdims# >, itk::Image< #real_types#, #pdims# > >
+instances itk::#filters#< itk::Image< #scalar_types#, #vdims# >, itk::Image< #real_types#, #vdims# > >
 
 ** eof - $RCSfile$

diff --git a/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx b/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx
index a8f5767aab96bb31aa785f34aa6785a2ae6ca072..e62f1df171c70def845edad9cc433a3163a3274a 100644 (file)
--- a/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx
+++ b/plugins/ITKDistanceMapFilters/SignedMaurerDistanceMapImageFilter.cxx
@@ -19,12 +19,8 @@ SignedMaurerDistanceMapImageFilter( )
   this->m_Parameters.ConfigureAsBool( "UseImageSpacing", true );
 
   std::vector< std::string > choices;
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
   choices.push_back( "float" );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
   choices.push_back( "double" );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   this->m_Parameters.ConfigureAsChoices( "OutputResolution", choices );
 }
 
@@ -50,12 +46,8 @@ _GD0( _TImage* image )
 {
   std::string out_res =
     this->m_Parameters.GetSelectedChoice( "OutputResolution" );
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
   if( out_res == "float" ) this->_GD1< _TImage, float >( image );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
   if( out_res == "double" ) this->_GD1< _TImage, double >( image );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
 }
 
 // -------------------------------------------------------------------------

diff --git a/plugins/ITKMorphology/ITKMorphology.i b/plugins/ITKMorphology/ITKMorphology.i
new file mode 100644 (file)
index 0000000..0ac9aab
--- /dev/null
+++ b/plugins/ITKMorphology/ITKMorphology.i
@@ -0,0 +1,6 @@
+header #define ITK_MANUAL_INSTANTIATION
+
+tinclude itkBinaryFillholeImageFilter:h|hxx
+instances itk::BinaryFillholeImageFilter< itk::Image< #scalar_types#, #pdims# > >
+
+** eof - $RCSfile$

diff --git a/plugins/ITKSeparableFilters/ITKSeparableFilters.i b/plugins/ITKSeparableFilters/ITKSeparableFilters.i
new file mode 100644 (file)
index 0000000..ad1c5f5
--- /dev/null
+++ b/plugins/ITKSeparableFilters/ITKSeparableFilters.i
@@ -0,0 +1,7 @@
+header #define ITK_MANUAL_INSTANTIATION
+
+define filters=RecursiveSeparableImageFilter;RecursiveGaussianImageFilter;SmoothingRecursiveGaussianImageFilter
+tinclude itk#filters#:h|hxx
+instances itk::#filters#< itk::Image< #scalar_types#, #pdims# >, itk::Image< #real_types#, #pdims# > >
+
+** eof - $RCSfile$

diff --git a/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx b/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx
index 9cf2381d59c82fdc5be9540fb8fffd583e0082ce..44a072c6d8a08035ed0594a86a688b1ecf9c88ea 100644 (file)
--- a/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx
+++ b/plugins/ITKSeparableFilters/SmoothingRecursiveGaussianImageFilter.cxx
@@ -36,12 +36,8 @@ _GD0( _TImage* image )
 {
   std::string out_res =
     this->m_Parameters.GetSelectedChoice( "OutputResolution" );
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
   if( out_res == "float" ) this->_GD1< _TImage, float >( image );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
   if( out_res == "double" ) this->_GD1< _TImage, double >( image );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
 }
 
 // -------------------------------------------------------------------------

diff --git a/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i b/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i
index ee6255566998011511848639ce1b8e9c53dec09c..4bf7475f0fb260dae0e3500b88461b7ea4de7480 100644 (file)
--- a/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i
+++ b/plugins/ITKUnaryFunctorFilters/ITKUnaryFunctorFilters.i
@@ -14,6 +14,9 @@ instances itk::UnaryFunctorImageFilter< itk::Image< #scalar_types#, #pdims# >, i
 
 instances itk::UnaryFunctorImageFilter< itk::Image< #all_ints#, #pdims# >, itk::Image< #all_ints#, #pdims# >, itk::Functor::#b_functor#< #all_ints#, #all_ints# > >
 
+cinclude itkBinaryNotImageFilter.h
+instances itk::UnaryFunctorImageFilter< itk::Image< #scalar_types#, #pdims# >, itk::Image< #scalar_types#, #pdims# >, itk::Functor::BinaryNot< #scalar_types# > >
+
 define oa_filters=InvertIntensityImageFilter
 tinclude itk#oa_filters#:h|hxx
 instances itk::#oa_filters#< itk::Image< #scalar_types#, #pdims# >, itk::Image< #scalar_types#, #pdims# > >