...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e161e434f4b0d3a23e46766c6fa9c864e507b4c..fa99d79b5aeca0f32aa5ba63c7e28dbcf85a3a47 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,11 @@ INCLUDE(cmake/Functions.cmake)
 ## == Build different parts ==
 ## ===========================
 
-SUBDIRS(appli cmake lib plugins)
+SUBDIRS(
+  appli
+  cmake
+  lib
+  plugins
+  )
 
 ## eof - $RCSfile$

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index 7daf31923ad5fd4bb8af0418a93bb25c3992e6ff..d08e21e9deac165006ebad4f9fe926b6b1112a99 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,4 +1,9 @@
 
-SUBDIRS(bash plugins examples PipelineEditor)
+SUBDIRS(
+  bash
+  plugins
+  examples
+  PipelineEditor
+  )
 
 ## eof - $RCSfile$

diff --git a/appli/bash/Config.h.in b/appli/bash/Config.h.in
index 09eb4170633fe98fc6b30fb8e131b926050428e4..059ba1e779eabb51fa1e2a2199b798b8bcbe28b8 100644 (file)
--- a/appli/bash/Config.h.in
+++ b/appli/bash/Config.h.in
@@ -13,15 +13,10 @@
 #include <string>
 
 // -------------------------------------------------------------------------
-#define cpPlugins_CONFIG_BOOLEAN_TYPES      "@cpPlugins_CONFIG_BOOLEAN_TYPES@"
-#define cpPlugins_CONFIG_INTEGER_TYPES      "@cpPlugins_CONFIG_INTEGER_TYPES@"
-#define cpPlugins_CONFIG_REAL_TYPES         "@cpPlugins_CONFIG_REAL_TYPES@"
 #define cpPlugins_CONFIG_PROCESS_DIMENSIONS "@cpPlugins_CONFIG_PROCESS_DIMENSIONS@"
 #define cpPlugins_CONFIG_VISUAL_DIMENSIONS  "@cpPlugins_CONFIG_VISUAL_DIMENSIONS@"
 #define cpPlugins_CONFIG_COLOR_PIXELS       "@cpPlugins_CONFIG_COLOR_PIXELS@"
-#define cpPlugins_CONFIG_VECTORS            "@cpPlugins_CONFIG_VECTORS@"
-#define cpPlugins_CONFIG_DIFFUSIONTENSORS   "@cpPlugins_CONFIG_DIFFUSIONTENSORS@"
-#define cpPlugins_CONFIG_MATRICES           "@cpPlugins_CONFIG_MATRICES@"
+#define cpPlugins_CONFIG_VECTOR_PIXELS      "@cpPlugins_CONFIG_VECTOR_PIXELS@"
 #define cpPlugins_ALL_CONFIGS               "@cpPlugins_ALL_CONFIGS@"
 #define cpPlugins_CONFIG_NUMBER_OF_FILES    @cpPlugins_CONFIG_NUMBER_OF_FILES@
 
@@ -134,45 +129,32 @@ namespace cpPlugins_bash
   // -----------------------------------------------------------------------
   inline void LoadDefinitions( TCommands& commands )
   {
+    // Dimensions
     commands[ "define" ].push_back(
-      std::string( "int_types=" ) +
-      std::string( cpPlugins_CONFIG_INTEGER_TYPES )
-      );
-    commands[ "define" ].push_back(
-      std::string( "real_types=" ) +
-      std::string( cpPlugins_CONFIG_REAL_TYPES )
-      );
-    commands[ "define" ].push_back(
-      std::string( "process_dims=" ) +
+      std::string( "pdims=" ) +
       std::string( cpPlugins_CONFIG_PROCESS_DIMENSIONS )
       );
     commands[ "define" ].push_back(
-      std::string( "visual_dims=" ) +
+      std::string( "vdims=" ) +
       std::string( cpPlugins_CONFIG_VISUAL_DIMENSIONS )
       );
+
+    // Base c++ types
     commands[ "define" ].push_back(
-      std::string( "color_pixels=" ) +
-      std::string( cpPlugins_CONFIG_COLOR_PIXELS )
+      std::string( "int_types=char;short;int;long" )
       );
     commands[ "define" ].push_back(
-      std::string( "vectors=" ) +
-      std::string( cpPlugins_CONFIG_VECTORS )
+      std::string( "uint_types=unsigned #int_types#" )
       );
     commands[ "define" ].push_back(
-      std::string( "diff_tensors=" ) +
-      std::string( cpPlugins_CONFIG_DIFFUSIONTENSORS )
+      std::string( "sint_types=signed char" )
       );
     commands[ "define" ].push_back(
-      std::string( "matrices=" ) +
-      std::string( cpPlugins_CONFIG_MATRICES )
+      std::string( "real_types=float;double" )
       );
-    if( std::string( cpPlugins_CONFIG_INTEGER_TYPES ) != "" )
-      commands[ "define" ].push_back(
-        std::string( "uint_types=unsigned #int_types#" )
-        );
     commands[ "define" ].push_back(
       std::string(
-        "scalar_pixels=#int_types#;#uint_types#;#real_types#"
+        "scalar_types=#int_types#;#uint_types#;#real_types#"
         )
       );
   }

diff --git a/appli/bash/CreateDemanglers.cxx b/appli/bash/CreateDemanglers.cxx
index 0b90d59777f75e175332f3bc7c59ae2c5cc8acf8..a68117f3a34ebe32d59efb6c5509a712fe831669 100644 (file)
--- a/appli/bash/CreateDemanglers.cxx
+++ b/appli/bash/CreateDemanglers.cxx
@@ -23,7 +23,7 @@ int main( int argc, char* argv[] )
   std::string definitions_buffer;
   if( !( cpPlugins_bash::Read( definitions_buffer, definitions_filename ) ) )
   {
-    std::cout
+    std::cerr
       << argv[ 0 ]
       <<  ": Error reading definitions file \"" << definitions_filename
       << "\"" << std::endl;

diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index edd812663cbc30231a902277c3d2a46a5c879088..dc09633f5e0a5b9a54f69eb49c3433c646f7f596 100644 (file)
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -3,25 +3,13 @@
 ## ===============================
 
 SET(cpPlugins_CONFIG_NUMBER_OF_FILES "10" CACHE STRING "Number of compiled files.")
-SET(cpPlugins_CONFIG_INTEGER_TYPES "char;short;int;long" CACHE STRING "Accepted integer types.")
-SET(cpPlugins_CONFIG_REAL_TYPES "float;double" CACHE STRING "Accepted real types.")
-SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "1;2;3;4" CACHE STRING "Accepted processing dimensions.")
+SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "2;3" CACHE STRING "Accepted processing dimensions.")
 SET(cpPlugins_CONFIG_VISUAL_DIMENSIONS "2;3" CACHE STRING "Accepted visual dimensions.")
-SET(cpPlugins_CONFIG_COLOR_PIXELS "RGBPixel;RGBAPixel" CACHE STRING "Accepted color pixels.")
-SET(cpPlugins_CONFIG_VECTORS "CovariantVector;Point;SymmetricSecondRankTensor;Vector" CACHE STRING "Accepted vectors.")
-SET(cpPlugins_CONFIG_DIFFUSIONTENSORS "DiffusionTensor3D" CACHE STRING "Accepted diffusion tensors.")
-SET(cpPlugins_CONFIG_MATRICES "Matrix" CACHE STRING "Accepted matrices.")
 
 SET(
   _all_configs
-  cpPlugins_CONFIG_INTEGER_TYPES
-  cpPlugins_CONFIG_REAL_TYPES
   cpPlugins_CONFIG_PROCESS_DIMENSIONS
   cpPlugins_CONFIG_VISUAL_DIMENSIONS
-  cpPlugins_CONFIG_COLOR_PIXELS
-  cpPlugins_CONFIG_VECTORS
-  cpPlugins_CONFIG_DIFFUSIONTENSORS
-  cpPlugins_CONFIG_MATRICES
   )
 SET(_real_configs)
 FOREACH(_cfg ${_all_configs})

diff --git a/lib/cpInstances/BaseImageFilters.i b/lib/cpInstances/BaseImageFilters.i
deleted file mode 100644 (file)
index e6cff25..0000000
--- a/lib/cpInstances/BaseImageFilters.i
+++ /dev/null
@@ -1,42 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define filters=ImageToImageFilter;InPlaceImageFilter
-define in_scalars=#scalar_pixels#
-define out_scalars=#scalar_pixels#
-define in_reals=#real_types#
-define out_reals=#real_types#
-
-tinclude itk#filters#:h|hxx
-tinclude itkImageAlgorithm:h|hxx
-tinclude itkMinimumMaximumImageCalculator:h|hxx
-
-cinclude complex
-cinclude itkImage.h
-cinclude itk#color_pixels#.h
-cinclude itk#vectors#.h
-cinclude itk#diff_tensors#.h
-cinclude itk#matrices#.h
-cinclude itkOffset.h
-
-instances itk::MinimumMaximumImageCalculator< itk::Image< #scalar_pixels#, #process_dims# > >
-instances itk::#filters#< itk::Image< #in_scalars#, #process_dims# >, itk::Image< #out_scalars#, #process_dims# > >
-instances itk::#filters#< itk::Image< std::complex< #in_reals# >, #process_dims# >, itk::Image< std::complex< #out_reals# >, #process_dims# > >
-instances itk::#filters#< itk::Image< itk::#color_pixels#< #in_scalars# >, #process_dims# >, itk::Image< itk::#color_pixels#< #out_scalars# >, #process_dims# > >
-instances itk::#filters#< itk::Image< itk::#vectors#< #in_reals#, #process_dims# >, #process_dims# >, itk::Image< itk::#vectors#< #out_reals#, #process_dims# >, #process_dims# > >
-instances itk::#filters#< itk::Image< itk::#diff_tensors#< #in_reals# >, 3 >, itk::Image< itk::#diff_tensors#< #out_reals# >, 3 > >
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< #in_scalars#, #process_dims# >, itk::Image< #out_scalars#, #process_dims# >  >( itk::Image< #in_scalars#, #process_dims# > const*, itk::Image< #out_scalars#, #process_dims# >*, itk::Image< #in_scalars#, #process_dims# >::RegionType const&, itk::Image< #out_scalars#, #process_dims# >::RegionType const&, std::integral_constant< bool, true > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< itk::#color_pixels#< #in_scalars# >, #process_dims# >, itk::Image< itk::#color_pixels#< #out_scalars# >, #process_dims# >  >( itk::Image< itk::#color_pixels#< #in_scalars# >, #process_dims# > const*, itk::Image< itk::#color_pixels#< #out_scalars# >, #process_dims# >*, itk::Image< itk::#color_pixels#< #in_scalars# >, #process_dims# >::RegionType const&, itk::Image< itk::#color_pixels#< #out_scalars# >, #process_dims# >::RegionType const&, std::integral_constant< bool, true > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< itk::#vectors#< #in_reals#, #process_dims# >, #process_dims# >, itk::Image< itk::#vectors#< #out_reals#, #process_dims# >, #process_dims# >  >( itk::Image< itk::#vectors#< #in_reals#, #process_dims# >, #process_dims# > const*, itk::Image< itk::#vectors#< #out_reals#, #process_dims# >, #process_dims# >*, itk::Image< itk::#vectors#< #in_reals#, #process_dims# >, #process_dims# >::RegionType const&, itk::Image< itk::#vectors#< #out_reals#, #process_dims# >, #process_dims# >::RegionType const&, std::integral_constant< bool, true > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< itk::#diff_tensors#< #in_reals# >, 3 >, itk::Image< itk::#diff_tensors#< #out_reals# >, 3 >  >( itk::Image< itk::#diff_tensors#< #in_reals# >, 3 > const*, itk::Image< itk::#diff_tensors#< #out_reals# >, 3 >*, itk::Image< itk::#diff_tensors#< #in_reals# >, 3 >::RegionType const&, itk::Image< itk::#diff_tensors#< #out_reals# >, 3 >::RegionType const&, std::integral_constant< bool, true > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< itk::#matrices#< #in_reals#, #process_dims#, #process_dims# >, #process_dims# >, itk::Image< itk::#matrices#< #in_reals#, #process_dims#, #process_dims# >, #process_dims# >  >( itk::Image< itk::#matrices#< #in_reals#, #process_dims#, #process_dims# >, #process_dims# > const*, itk::Image< itk::#matrices#< #in_reals#, #process_dims#, #process_dims# >, #process_dims# >*, itk::Image< itk::#matrices#< #in_reals#, #process_dims#, #process_dims# >, #process_dims# >::RegionType const&, itk::Image< itk::#matrices#< #in_reals#, #process_dims#, #process_dims# >, #process_dims# >::RegionType const&, std::integral_constant< bool, true > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< itk::Offset< #process_dims# >, #process_dims# >, itk::Image< itk::Offset< #process_dims# >, #process_dims# >  >( itk::Image< itk::Offset< #process_dims# >, #process_dims# > const*, itk::Image< itk::Offset< #process_dims# >, #process_dims# >*, itk::Image< itk::Offset< #process_dims# >, #process_dims# >::RegionType const&, itk::Image< itk::Offset< #process_dims# >, #process_dims# >::RegionType const&, std::integral_constant< bool, true > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< std::complex< #in_reals# >, #process_dims# >, itk::Image< std::complex< #out_reals# >, #process_dims# >  >( itk::Image< std::complex< #in_reals# >, #process_dims# > const*, itk::Image< std::complex< #out_reals# >, #process_dims# >*, itk::Image< std::complex< #in_reals# >, #process_dims# >::RegionType const&, itk::Image< std::complex< #out_reals# >, #process_dims# >::RegionType const&, std::integral_constant< bool, true > )
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/BaseObjects.i b/lib/cpInstances/BaseObjects.i
deleted file mode 100644 (file)
index 7827c23..0000000
--- a/lib/cpInstances/BaseObjects.i
+++ /dev/null
@@ -1,37 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define arrays=Array2D;Array;#color_pixels#
-define fixed_dims=1;2;3;4;6;8;10
-
-tinclude itk#arrays#:h|hxx
-tinclude itkFixedArray:h|hxx
-tinclude itk#diff_tensors#:h|hxx
-tinclude itk#vectors#:h|hxx
-tinclude itk#matrices#:h|hxx
-tinclude itkSymmetricEigenAnalysis:h|hxx
-tinclude itkSimpleDataObjectDecorator:h|hxx
-tinclude itkVariableLengthVector:h|hxx
-
-cinclude string
-
-instances itk::SimpleDataObjectDecorator< #scalar_pixels# >
-instances itk::SimpleDataObjectDecorator< std::string >
-instances itk::VariableLengthVector< #scalar_pixels# >
-
-instances itk::#arrays#< #scalar_pixels# >
-instances itk::FixedArray< #scalar_pixels#, #fixed_dims# >
-instances itk::#diff_tensors#< #real_types# >
-instances itk::#vectors#< #real_types#, #process_dims# >
-instances itk::#matrices#< #real_types#, #process_dims#, #process_dims# >
-
-instances itk::SymmetricEigenAnalysis< itk::Matrix< #real_types#, #process_dims#, #process_dims# >, itk::FixedArray< #real_types#, #process_dims# >, itk::Matrix< #real_types#, #process_dims#, #process_dims# > >
-
-define my_vectors=FixedArray;Vector;Point
-
-minstances #_export_# std::ostream& itk::operator<< < #real_types#, #process_dims# >( std::ostream& a, itk::#my_vectors#< #real_types#, #process_dims# > const& b )
-
-minstances void #_export_# itk::VariableLengthVector<  #real_types# >::SetSize< itk::VariableLengthVector< #real_types# >::AlwaysReallocate, itk::VariableLengthVector< #real_types# >::KeepOldValues >( unsigned int, itk::VariableLengthVector< #real_types# >::AlwaysReallocate, itk::VariableLengthVector< #real_types# >::KeepOldValues )
-
-minstances void #_export_# itk::VariableLengthVector< #real_types# >::SetSize<itk::VariableLengthVector< #real_types# >::ShrinkToFit, itk::VariableLengthVector< #real_types# >::KeepOldValues>(unsigned int, itk::VariableLengthVector< #real_types# >::ShrinkToFit, itk::VariableLengthVector< #real_types# >::KeepOldValues)
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/BinaryFunctorFilters.i b/lib/cpInstances/BinaryFunctorFilters.i
deleted file mode 100644 (file)
index 28db213..0000000
--- a/lib/cpInstances/BinaryFunctorFilters.i
+++ /dev/null
@@ -1,17 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define b_functors=AND;OR;XOR
-define b_filters=And;Or;Xor
-define a_functors=Add2;Sub2;Mult;Div;DivideOrZeroOut;Pow
-define a_filters=Add;Subtract;Multiply;Divide;DivideOrZeroOut;Pow
-define all_ints=#int_types#;#uint_types#
-
-tinclude itkBinaryFunctorImageFilter:h|hxx
-cinclude itk#b_filters#ImageFilter.h
-cinclude itk#a_filters#ImageFilter.h
-
-instances itk::BinaryFunctorImageFilter< itk::Image< #all_ints#, #process_dims# >, itk::Image< #all_ints#, #process_dims# >, itk::Image< #all_ints#, #process_dims# >, itk::Functor::#b_functors#< #all_ints#, #all_ints#, #all_ints# > >
-
-instances itk::BinaryFunctorImageFilter< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #scalar_pixels#, #process_dims# >, itk::Functor::#a_functors#< #scalar_pixels#, #scalar_pixels#, #scalar_pixels# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/BoundingBox.h b/lib/cpInstances/BoundingBox.h
index bba8a7d63aec8ecadb520216e9e8e1c2e2a825ce..c210b0ada0f1198c006fbce9487b1b2a85bc358d 100644 (file)
--- a/lib/cpInstances/BoundingBox.h
+++ b/lib/cpInstances/BoundingBox.h
@@ -1,7 +1,7 @@
 #ifndef __cpInstances__BoundingBox__h__
 #define __cpInstances__BoundingBox__h__
 
-#include <cpInstances/cpInstancesBoundingBox_Export.h>
+#include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <vector>
 #include <cpPlugins/BaseObjects/DataObject.h>
 #include <vtkOutlineSource.h>
@@ -11,7 +11,7 @@ namespace cpInstances
 {
   /**
    */
-  class cpInstancesBoundingBox_EXPORT BoundingBox
+  class cpPluginsDataObjects_EXPORT BoundingBox
     : public cpPlugins::BaseObjects::DataObject
   {
   public:

diff --git a/lib/cpInstances/BoundingBox.i b/lib/cpInstances/BoundingBox.i
deleted file mode 100644 (file)
index 6e50565..0000000
--- a/lib/cpInstances/BoundingBox.i
+++ /dev/null
@@ -1,10 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-tinclude itkBoundingBox:h|hxx
-
-cinclude itkVectorContainer.hxx
-
-instances itk::BoundingBox< unsigned long, #process_dims#, float, itk::VectorContainer< unsigned long, itk::Point< #real_types#, #process_dims# > > >
-instances itk::BoundingBox< unsigned long, #process_dims#, double, itk::VectorContainer< unsigned long, itk::Point< #real_types#, #process_dims# > > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/CMakeLists.txt b/lib/cpInstances/CMakeLists.txt
index c9f77b811b04a69303be9c517792a8987dfefe2d..fc1eb7e24636cd43f7283284cfe78e842cd028c4 100644 (file)
--- a/lib/cpInstances/CMakeLists.txt
+++ b/lib/cpInstances/CMakeLists.txt
@@ -1,178 +1,82 @@
+SET(_pfx cpInstances)
+
+## ======================
+## == Base itk objects ==
+## ======================
 
 SET(
-  _definitions
-  BaseObjects
-  Transforms
-  BoundingBox
-  Mesh
-  ScalarImages
-  ComplexImages
-  ColorImages
-  VectorImages
-  MatrixImages
-  Image
-  ImageIterators
-  ImageInterpolators
-  NeighborhoodImageIterators
-  BaseImageFilters
-  ComplexImageFilters
-  ImagesIO
-  UnaryFunctorFilters
-  BinaryFunctorFilters
-  DistanceMapFilters
-  ImageSliceFilters
-  ImageSeparableFilters
-  ExtractImageFilters
-  ITKDifferenceImageFilters
-  ITKAnisotropicSmoothing
-  ITKLevelSetFilters
-  ITKImageFeatureFilters
-  PolyLineParametricPath
-  Simple3DCurve
-  Skeleton
+  _base
+  ITKBaseObjects
   )
+FOREACH(_b ${_base})
+  CreateLib(${_pfx}${_b} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/${_b}.i)
+  TARGET_LINK_LIBRARIES(${_pfx}${_b} ${ITK_LIBRARIES})
+ENDFOREACH(_b ${_base})
 
-## =======================
-## == Compile instances ==
-## =======================
-
-SET(_all_libs)
-FOREACH(_d ${_definitions})
-  FILE(GLOB _files ${CMAKE_CURRENT_SOURCE_DIR}/${_d}.*)
-  CreateLib(cpInstances${_d} SHARED ${_files})
-  TARGET_LINK_LIBRARIES(
-    cpInstances${_d}
-    ${ITK_LIBRARIES} ${VTK_LIBRARIES}
-    )
-  LIST(APPEND _all_libs cpInstances${_d})
-ENDFOREACH(_d)
-
-## =====================
-## == Further linking ==
-## =====================
+## ===========================
+## == Base itk data objects ==
+## ===========================
 
-SET(_pfx cpInstances)
-TARGET_LINK_LIBRARIES(${_pfx}BoundingBox ${_pfx}BaseObjects cpPlugins)
-TARGET_LINK_LIBRARIES(${_pfx}Transforms ${_pfx}BaseObjects)
-TARGET_LINK_LIBRARIES(${_pfx}Mesh ${_pfx}BoundingBox)
-TARGET_LINK_LIBRARIES(${_pfx}ScalarImages ${_pfx}BaseObjects)
-TARGET_LINK_LIBRARIES(${_pfx}ComplexImages ${_pfx}ScalarImages)
-TARGET_LINK_LIBRARIES(${_pfx}ColorImages ${_pfx}ScalarImages)
-TARGET_LINK_LIBRARIES(${_pfx}VectorImages ${_pfx}ScalarImages)
-TARGET_LINK_LIBRARIES(${_pfx}MatrixImages ${_pfx}ScalarImages)
-TARGET_LINK_LIBRARIES(
-  ${_pfx}Image
-  ${_pfx}ScalarImages
-  ${_pfx}ComplexImages
-  ${_pfx}ColorImages
-  ${_pfx}VectorImages
-  ${_pfx}MatrixImages
-  cpPlugins
+CreateLib(
+  ${_pfx}ITKDataObjects
+  SHARED
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKBoundingBoxes.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKImages.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKMeshes.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKPaths.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKTransforms.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKImageInterpolators.i
   )
-TARGET_LINK_LIBRARIES(${_pfx}ImageIterators ${_pfx}Image)
-TARGET_LINK_LIBRARIES(${_pfx}ImageInterpolators ${_pfx}Image)
-TARGET_LINK_LIBRARIES(${_pfx}NeighborhoodImageIterators ${_pfx}Image)
-TARGET_LINK_LIBRARIES(${_pfx}BaseImageFilters ${_pfx}ImageIterators)
 TARGET_LINK_LIBRARIES(
-  ${_pfx}ComplexImageFilters
-  ${_pfx}ImageIterators
-  ${_pfx}NeighborhoodImageIterators
+  ${_pfx}ITKDataObjects
+  ${_pfx}ITKBaseObjects ${VTK_LIBRARIES}
   )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ImagesIO
-  ${_pfx}ScalarImages
-  ${_pfx}ColorImages
-  ${_pfx}VectorImages
-  ${_pfx}Image
-  ${_pfx}ImageIterators
-  ${_pfx}BaseImageFilters
+
+CreateLib(
+  ${_pfx}ITKImageIterators
+  SHARED
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKSimpleImageIterators.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKNeighborhoodImageIterators.i
   )
 TARGET_LINK_LIBRARIES(
-  ${_pfx}UnaryFunctorFilters
-  ${_pfx}Image
-  ${_pfx}ImageIterators
-  ${_pfx}BaseImageFilters
+  ${_pfx}ITKImageIterators
+  ${_pfx}ITKDataObjects
   )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}BinaryFunctorFilters
-  ${_pfx}Image
-  ${_pfx}ImageIterators
-  ${_pfx}BaseImageFilters
+
+CreateLib(
+  ${_pfx}ITKBaseImageFilters
+  SHARED
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITKBaseImageFilters.i
+  ${CMAKE_CURRENT_SOURCE_DIR}/ITK2VTKImageFilters.i
   )
 TARGET_LINK_LIBRARIES(
-  ${_pfx}DistanceMapFilters
-  ${_pfx}UnaryFunctorFilters
-  ${_pfx}Image
-  ${_pfx}ImageIterators
-  ${_pfx}NeighborhoodImageIterators
-  ${_pfx}BaseImageFilters
+  ${_pfx}ITKBaseImageFilters
+  ${_pfx}ITKImageIterators
   )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}PolyLineParametricPath
-  ${_pfx}BaseObjects
-  cpPlugins
+
+CreateLib(
+  cpPluginsDataObjects
+  SHARED
+  ${CMAKE_CURRENT_SOURCE_DIR}/Image.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/Image.d
+  ${CMAKE_CURRENT_SOURCE_DIR}/Image.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/Mesh.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/Mesh.d
+  ${CMAKE_CURRENT_SOURCE_DIR}/Mesh.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/PolyLineParametricPath.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/PolyLineParametricPath.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/PolyLineParametricPath.d
+  ${CMAKE_CURRENT_SOURCE_DIR}/BoundingBox.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/BoundingBox.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/Skeleton.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/Skeleton.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/Skeleton.d
   )
+
 TARGET_LINK_LIBRARIES(
-  ${_pfx}Simple3DCurve
-  cpExtensions
+  cpPluginsDataObjects
   cpPlugins
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}Skeleton
-  ${_pfx}PolyLineParametricPath
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ImageSliceFilters
-  ${_pfx}Image
-  ${_pfx}ImageIterators
-  ${_pfx}NeighborhoodImageIterators
-  ${_pfx}ImageInterpolators
-  ${_pfx}BaseImageFilters
-  ${_pfx}ComplexImageFilters
-  ${_pfx}ExtractImageFilters
-  ${_pfx}Transforms
-  ${_pfx}Simple3DCurve
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ImageSeparableFilters
-  ${_pfx}Image
-  ${_pfx}BaseImageFilters
-  ${_pfx}UnaryFunctorFilters
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ExtractImageFilters
-  ${_pfx}Image
-  ${_pfx}BaseImageFilters
-  ${_pfx}ComplexImageFilters
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ITKImageFeatureFilters
-  ${_pfx}Image
-  ${_pfx}BaseImageFilters
-  ${_pfx}ComplexImageFilters
-  ${_pfx}NeighborhoodImageIterators
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ITKDifferenceImageFilters
-  ${_pfx}Image
-  ${_pfx}BaseImageFilters
-  ${_pfx}ComplexImageFilters
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ITKAnisotropicSmoothing
-  ${_pfx}ITKDifferenceImageFilters
-  )
-TARGET_LINK_LIBRARIES(
-  ${_pfx}ITKLevelSetFilters
-  ${_pfx}ITKAnisotropicSmoothing
-  ${_pfx}UnaryFunctorFilters
-  ${_pfx}Image
-  ${_pfx}ImageIterators
-  ${_pfx}NeighborhoodImageIterators
-  ${_pfx}BaseImageFilters
-  ${_pfx}ImageInterpolators
-  ${_pfx}ExtractImageFilters
-  ${_pfx}ITKImageFeatureFilters
+  ${_pfx}ITKBaseImageFilters
   )
 
 ## ===================================================
@@ -180,7 +84,11 @@ TARGET_LINK_LIBRARIES(
 ## ===================================================
 
 SET(
-  cpPlugins_AllInstances ${_all_libs}
+  cpPlugins_AllInstances
+  ${_pfx}ITKBaseObjects
+  ${_pfx}ITKDataObjects
+  ${_pfx}ITKImageIterators
+  ${_pfx}ITKBaseImageFilters
   CACHE INTERNAL "All valid instances." FORCE
   )
 

diff --git a/lib/cpInstances/ColorImages.i b/lib/cpInstances/ColorImages.i
deleted file mode 100644 (file)
index 6b54e68..0000000
--- a/lib/cpInstances/ColorImages.i
+++ /dev/null
@@ -1,18 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define base_filters=ImageSource
-define i2v=VTKImageExport;VTKImageImport;ImageToVTKImageFilter;VTKImageToImageFilter
-
-tinclude itkImportImageContainer:h|hxx
-tinclude itkImage:h|hxx
-tinclude itk#base_filters#:h|hxx
-tinclude itk#i2v#:h|hxx
-
-cinclude itk#color_pixels#.h
-
-instances itk::ImportImageContainer< unsigned long, itk::#color_pixels#< #scalar_pixels# > >
-instances itk::Image< itk::#color_pixels#< #scalar_pixels# >, #process_dims# >
-instances itk::#base_filters#< itk::Image< itk::#color_pixels#< #scalar_pixels# >, #process_dims# > >
-instances itk::#i2v#< itk::Image< itk::#color_pixels#< #scalar_pixels# >, #visual_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ComplexImageFilters.i b/lib/cpInstances/ComplexImageFilters.i
deleted file mode 100644 (file)
index dc1e9dd..0000000
--- a/lib/cpInstances/ComplexImageFilters.i
+++ /dev/null
@@ -1,37 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define filters=ImageToImageFilter;InPlaceImageFilter
-define in_scalars=#scalar_pixels#
-define out_scalars=#scalar_pixels#
-define in_reals=#real_types#
-define out_reals=#real_types#
-
-tinclude itk#filters#:h|hxx
-tinclude itkImageAlgorithm:h|hxx
-tinclude itkNeighborhoodAlgorithm:h|hxx
-tinclude itkNeighborhoodOperatorImageFilter:h|hxx
-tinclude itkNeighborhoodInnerProduct:h|hxx
-
-cinclude complex
-cinclude itkImage.h
-cinclude itk#color_pixels#.h
-cinclude itk#vectors#.h
-cinclude itk#diff_tensors#.h
-cinclude itk#matrices#.h
-cinclude itkOffset.h
-
-instances itk::#filters#< itk::Image< #in_scalars#, 3 >, itk::Image< #out_scalars#, 2 > >
-instances itk::#filters#< itk::Image< #in_scalars#, 2 >, itk::Image< #out_scalars#, 3 > >
-instances itk::#filters#< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< itk::CovariantVector< #real_types#, #process_dims# >, #process_dims# > >
-instances itk::#filters#< itk::Image< itk::CovariantVector< #real_types#, #process_dims# >, #process_dims# >, itk::Image< #scalar_pixels#, #process_dims# > >
-
-instances itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< itk::Image< signed char, #process_dims# > >
-instances itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< itk::Image< #scalar_pixels#, #process_dims# > >
-instances itk::NeighborhoodInnerProduct< itk::Image< #scalar_pixels#, #process_dims# >, #in_reals#, #out_reals# >
-instances itk::NeighborhoodOperatorImageFilter< itk::Image< #in_scalars#, #process_dims# >, itk::Image< #out_scalars#, #process_dims# >, #real_types# >
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< #scalar_pixels#, 3 >, itk::Image< #scalar_pixels#, 2 > >( itk::Image< #scalar_pixels#, 3 > const*, itk::Image< #scalar_pixels#, 2 >*, itk::Image< #scalar_pixels#, 3 >::RegionType const&, itk::Image< #scalar_pixels#, 2 >::RegionType const&, std::integral_constant< bool, false > )
-
-minstances void #_export_# itk::ImageAlgorithm::DispatchedCopy< itk::Image< #scalar_pixels#, 2 >, itk::Image< #scalar_pixels#, 3 > >( itk::Image< #scalar_pixels#, 2 > const*, itk::Image< #scalar_pixels#, 3 >*, itk::Image< #scalar_pixels#, 2 >::RegionType const&, itk::Image< #scalar_pixels#, 3 >::RegionType const&, std::integral_constant< bool, false > )
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ComplexImages.i b/lib/cpInstances/ComplexImages.i
deleted file mode 100644 (file)
index 6d53437..0000000
--- a/lib/cpInstances/ComplexImages.i
+++ /dev/null
@@ -1,16 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define base_filters=ImageSource
-
-tinclude itkImportImageContainer:h|hxx
-tinclude itkImage:h|hxx
-tinclude itk#base_filters#:h|hxx
-tinclude itk#i2v#:h|hxx
-
-cinclude complex
-
-instances itk::ImportImageContainer< unsigned long, std::complex< #real_types# > >
-instances itk::Image< std::complex< #real_types# >, #process_dims# >
-instances itk::#base_filters#< itk::Image< std::complex< #real_types# >, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/DistanceMapFilters.i b/lib/cpInstances/DistanceMapFilters.i
deleted file mode 100644 (file)
index 415549c..0000000
--- a/lib/cpInstances/DistanceMapFilters.i
+++ /dev/null
@@ -1,15 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define i_scalars=#scalar_pixels#
-define o_scalars=#scalar_pixels#
-define filters=SignedMaurerDistanceMapImageFilter
-
-tinclude itkProgressReporter:h|h
-tinclude itkImageRegionIterator:h|h
-tinclude itkBinaryContourImageFilter:h|hxx
-tinclude itk#filters#:h|hxx
-
-instances itk::BinaryContourImageFilter< itk::Image< #i_scalars#, #visual_dims# >, itk::Image< #o_scalars#, #visual_dims# > >
-instances itk::#filters#< itk::Image< #scalar_pixels#, #visual_dims# >, itk::Image< #real_types#, #visual_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ExtractImageFilters.i b/lib/cpInstances/ExtractImageFilters.i
deleted file mode 100644 (file)
index b63591f..0000000
--- a/lib/cpInstances/ExtractImageFilters.i
+++ /dev/null
@@ -1,14 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define filters=RegionOfInterestImageFilter;ExtractImageFilter
-define i_scalars=#scalar_pixels#
-define o_scalars=#scalar_pixels#
-
-tinclude itk#filters#:h|hxx
-tinclude itkShiftScaleImageFilter:h|hxx
-
-instances itk::#filters#< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #scalar_pixels#, #process_dims# > >
-instances itk::ExtractImageFilter< itk::Image< #scalar_pixels#, 3 >, itk::Image< #scalar_pixels#, 2 > >
-instances itk::ShiftScaleImageFilter< itk::Image< #i_scalars#, #process_dims# >, itk::Image< #o_scalars#, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ITKAnisotropicSmoothing.i b/lib/cpInstances/ITKAnisotropicSmoothing.i
deleted file mode 100644 (file)
index c381d8b..0000000
--- a/lib/cpInstances/ITKAnisotropicSmoothing.i
+++ /dev/null
@@ -1,12 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define functions=ScalarAnisotropicDiffusionFunction;GradientNDAnisotropicDiffusionFunction
-define filters=AnisotropicDiffusionImageFilter
-
-tinclude itk#functions#:h|hxx
-tinclude itk#filters#:h|hxx
-
-instances itk::#functions#< itk::Image< #real_types#, #process_dims# > >
-instances itk::#filters#< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #real_types#, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ITKBaseObjects.i b/lib/cpInstances/ITKBaseObjects.i
new file mode 100644 (file)
index 0000000..c74dfa2
--- /dev/null
+++ b/lib/cpInstances/ITKBaseObjects.i
@@ -0,0 +1,41 @@
+header #define ITK_MANUAL_INSTANTIATION
+
+define fadims=1;2;3;4;6
+tinclude itkFixedArray:h|hxx
+instances itk::FixedArray< #scalar_types#, #fadims# >
+
+define arrays=Array2D;Array;RGBPixel;RGBAPixel
+tinclude itk#arrays#:h|hxx
+instances itk::#arrays#< #scalar_types# >
+
+define vectors=CovariantVector;Point;Vector;SymmetricSecondRankTensor
+tinclude itk#vectors#:h|hxx
+tinclude itkVectorContainer:h|hxx
+instances itk::#vectors#< #real_types#, #pdims# >
+instances itk::VectorContainer< unsigned long, itk::#vectors#< #real_types#, #pdims# > >
+instances itk::VectorContainer< unsigned long, #scalar_types# >
+
+tinclude itkDiffusionTensor3D:h|hxx
+instances itk::DiffusionTensor3D< #real_types# >
+
+cinclude set
+instances itk::VectorContainer< unsigned long, std::set< #scalar_types# > >
+
+define cout_vectors=FixedArray;Point;Vector
+minstances #_export_# std::ostream& itk::operator<< < #real_types#, #pdims# >( std::ostream& a, itk::#cout_vectors#< #real_types#, #pdims# > const& b )
+
+define matrices=Matrix
+tinclude itk#matrices#:h|hxx
+instances itk::#matrices#< #real_types#, #pdims#, #pdims# >
+
+define decorated=std::string;#scalar_types#
+tinclude itkSimpleDataObjectDecorator:h|hxx
+instances itk::SimpleDataObjectDecorator< #decorated# >
+
+tinclude itkVariableLengthVector:h|hxx
+instances itk::VariableLengthVector< #scalar_types# >
+
+tinclude itkSymmetricEigenAnalysis:h|hxx
+instances itk::SymmetricEigenAnalysis< itk::Matrix< #real_types#, #pdims#, #pdims# >, itk::FixedArray< #real_types#, #pdims# >, itk::Matrix< #real_types#, #pdims#, #pdims# > >
+
+** eof - $RCSfile$

diff --git a/lib/cpInstances/ITKDifferenceImageFilters.i b/lib/cpInstances/ITKDifferenceImageFilters.i
deleted file mode 100644 (file)
index efa3e64..0000000
--- a/lib/cpInstances/ITKDifferenceImageFilters.i
+++ /dev/null
@@ -1,15 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define base=FiniteDifferenceImageFilter;DenseFiniteDifferenceImageFilter
-define functions=FiniteDifferenceFunction
-
-define i_reals=#real_types#
-define o_reals=#real_types#
-
-tinclude itk#functions#:h|hxx
-tinclude itk#base#:h|hxx
-
-instances itk::#functions#< itk::Image< #i_reals#, #process_dims# > >
-instances itk::#base#< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #i_reals#, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ITKImageFeatureFilters.i b/lib/cpInstances/ITKImageFeatureFilters.i
deleted file mode 100644 (file)
index 87f6415..0000000
--- a/lib/cpInstances/ITKImageFeatureFilters.i
+++ /dev/null
@@ -1,14 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define filters=LaplacianImageFilter
-define op=LaplacianOperator
-define i_reals=#real_types#
-define o_reals=#real_types#
-
-tinclude itk#op#:h|hxx
-tinclude itk#filters#:h|hxx
-
-instances itk::#op#< #i_reals#, #process_dims#, itk::NeighborhoodAllocator< #i_reals# > >
-instances itk::#filters#< itk::Image< #i_reals#, #process_dims# >, itk::Image< #o_reals#, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ImageInterpolators.i b/lib/cpInstances/ITKImageInterpolators.i
similarity index 68%
rename from lib/cpInstances/ImageInterpolators.i
rename to lib/cpInstances/ITKImageInterpolators.i
index 22374c3960a8fb8140b4ce17e55b05c9cba09125..caaff5d5acc476902bf4e05a2b85da56267c52d4 100644 (file)
--- a/lib/cpInstances/ImageInterpolators.i
+++ b/lib/cpInstances/ITKImageInterpolators.i
@@ -12,9 +12,9 @@ tinclude itkVectorLinearInterpolateImageFunction:h|hxx
 cinclude itk#v#.h
 cinclude itkImage.h
 
-instances itk::ImageFunction< itk::Image< #scalar_pixels#, #process_dims# >, #i_real#, #o_real# >
-instances itk::#interp#InterpolateImageFunction< itk::Image< #scalar_pixels#, #process_dims# >, #real_types# >
+instances itk::ImageFunction< itk::Image< #scalar_types#, #pdims# >, #i_real#, #o_real# >
+instances itk::#interp#InterpolateImageFunction< itk::Image< #scalar_types#, #pdims# >, #real_types# >
 
-instances itk::VectorLinearInterpolateImageFunction< itk::Image< itk::#v#< #i_real#, #process_dims# >, #process_dims# >, #o_real# >
+instances itk::VectorLinearInterpolateImageFunction< itk::Image< itk::#v#< #i_real#, #pdims# >, #pdims# >, #o_real# >
 
 ** eof - $RCSfile$

diff --git a/lib/cpInstances/ITKLevelSetFilters.i b/lib/cpInstances/ITKLevelSetFilters.i
deleted file mode 100644 (file)
index afed5fe..0000000
--- a/lib/cpInstances/ITKLevelSetFilters.i
+++ /dev/null
@@ -1,28 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define base=ZeroCrossingImageFilter;SparseFieldLevelSetImageFilter
-define filters=SegmentationLevelSetImageFilter;ThresholdSegmentationLevelSetImageFilter;LaplacianSegmentationLevelSetImageFilter
-define functions=LevelSetFunction
-define ls_functions=SegmentationLevelSetFunction;ThresholdSegmentationLevelSetFunction;LaplacianSegmentationLevelSetFunction
-
-define i_reals=#real_types#
-define o_reals=#real_types#
-
-tinclude itk#functions#:h|hxx
-tinclude itk#ls_functions#:h|hxx
-tinclude itk#base#:h|hxx
-tinclude itk#filters#:h|hxx
-tinclude itkSparseFieldLayer:h|hxx
-tinclude itkObjectStore:h|hxx
-
-cinclude itkLinearInterpolateImageFunction.hxx
-
-instances itk::SparseFieldLayer< itk::SparseFieldLevelSetNode< itk::Index< #process_dims# > > >
-instances itk::ObjectStore< itk::SparseFieldLevelSetNode< itk::Index< #process_dims# > > >
-
-instances itk::#functions#< itk::Image< #i_reals#, #process_dims# > >
-instances itk::#ls_functions#< itk::Image< #i_reals#, #process_dims# >, itk::Image< #o_reals#, #process_dims# > >
-instances itk::#base#< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #i_reals#, #process_dims# > >
-instances itk::#filters#< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #i_reals#, #process_dims# >, #o_reals# >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/Transforms.i b/lib/cpInstances/ITKTransforms.i
similarity index 53%
rename from lib/cpInstances/Transforms.i
rename to lib/cpInstances/ITKTransforms.i
index a2424959e72c89984185af0bd3ea05cedff68a02..bc6b05d981e9a8bd12c44af02ee0e59d4bd3fdd3 100644 (file)
--- a/lib/cpInstances/Transforms.i
+++ b/lib/cpInstances/ITKTransforms.i
@@ -9,10 +9,10 @@ tinclude itk#tr#:h|hxx
 tinclude itkDataObjectDecorator:h|hxx
 
 instances itk::OptimizerParameters< #real_types# >
-instances itk::MatrixOffsetTransformBase< #real_types#, #process_dims#, #process_dims# >
-instances itk::Transform< #real_types#, #process_dims#, #process_dims# >
-instances itk::#tr#< #real_types#, #process_dims# >
-instances itk::DataObjectDecorator< itk::Transform< #real_types#, #process_dims#, #process_dims# > >
-instances itk::DataObjectDecorator< itk::#tr#< #real_types#, #process_dims# > >
+instances itk::MatrixOffsetTransformBase< #real_types#, #pdims#, #pdims# >
+instances itk::Transform< #real_types#, #pdims#, #pdims# >
+instances itk::#tr#< #real_types#, #pdims# >
+instances itk::DataObjectDecorator< itk::Transform< #real_types#, #pdims#, #pdims# > >
+instances itk::DataObjectDecorator< itk::#tr#< #real_types#, #pdims# > >
 
 ** eof - $RCSfile$

diff --git a/lib/cpInstances/Image.d b/lib/cpInstances/Image.d
index 165a06a4cdb9328d008c34a532eb530f3f789288..b9a2444ca3ed26fe25db0bb9a302cd3e47a74022 100644 (file)
--- a/lib/cpInstances/Image.d
+++ b/lib/cpInstances/Image.d
@@ -1,26 +1,27 @@
 define all_ints=#int_types#;unsigned #int_types#
+define color_pixels=RGBPixel;RGBAPixel
 
-ProcessDims itk::ImageBase< #process_dims# >
-VisualDims itk::ImageBase< #visual_dims# >
+ProcessDims itk::ImageBase< #pdims# >
+VisualDims itk::ImageBase< #vdims# >
 
 IntPixels|d itk::Image< #all_ints#, d >
 RealPixels|d itk::Image< #real_types#, d >
-ScalarPixels|d itk::Image< #scalar_pixels#, d >
+ScalarPixels|d itk::Image< #scalar_types#, d >
 ComplexPixels|d itk::Image< std::complex< #real_types# >, d >
-ColorPixels|d itk::Image< itk::#color_pixels#< #scalar_pixels# >, d >
+ColorPixels|d itk::Image< itk::#color_pixels#< #scalar_types# >, d >
 VectorPixels|d itk::Image< itk::#vectors#< #real_types#, d >, d >
 DiffTensors3D itk::Image< itk::#diff_tensors#< #real_types# >, 3 >
 
-IntPixels_AllDims itk::Image< #all_ints#, #process_dims# >
-IntPixels_VisualDims itk::Image< #all_ints#, #process_dims# >
-RealPixels_AllDims itk::Image< #real_types#, #process_dims# >
-RealPixels_VisualDims itk::Image< #real_types#, #process_dims# >
-ScalarPixels_AllDims itk::Image< #scalar_pixels#, #process_dims# >
-ScalarPixels_VisualDims itk::Image< #scalar_pixels#, #visual_dims# >
-ColorPixels_AllDims itk::Image< itk::#color_pixels#< #scalar_pixels# >, #process_dims# >
-ColorPixels_VisualDims itk::Image< itk::#color_pixels#< #scalar_pixels# >, #visual_dims# >
-VectorPixels_AllDims itk::Image< itk::#vectors#< #real_types#, #process_dims# >, #process_dims# >
-VectorPixels_VisualDims itk::Image< itk::#vectors#< #real_types#, #visual_dims# >, #visual_dims# >
-CovariantVectorPixels_AllDims itk::Image< itk::CovariantVector< #real_types#, #process_dims# >, #process_dims# >
+IntPixels_AllDims itk::Image< #all_ints#, #pdims# >
+IntPixels_VisualDims itk::Image< #all_ints#, #pdims# >
+RealPixels_AllDims itk::Image< #real_types#, #pdims# >
+RealPixels_VisualDims itk::Image< #real_types#, #pdims# >
+ScalarPixels_AllDims itk::Image< #scalar_types#, #pdims# >
+ScalarPixels_VisualDims itk::Image< #scalar_types#, #vdims# >
+ColorPixels_AllDims itk::Image< itk::#color_pixels#< #scalar_types# >, #pdims# >
+ColorPixels_VisualDims itk::Image< itk::#color_pixels#< #scalar_types# >, #vdims# >
+VectorPixels_AllDims itk::Image< itk::#vectors#< #real_types#, #pdims# >, #pdims# >
+VectorPixels_VisualDims itk::Image< itk::#vectors#< #real_types#, #vdims# >, #vdims# >
+CovariantVectorPixels_AllDims itk::Image< itk::CovariantVector< #real_types#, #pdims# >, #pdims# >
 
 ** eof - $RCSfile$

diff --git a/lib/cpInstances/Image.h b/lib/cpInstances/Image.h
index f48917c0841e7c54cef2ce96ca895f882c350263..bcffabecbf0ecb0d1f526f4e4ab20dd4ca4d22f9 100644 (file)
--- a/lib/cpInstances/Image.h
+++ b/lib/cpInstances/Image.h
@@ -1,7 +1,7 @@
 #ifndef __cpInstances__Image__h__
 #define __cpInstances__Image__h__
 
-#include <cpInstances/cpInstancesImage_Export.h>
+#include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <cpPlugins/BaseObjects/DataObject.h>
 #include <cpInstances/Image_Demanglers.h>
 #include <itkProcessObject.h>
@@ -12,7 +12,7 @@ namespace cpInstances
 {
   /**
    */
-  class cpInstancesImage_EXPORT Image
+  class cpPluginsDataObjects_EXPORT Image
     : public cpPlugins::BaseObjects::DataObject
   {
   public:

diff --git a/lib/cpInstances/ImageIterators.i b/lib/cpInstances/ImageIterators.i
deleted file mode 100644 (file)
index 909b65c..0000000
--- a/lib/cpInstances/ImageIterators.i
+++ /dev/null
@@ -1,24 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define it=ImageRegionConstIterator;ImageRegionIterator;ImageScanlineConstIterator;ImageScanlineIterator;ImageConstIteratorWithIndex;ImageIteratorWithIndex;ImageRegionConstIteratorWithIndex;ImageRegionIteratorWithIndex;ImageLinearConstIteratorWithIndex;ImageLinearIteratorWithIndex
-
-tinclude itk#it#:h|hxx
-
-cinclude complex
-cinclude itkImage.h
-cinclude itk#color_pixels#.h
-cinclude itk#vectors#.h
-cinclude itk#diff_tensors#.h
-cinclude itk#matrices#.h
-cinclude itkOffset.h
-
-instances itk::#it#< itk::Image< #scalar_pixels#, #process_dims# > >
-instances itk::#it#< itk::Image< signed #int_types#, #process_dims# > >
-instances itk::#it#< itk::Image< std::complex< #real_types# >, #process_dims# > >
-instances itk::#it#< itk::Image< itk::#color_pixels#< #scalar_pixels# >, #process_dims# > >
-instances itk::#it#< itk::Image< itk::#vectors#< #real_types#, #process_dims# >, #process_dims# > >
-instances itk::#it#< itk::Image< itk::#diff_tensors#< #real_types# >, 3 > >
-instances itk::#it#< itk::Image< itk::#matrices#< #real_types#, #process_dims#, #process_dims# >, #process_dims# > >
-instances itk::#it#< itk::Image< itk::Offset< #process_dims# >, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ImageSliceFilters.i b/lib/cpInstances/ImageSliceFilters.i
deleted file mode 100644 (file)
index e2fdf0d..0000000
--- a/lib/cpInstances/ImageSliceFilters.i
+++ /dev/null
@@ -1,20 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-tinclude cpExtensions/Algorithms/CPRImageFilter:h|hxx
-tinclude cpExtensions/Algorithms/IsoImageSlicer:h|hxx
-tinclude itkResampleImageFilter:h|hxx
-tinclude itkJoinSeriesImageFilter:h|hxx
-
-cinclude cpExtensions/DataStructures/Simple3DCurve.h
-cinclude itkImageAlgorithm.hxx
-
-instances itk::ResampleImageFilter< itk::Image< #scalar_pixels#, 3u >, itk::Image< #scalar_pixels#, 3u >, #real_types#, #real_types# >
-
-instances itk::JoinSeriesImageFilter< itk::Image< #scalar_types#, 2 >, itk::Image< #scalar_types#, 3 > >
-
-instances cpExtensions::Algorithms::BaseImageSlicer< itk::ResampleImageFilter< itk::Image< #scalar_pixels#, 3u >, itk::Image< #scalar_pixels#, 3u >, #real_types#, #real_types# >, itk::InterpolateImageFunction< itk::Image< #scalar_pixels#, 3u >, #real_types# > >
-
-
-instances cpExtensions::Algorithms::CPRImageFilter< itk::Image< #scalar_pixels#, 3 >, cpExtensions::DataStructures::Simple3DCurve< #real_types# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/ImagesIO.i b/lib/cpInstances/ImagesIO.i
deleted file mode 100644 (file)
index 80a936c..0000000
--- a/lib/cpInstances/ImagesIO.i
+++ /dev/null
@@ -1,25 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-header #define ITKIOImageBase_HIDDEN
-
-define io=ImageFileReader;ImageSeriesReader;ImageFileWriter
-
-tinclude itk#io#:h|hxx
-
-cinclude complex
-cinclude itkImage.h
-cinclude itk#color_pixels#.h
-cinclude itk#vectors#.h
-cinclude itk#diff_tensors#.h
-cinclude itk#matrices#.h
-cinclude itkOffset.h
-cinclude itkConvertPixelBuffer.hxx
-
-instances itk::#io#< itk::Image< #scalar_pixels#, #process_dims# > >
-instances itk::#io#< itk::Image< std::complex< #real_types# >, #process_dims# > >
-instances itk::#io#< itk::Image< itk::#color_pixels#< #scalar_pixels# >, #process_dims# > >
-instances itk::#io#< itk::Image< itk::#vectors#< #real_types#, #process_dims# >, #process_dims# > >
-instances itk::#io#< itk::Image< itk::#diff_tensors#< #real_types# >, 3 > >
-instances itk::#io#< itk::Image< itk::#matrices#< #real_types#, #process_dims#, #process_dims# >, #process_dims# > >
-instances itk::#io#< itk::Image< itk::Offset< #process_dims# >, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/MatrixImages.i b/lib/cpInstances/MatrixImages.i
deleted file mode 100644 (file)
index 39ff567..0000000
--- a/lib/cpInstances/MatrixImages.i
+++ /dev/null
@@ -1,18 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define base_filters=ImageSource
-define i2v=VTKImageExport;VTKImageImport;ImageToVTKImageFilter;VTKImageToImageFilter
-
-tinclude itkImportImageContainer:h|hxx
-tinclude itkImage:h|hxx
-tinclude itk#base_filters#:h|hxx
-tinclude itk#i2v#:h|hxx
-
-cinclude itk#matrices#.h
-
-instances itk::ImportImageContainer< unsigned long, itk::#matrices#< #real_types#, #process_dims#, #process_dims# > >
-instances itk::Image< itk::#matrices#< #real_types#, #process_dims#, #process_dims# >, #process_dims# >
-instances itk::#base_filters#< itk::Image< itk::#matrices#< #real_types#, #process_dims#, #process_dims# >, #process_dims# > >
-instances itk::#i2v#< itk::Image< itk::#matrices#< #real_types#, #visual_dims#, #visual_dims# >, #visual_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/Mesh.d b/lib/cpInstances/Mesh.d
index acd6a2cbf284431ffdeb527484d55092df99262b..8f98aca4c06db152f0cf88779fe9c416b3038148 100644 (file)
--- a/lib/cpInstances/Mesh.d
+++ b/lib/cpInstances/Mesh.d
@@ -1,4 +1,4 @@
-AllMeshes itk::Mesh< #real_types#, #visual_dims# >
+AllMeshes itk::Mesh< #real_types#, #vdims# >
 Meshes|d itk::Mesh< #real_types#, d >
 
 ** eof - $RCSfile$

diff --git a/lib/cpInstances/Mesh.h b/lib/cpInstances/Mesh.h
index 6274acabde69ff109e9eaba41e7d87b37ce898e7..e40579b5a4ad1839965180f2095fc9a0d5017bf8 100644 (file)
--- a/lib/cpInstances/Mesh.h
+++ b/lib/cpInstances/Mesh.h
@@ -1,7 +1,7 @@
 #ifndef __cpInstances__Mesh__h__
 #define __cpInstances__Mesh__h__
 
-#include <cpInstances/cpInstancesMesh_Export.h>
+#include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <cpPlugins/BaseObjects/DataObject.h>
 #include <cpInstances/Mesh_Demanglers.h>
 
@@ -9,7 +9,7 @@ namespace cpInstances
 {
   /**
    */
-  class cpInstancesMesh_EXPORT Mesh
+  class cpPluginsDataObjects_EXPORT Mesh
     : public cpPlugins::BaseObjects::DataObject
   {
   public:

diff --git a/lib/cpInstances/NeighborhoodImageIterators.i b/lib/cpInstances/NeighborhoodImageIterators.i
deleted file mode 100644 (file)
index 2fa591b..0000000
--- a/lib/cpInstances/NeighborhoodImageIterators.i
+++ /dev/null
@@ -1,25 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define it=ConstNeighborhoodIterator;NeighborhoodIterator;ConstShapedNeighborhoodIterator;ShapedNeighborhoodIterator
-define co=ZeroFluxNeumannBoundaryCondition
-define pi=#scalar_pixels#;signed char
-define op=Neighborhood;NeighborhoodOperator;DerivativeOperator
-
-tinclude itk#op#:h|hxx
-tinclude itk#co#:h|hxx
-tinclude itk#it#:h|hxx
-
-cinclude complex
-cinclude itkImage.h
-cinclude itk#color_pixels#.h
-cinclude itk#vectors#.h
-cinclude itk#diff_tensors#.h
-cinclude itk#matrices#.h
-cinclude itkOffset.h
-
-instances itk::NeighborhoodAllocator< #pi# >
-instances itk::#op#< #pi#, #process_dims#, itk::NeighborhoodAllocator< #pi# > >
-instances itk::#co#< itk::Image< #pi#, #process_dims# >, itk::Image< #pi#, #process_dims# > >
-instances itk::#it#< itk::Image< #pi#, #process_dims# >, itk::#co#< itk::Image< #pi#, #process_dims# >, itk::Image< #pi#, #process_dims# > > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/PolyLineParametricPath.d b/lib/cpInstances/PolyLineParametricPath.d
index 8d6cfd3fbc9bae6bffa667c50b44227e70df9a25..e13c77f2708348f455befbf3a817bfae301aec26 100644 (file)
--- a/lib/cpInstances/PolyLineParametricPath.d
+++ b/lib/cpInstances/PolyLineParametricPath.d
@@ -1,4 +1,4 @@
-All cpExtensions::DataStructures::PolyLineParametricPath< #process_dims# >
+All cpExtensions::DataStructures::PolyLineParametricPath< #pdims# >
 Dim|d cpExtensions::DataStructures::PolyLineParametricPath< d >
 
 ** eof - $RCSfile$

diff --git a/lib/cpInstances/PolyLineParametricPath.h b/lib/cpInstances/PolyLineParametricPath.h
index 9d7eb0d057e99994fb5f932249210adc67b1c37a..c510d4c522320cee0b3e55d83207921902477cd8 100644 (file)
--- a/lib/cpInstances/PolyLineParametricPath.h
+++ b/lib/cpInstances/PolyLineParametricPath.h
@@ -1,7 +1,7 @@
 #ifndef __cpInstances__PolyLineParametricPath__h__
 #define __cpInstances__PolyLineParametricPath__h__
 
-#include <cpInstances/cpInstancesPolyLineParametricPath_Export.h>
+#include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <cpPlugins/BaseObjects/DataObject.h>
 #include <cpInstances/PolyLineParametricPath_Demanglers.h>
 #include <itkProcessObject.h>
@@ -12,7 +12,7 @@ namespace cpInstances
 {
   /**
    */
-  class cpInstancesPolyLineParametricPath_EXPORT PolyLineParametricPath
+  class cpPluginsDataObjects_EXPORT PolyLineParametricPath
     : public cpPlugins::BaseObjects::DataObject
   {
   public:

diff --git a/lib/cpInstances/ScalarImages.i b/lib/cpInstances/ScalarImages.i
deleted file mode 100644 (file)
index 1a8606c..0000000
--- a/lib/cpInstances/ScalarImages.i
+++ /dev/null
@@ -1,23 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define pi=#scalar_pixels#;signed char
-define base_filters=ImageSource
-define i2v=VTKImageExport;VTKImageImport;ImageToVTKImageFilter;VTKImageToImageFilter
-
-tinclude itkImportImageContainer:h|hxx
-tinclude itkImage:h|hxx
-tinclude itkImageBase:h|hxx
-tinclude itkImageRegion:h|hxx
-tinclude itk#base_filters#:h|hxx
-tinclude itk#i2v#:h|hxx
-
-instances itk::ImportImageContainer< unsigned long, #pi# >
-instances itk::ImageRegion< #process_dims# >
-instances itk::ImageBase< #process_dims# >
-instances itk::Image< #pi#, #process_dims# >
-instances itk::#base_filters#< itk::Image< #pi#, #process_dims# > >
-instances itk::#i2v#< itk::Image< #pi#, #visual_dims# > >
-
-minstances #_export_# std::ostream& itk::operator<< < #process_dims# >( std::ostream& a, itk::ImageRegion< #process_dims# > const& b )
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/Simple3DCurve.h b/lib/cpInstances/Simple3DCurve.h
index b256c3db8b40d85e37b8243dde8c785f808f88db..cd2bad2555b416c97f78e9a3e504c8b9e7c41f5c 100644 (file)
--- a/lib/cpInstances/Simple3DCurve.h
+++ b/lib/cpInstances/Simple3DCurve.h
@@ -1,7 +1,7 @@
 #ifndef __cpInstances__Simple3DCurve__h__
 #define __cpInstances__Simple3DCurve__h__
 
-#include <cpInstances/cpInstancesSimple3DCurve_Export.h>
+#include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <cpPlugins/BaseObjects/DataObject.h>
 #include <cpInstances/Simple3DCurve_Demanglers.h>
 #include <itkProcessObject.h>
@@ -15,7 +15,7 @@ namespace cpInstances
 {
   /**
    */
-  class cpInstancesSimple3DCurve_EXPORT Simple3DCurve
+  class cpPluginsDataObjects_EXPORT Simple3DCurve
     : public cpPlugins::BaseObjects::DataObject
   {
   public:

diff --git a/lib/cpInstances/Skeleton.d b/lib/cpInstances/Skeleton.d
index d18d942fee613436fe9c14aa3258150a985b57f6..99e6261c6c941a44c4c885648261ea5b1341179b 100644 (file)
--- a/lib/cpInstances/Skeleton.d
+++ b/lib/cpInstances/Skeleton.d
@@ -1 +1 @@
-All cpExtensions::DataStructures::Skeleton< #process_dims# >
+All cpExtensions::DataStructures::Skeleton< #pdims# >

diff --git a/lib/cpInstances/Skeleton.h b/lib/cpInstances/Skeleton.h
index e73283d0e105469efed8e0a8fab4b37d150e2e32..faae87637559d0817ec5c07dc23e399dd6084d8e 100644 (file)
--- a/lib/cpInstances/Skeleton.h
+++ b/lib/cpInstances/Skeleton.h
@@ -1,7 +1,7 @@
 #ifndef __cpInstances__Skeleton__h__
 #define __cpInstances__Skeleton__h__
 
-#include <cpInstances/cpInstancesSkeleton_Export.h>
+#include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <cpPlugins/BaseObjects/DataObject.h>
 #include <cpInstances/Skeleton_Demanglers.h>
 #include <itkProcessObject.h>
@@ -12,7 +12,7 @@ namespace cpInstances
 {
   /**
    */
-  class cpInstancesSkeleton_EXPORT Skeleton
+  class cpPluginsDataObjects_EXPORT Skeleton
     : public cpPlugins::BaseObjects::DataObject
   {
   public:

diff --git a/lib/cpInstances/Skeleton.i b/lib/cpInstances/Skeleton.i
deleted file mode 100644 (file)
index 06da85f..0000000
--- a/lib/cpInstances/Skeleton.i
+++ /dev/null
@@ -1,8 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-tinclude cpExtensions/DataStructures/Skeleton:h|hxx
-cinclude cpExtensions/DataStructures/Graph.hxx
-
-instances cpExtensions::DataStructures::Skeleton< #process_dims# >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/UnaryFunctorFilters.i b/lib/cpInstances/UnaryFunctorFilters.i
deleted file mode 100644 (file)
index 55e0a69..0000000
--- a/lib/cpInstances/UnaryFunctorFilters.i
+++ /dev/null
@@ -1,24 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define all_ints=#int_types#;#uint_types#
-define in_scalars=#scalar_pixels#
-define out_scalars=#scalar_pixels#
-define filters=AbsImageFilter;NotImageFilter
-
-tinclude itkUnaryFunctorImageFilter:h|hxx
-tinclude itkInvertIntensityImageFilter:h|hxx
-tinclude itkBinaryThresholdImageFilter:h|hxx
-tinclude itkCastImageFilter:h|hxx
-
-cinclude itk#filters#.h
-
-instances itk::UnaryFunctorImageFilter< itk::Image< #all_ints#, #process_dims# >, itk::Image< #all_ints#, #process_dims# >, itk::Functor::NOT< #all_ints#, #all_ints# > >
-instances itk::UnaryFunctorImageFilter< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #scalar_pixels#, #process_dims# >, itk::Functor::Abs< #scalar_pixels#, #scalar_pixels# > >
-
-instances itk::CastImageFilter< itk::Image< #in_scalars#, #process_dims# >, itk::Image< #out_scalars#, #process_dims# > >
-
-instances itk::BinaryThresholdImageFilter< itk::Image< #in_scalars#, #process_dims# >, itk::Image< #out_scalars#, #process_dims# > >
-
-instances itk::InvertIntensityImageFilter< itk::Image< #scalar_pixels#, #process_dims# >, itk::Image< #scalar_pixels#, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/lib/cpInstances/VectorImages.i b/lib/cpInstances/VectorImages.i
deleted file mode 100644 (file)
index 4a7c5f3..0000000
--- a/lib/cpInstances/VectorImages.i
+++ /dev/null
@@ -1,30 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define v=FixedArray;#vectors#
-define base_filters=ImageSource
-define i2v=VTKImageExport;VTKImageImport;ImageToVTKImageFilter;VTKImageToImageFilter
-
-tinclude itkImportImageContainer:h|hxx
-tinclude itkImage:h|hxx
-tinclude itk#base_filters#:h|hxx
-tinclude itk#i2v#:h|hxx
-
-cinclude itk#v#.h
-cinclude itk#diff_tensors#.h
-cinclude itkOffset.h
-
-instances itk::ImportImageContainer< unsigned long, itk::#v#< #real_types#, #process_dims# > >
-instances itk::Image< itk::#v#< #real_types#, #process_dims# >, #process_dims# >
-instances itk::#base_filters#< itk::Image< itk::#v#< #real_types#, #process_dims# >, #process_dims# > >
-instances itk::#i2v#< itk::Image< itk::#v#< #real_types#, #visual_dims# >, #visual_dims# > >
-
-instances itk::ImportImageContainer< unsigned long, itk::#diff_tensors#< #real_types# > >
-instances itk::Image< itk::#diff_tensors#< #real_types# >, #process_dims# >
-instances itk::#base_filters#< itk::Image< itk::#diff_tensors#< #real_types# >, #process_dims# > >
-instances itk::#i2v#< itk::Image< itk::#diff_tensors#< #real_types# >, #visual_dims# > >
-
-instances itk::ImportImageContainer< unsigned long, itk::Offset< #process_dims# > >
-instances itk::Image< itk::Offset< #process_dims# >, #process_dims# >
-instances itk::#base_filters#< itk::Image< itk::Offset< #process_dims# >, #process_dims# > >
-
-** eof - $RCSfile$

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 8ad7dd414678a6b14bdcc1cae6717bc3dc19c601..9c5005e5b1e1774ec6ffa1c9c9f77973d324535f 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -9,17 +9,22 @@ SET(
   VTKIO
   VTKWidgets
   ITKIO
+  ITKImageGenericFilters_1
+  ITKNeighborhoodOperatorFilters
   ITKUnaryFunctorFilters
   ITKBinaryFunctorFilters
-  ITKDistanceMapFilters
-  ITKSliceFilters
-  ITKSeparableFilters
-  ITKGenericFilters
+  ITKAnisotropicSmoothing
+  ITKFiniteDifference
   ITKLevelSetFilters
-  ImageParaMorphologyFilters
-  ImageThresholdFilters
-  ImageGradientFilters
-  Extensions
+  ITKDistanceMapFilters
+  ITKParaMorphology
+  #ITKSliceFilters
+  #ITKSeparableFilters
+  #ITKGenericFilters
+  #ImageParaMorphologyFilters
+  #ImageThresholdFilters
+  #ImageGradientFilters
+  #Extensions
   )
 
 ## ===============================
@@ -34,13 +39,29 @@ FOREACH(_dir ${_dirlist})
   CreatePlugin(cpPlugins${_dir} ${_dir})
   TARGET_LINK_LIBRARIES(
     cpPlugins${_dir}
-    cpPlugins
+    cpExtensions
+    cpPluginsDataObjects
     ${cpPlugins_AllInstances}
     )
 ENDFOREACH(_dir)
 
-TARGET_LINK_LIBRARIES(cpPluginsVTKWidgets cpExtensions)
-TARGET_LINK_LIBRARIES(cpPluginsITKIO cpExtensions)
-TARGET_LINK_LIBRARIES(cpPluginsExtensions cpExtensions)
+TARGET_LINK_LIBRARIES(
+  cpPluginsITKParaMorphology
+  cpPluginsITKUnaryFunctorFilters
+  )
+TARGET_LINK_LIBRARIES(
+  cpPluginsITKAnisotropicSmoothing
+  cpPluginsITKFiniteDifference
+  )
+TARGET_LINK_LIBRARIES(
+  cpPluginsITKLevelSetFilters
+  cpPluginsITKAnisotropicSmoothing
+  cpPluginsITKImageGenericFilters_1
+  cpPluginsITKNeighborhoodOperatorFilters
+  )
+TARGET_LINK_LIBRARIES(
+  cpPluginsITKDistanceMapFilters
+  cpPluginsITKUnaryFunctorFilters
+  )
 
 ## eof - $RCSfile$

diff --git a/plugins/ITKIO/ImageReader.cxx b/plugins/ITKIO/ImageReader.cxx
index c4f310e3842f558beee2a73fe63fa84e22af40ca..64d63a2b3dd4569c0305b7c55a80d7b914a1bf73 100644 (file)
--- a/plugins/ITKIO/ImageReader.cxx
+++ b/plugins/ITKIO/ImageReader.cxx
@@ -114,150 +114,82 @@ _GD0( itk::ImageIOBase* io )
   bool success = false;
   if( pt == itk::ImageIOBase::SCALAR )
   {
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
     if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< char, _Dim >( io );
     if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< uchar, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
     if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< short, _Dim >( io );
     if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< ushort, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
     if( ct == itk::ImageIOBase::INT ) success = this->_GD1< int, _Dim >( io );
     if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< uint, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
     if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< long, _Dim >( io );
     if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< ulong, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< float, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< double, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::RGB )
   {
-#ifdef cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
     if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< itk::RGBPixel< char >, _Dim >( io );
     if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< itk::RGBPixel< uchar >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
     if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< itk::RGBPixel< short >, _Dim >( io );
     if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< itk::RGBPixel< ushort >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
     if( ct == itk::ImageIOBase::INT ) success = this->_GD1< itk::RGBPixel< int >, _Dim >( io );
     if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< itk::RGBPixel< uint >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
     if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< itk::RGBPixel< long >, _Dim >( io );
     if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< itk::RGBPixel< ulong >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::RGBPixel< float >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_float
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::RGBPixel< double >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_double
-#endif // cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
   }
   else if( pt == itk::ImageIOBase::RGBA )
   {
-#ifdef cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
     if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< itk::RGBAPixel< char >, _Dim >( io );
     if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< itk::RGBAPixel< uchar >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
     if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< itk::RGBAPixel< short >, _Dim >( io );
     if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< itk::RGBAPixel< ushort >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
     if( ct == itk::ImageIOBase::INT ) success = this->_GD1< itk::RGBAPixel< int >, _Dim >( io );
     if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< itk::RGBAPixel< uint >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
     if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< itk::RGBAPixel< long >, _Dim >( io );
     if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< itk::RGBAPixel< ulong >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::RGBAPixel< float >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_float
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::RGBAPixel< double >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_double
-#endif // cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
   }
   else if( pt == itk::ImageIOBase::COMPLEX )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< std::complex< float >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< std::complex< double >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::COVARIANTVECTOR )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::CovariantVector< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::CovariantVector< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::CovariantVector< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::POINT )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Point< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Point< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::Point< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::VECTOR )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Vector< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Vector< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::Vector< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::SYMMETRICSECONDRANKTENSOR )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::SymmetricSecondRankTensor< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::SymmetricSecondRankTensor< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::SymmetricSecondRankTensor< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::DIFFUSIONTENSOR3D )
   {
     if( _Dim == 3 )
     {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
       if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::DiffusionTensor3D< float >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-      if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::DiffusionTensor3D< double >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+      if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::DiffusionTensor3D< double >, _Dim >( io );
     }
     else
       this->_Error( "DiffusionTensor3D dimension not supported." );
   }
   else if( pt == itk::ImageIOBase::MATRIX )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Matrix< float, _Dim, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Matrix< double, _Dim, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::Matrix< double, _Dim, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::OFFSET )
   {

diff --git a/plugins/ITKLevelSetFilters/LaplacianSegmentationLevelSetImageFilter.cxx b/plugins/ITKLevelSetFilters/LaplacianSegmentationLevelSetImageFilter.cxx
index a5fe1f9eb2f3961e5cca66c962dcc7447850cbb1..f9a36ea1c6d2ed9c3cdc638282cd58afd3e87c60 100644 (file)
--- a/plugins/ITKLevelSetFilters/LaplacianSegmentationLevelSetImageFilter.cxx
+++ b/plugins/ITKLevelSetFilters/LaplacianSegmentationLevelSetImageFilter.cxx
@@ -30,7 +30,7 @@ void cpPluginsITKLevelSetFilters::LaplacianSegmentationLevelSetImageFilter::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
-  cpPlugins_Demangle_Image_ScalarPixels_AllDims_1( o, _GD0 )
+  cpPlugins_Demangle_Image_RealPixels_AllDims_1( o, _GD0 )
     this->_Error( "Invalid input image dimension." );
 }
 

diff --git a/plugins/ITKLevelSetFilters/ThresholdSegmentationLevelSetImageFilter.cxx b/plugins/ITKLevelSetFilters/ThresholdSegmentationLevelSetImageFilter.cxx
index 45c2b40bd15ddb073d98bd19d5e8e02318a5e087..053c92207b61ffca6ba32e30afb4f14af1e8ff56 100644 (file)
--- a/plugins/ITKLevelSetFilters/ThresholdSegmentationLevelSetImageFilter.cxx
+++ b/plugins/ITKLevelSetFilters/ThresholdSegmentationLevelSetImageFilter.cxx
@@ -32,7 +32,7 @@ void cpPluginsITKLevelSetFilters::ThresholdSegmentationLevelSetImageFilter::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
-  cpPlugins_Demangle_Image_ScalarPixels_AllDims_1( o, _GD0 )
+  cpPlugins_Demangle_Image_RealPixels_AllDims_1( o, _GD0 )
     this->_Error( "Invalid input image dimension." );
 }
 

diff --git a/plugins/ImageParaMorphologyFilters/BinaryDilateParaImageFilter.cxx b/plugins/ITKParaMorphology/BinaryDilateParaImageFilter.cxx
similarity index 81%
rename from plugins/ImageParaMorphologyFilters/BinaryDilateParaImageFilter.cxx
rename to plugins/ITKParaMorphology/BinaryDilateParaImageFilter.cxx
index dd62821229a4abdbbec82c82959e8e6b35f436dc..3b126fd0cc962cce8e6d90d48c35815b6d1029bc 100644 (file)
--- a/plugins/ImageParaMorphologyFilters/BinaryDilateParaImageFilter.cxx
+++ b/plugins/ITKParaMorphology/BinaryDilateParaImageFilter.cxx
@@ -1,11 +1,11 @@
-#include <ImageParaMorphologyFilters/BinaryDilateParaImageFilter.h>
+#include <ITKParaMorphology/BinaryDilateParaImageFilter.h>
 #include <cpInstances/Image.h>
 #include <cpInstances/Image_Demanglers.h>
 
 #include <itkBinaryDilateParaImageFilter.h>
 
 // -------------------------------------------------------------------------
-cpPluginsImageParaMorphologyFilters::BinaryDilateParaImageFilter::
+cpPluginsITKParaMorphology::BinaryDilateParaImageFilter::
 BinaryDilateParaImageFilter( )
   : Superclass( )
 {
@@ -19,13 +19,13 @@ BinaryDilateParaImageFilter( )
 }
 
 // -------------------------------------------------------------------------
-cpPluginsImageParaMorphologyFilters::BinaryDilateParaImageFilter::
+cpPluginsITKParaMorphology::BinaryDilateParaImageFilter::
 ~BinaryDilateParaImageFilter( )
 {
 }
 
 // -------------------------------------------------------------------------
-void cpPluginsImageParaMorphologyFilters::BinaryDilateParaImageFilter::
+void cpPluginsITKParaMorphology::BinaryDilateParaImageFilter::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
@@ -35,7 +35,7 @@ _GenerateData( )
 
 // -------------------------------------------------------------------------
 template< class _TImage >
-void cpPluginsImageParaMorphologyFilters::BinaryDilateParaImageFilter::
+void cpPluginsITKParaMorphology::BinaryDilateParaImageFilter::
 _GD0( _TImage* image )
 {
   typedef itk::BinaryDilateParaImageFilter< _TImage > _TFilter;

diff --git a/plugins/ITKParaMorphology/BinaryDilateParaImageFilter.h b/plugins/ITKParaMorphology/BinaryDilateParaImageFilter.h
new file mode 100644 (file)
index 0000000..f0fdaf9
--- /dev/null
+++ b/plugins/ITKParaMorphology/BinaryDilateParaImageFilter.h
@@ -0,0 +1,29 @@
+#ifndef __cpPluginsITKParaMorphology__BinaryDilateParaImageFilter__h__
+#define __cpPluginsITKParaMorphology__BinaryDilateParaImageFilter__h__
+
+#include <cpPluginsITKParaMorphology_Export.h>
+#include <cpPlugins/BaseObjects/ProcessObject.h>
+
+namespace cpPluginsITKParaMorphology
+{
+  /**
+   */
+  class cpPluginsITKParaMorphology_EXPORT BinaryDilateParaImageFilter
+    : public cpPlugins::BaseObjects::ProcessObject
+  {
+    cpPluginsObject(
+      BinaryDilateParaImageFilter,
+      cpPlugins::BaseObjects::ProcessObject,
+      ImageMorphology
+      );
+
+  protected:
+    template< class _TImage >
+    inline void _GD0( _TImage* image );
+  };
+
+} // ecapseman
+
+#endif // __cpPluginsITKParaMorphology__BinaryDilateParaImageFilter__h__
+
+// eof - $RCSfile$

diff --git a/plugins/ImageParaMorphologyFilters/BinaryErodeParaImageFilter.cxx b/plugins/ITKParaMorphology/BinaryErodeParaImageFilter.cxx
similarity index 81%
rename from plugins/ImageParaMorphologyFilters/BinaryErodeParaImageFilter.cxx
rename to plugins/ITKParaMorphology/BinaryErodeParaImageFilter.cxx
index 0661930b37bfc38995c57eec852566f4778b816d..ccad92eaf08152a0792ef39c78a6a2cb367f2ca9 100644 (file)
--- a/plugins/ImageParaMorphologyFilters/BinaryErodeParaImageFilter.cxx
+++ b/plugins/ITKParaMorphology/BinaryErodeParaImageFilter.cxx
@@ -1,11 +1,11 @@
-#include <ImageParaMorphologyFilters/BinaryErodeParaImageFilter.h>
+#include <ITKParaMorphology/BinaryErodeParaImageFilter.h>
 #include <cpInstances/Image.h>
 #include <cpInstances/Image_Demanglers.h>
 
 #include <itkBinaryErodeParaImageFilter.h>
 
 // -------------------------------------------------------------------------
-cpPluginsImageParaMorphologyFilters::BinaryErodeParaImageFilter::
+cpPluginsITKParaMorphology::BinaryErodeParaImageFilter::
 BinaryErodeParaImageFilter( )
   : Superclass( )
 {
@@ -19,13 +19,13 @@ BinaryErodeParaImageFilter( )
 }
 
 // -------------------------------------------------------------------------
-cpPluginsImageParaMorphologyFilters::BinaryErodeParaImageFilter::
+cpPluginsITKParaMorphology::BinaryErodeParaImageFilter::
 ~BinaryErodeParaImageFilter( )
 {
 }
 
 // -------------------------------------------------------------------------
-void cpPluginsImageParaMorphologyFilters::BinaryErodeParaImageFilter::
+void cpPluginsITKParaMorphology::BinaryErodeParaImageFilter::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
@@ -35,7 +35,7 @@ _GenerateData( )
 
 // -------------------------------------------------------------------------
 template< class _TImage >
-void cpPluginsImageParaMorphologyFilters::BinaryErodeParaImageFilter::
+void cpPluginsITKParaMorphology::BinaryErodeParaImageFilter::
 _GD0( _TImage* image )
 {
   typedef itk::BinaryErodeParaImageFilter< _TImage > _TFilter;

diff --git a/plugins/ITKParaMorphology/BinaryErodeParaImageFilter.h b/plugins/ITKParaMorphology/BinaryErodeParaImageFilter.h
new file mode 100644 (file)
index 0000000..dfacbbe
--- /dev/null
+++ b/plugins/ITKParaMorphology/BinaryErodeParaImageFilter.h
@@ -0,0 +1,29 @@
+#ifndef __cpPluginsITKParaMorphology__BinaryErodeParaImageFilter__h__
+#define __cpPluginsITKParaMorphology__BinaryErodeParaImageFilter__h__
+
+#include <cpPluginsITKParaMorphology_Export.h>
+#include <cpPlugins/BaseObjects/ProcessObject.h>
+
+namespace cpPluginsITKParaMorphology
+{
+  /**
+   */
+  class cpPluginsITKParaMorphology_EXPORT BinaryErodeParaImageFilter
+    : public cpPlugins::BaseObjects::ProcessObject
+  {
+    cpPluginsObject(
+      BinaryErodeParaImageFilter,
+      cpPlugins::BaseObjects::ProcessObject,
+      ImageMorphology
+      );
+
+  protected:
+    template< class _TImage >
+    inline void _GD0( _TImage* image );
+  };
+
+} // ecapseman
+
+#endif // __cpPluginsITKParaMorphology__BinaryErodeParaImageFilter__h__
+
+// eof - $RCSfile$

diff --git a/plugins/ImageParaMorphologyFilters/BinaryDilateParaImageFilter.h b/plugins/ImageParaMorphologyFilters/BinaryDilateParaImageFilter.h
deleted file mode 100644 (file)
index 67615c0..0000000
--- a/plugins/ImageParaMorphologyFilters/BinaryDilateParaImageFilter.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __cpPluginsImageParaMorphologyFilters__BinaryDilateParaImageFilter__h__
-#define __cpPluginsImageParaMorphologyFilters__BinaryDilateParaImageFilter__h__
-
-#include <cpPluginsImageParaMorphologyFilters_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
-
-namespace cpPluginsImageParaMorphologyFilters
-{
-  /**
-   */
-  class cpPluginsImageParaMorphologyFilters_EXPORT BinaryDilateParaImageFilter
-    : public cpPlugins::BaseObjects::ProcessObject
-  {
-    cpPluginsObject(
-      BinaryDilateParaImageFilter,
-      cpPlugins::BaseObjects::ProcessObject,
-      ImageParaMorphologyFilters
-      );
-
-  protected:
-    template< class _TImage >
-    inline void _GD0( _TImage* image );
-  };
-
-} // ecapseman
-
-#endif // __cpPluginsImageParaMorphologyFilters__BinaryDilateParaImageFilter__h__
-
-// eof - $RCSfile$

diff --git a/plugins/ImageParaMorphologyFilters/BinaryErodeParaImageFilter.h b/plugins/ImageParaMorphologyFilters/BinaryErodeParaImageFilter.h
deleted file mode 100644 (file)
index 2e28ac6..0000000
--- a/plugins/ImageParaMorphologyFilters/BinaryErodeParaImageFilter.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __cpPluginsImageParaMorphologyFilters__BinaryErodeParaImageFilter__h__
-#define __cpPluginsImageParaMorphologyFilters__BinaryErodeParaImageFilter__h__
-
-#include <cpPluginsImageParaMorphologyFilters_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
-
-namespace cpPluginsImageParaMorphologyFilters
-{
-  /**
-   */
-  class cpPluginsImageParaMorphologyFilters_EXPORT BinaryErodeParaImageFilter
-    : public cpPlugins::BaseObjects::ProcessObject
-  {
-    cpPluginsObject(
-      BinaryErodeParaImageFilter,
-      cpPlugins::BaseObjects::ProcessObject,
-      ImageParaMorphologyFilters
-      );
-
-  protected:
-    template< class _TImage >
-    inline void _GD0( _TImage* image );
-  };
-
-} // ecapseman
-
-#endif // __cpPluginsImageParaMorphologyFilters__BinaryErodeParaImageFilter__h__
-
-// eof - $RCSfile$

diff --git a/plugins/ImageParaMorphologyFilters/ImageParaMorphologyFilter.i b/plugins/ImageParaMorphologyFilters/ImageParaMorphologyFilter.i
deleted file mode 100644 (file)
index 5c1b278..0000000
--- a/plugins/ImageParaMorphologyFilters/ImageParaMorphologyFilter.i
+++ /dev/null
@@ -1,17 +0,0 @@
-header #define ITK_MANUAL_INSTANTIATION
-
-define itk_filters=BinaryDilateParaImageFilter;BinaryErodeParaImageFilter
-define in_scalar_pixels=#scalar_pixels#
-define out_scalar_pixels=#scalar_pixels#
-define booleans=false;true
-
-tinclude itkParabolicErodeDilateImageFilter:h|hxx
-tinclude itk#itk_filters#:h|hxx
-
-cinclude itkUnaryFunctorImageFilter.hxx
-
-instances itk::ParabolicErodeDilateImageFilter< itk::Image< #in_scalar_pixels#, #process_dims# >, #booleans#, itk::Image< #out_scalar_pixels#, #process_dims# > >
-instances itk::#itk_filters#< itk::Image< #in_scalar_pixels#, #process_dims# >, itk::Image< #out_scalar_pixels#, #process_dims# > >
-
-
-** eof - $RCSfile$