...

diff --git a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx
index 0a33ee98fdf27dfc4f80952dbcf45122b427cdc4..d2bc8287b1b1c0beab591afc7d6a24ddc1d75651 100644 (file)
--- a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx
+++ b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx
@@ -2,7 +2,7 @@
 #define __FPA__IMAGE__EXTRACTENDPOINTSANDBIFURCATIONSFROMMINIMUMSPANNINGTREE__HXX__
 
 #include <cmath>
-#include <cpPlugins_ITKInstances/ImageIterators.h>
+#include <itkImageRegionIteratorWithIndex.h>
 
 // -------------------------------------------------------------------------
 template< class _TImage, class _TMST >

diff --git a/plugins/fpa/BaseImageFilter.cxx b/plugins/fpa/BaseImageFilter.cxx
index d56c89433545feceb5be030407a974e2b1290121..cdd9f67c2e17403a5234163655d60d73f2c26ca6 100644 (file)
--- a/plugins/fpa/BaseImageFilter.cxx
+++ b/plugins/fpa/BaseImageFilter.cxx
@@ -1,4 +1,5 @@
 #include "BaseImageFilter.h"
+#include <itkSimpleDataObjectDecorator.hxx>
 
 // -------------------------------------------------------------------------
 bool fpaPlugins::BaseImageFilter::

diff --git a/plugins/fpa/BaseImageFilter.hxx b/plugins/fpa/BaseImageFilter.hxx
index 9d99f478e6c9814f6919bf2fbe133c11c0034274..5ca267170ef2930c03793c592a9283bf2c909a1d 100644 (file)
--- a/plugins/fpa/BaseImageFilter.hxx
+++ b/plugins/fpa/BaseImageFilter.hxx
@@ -8,6 +8,7 @@
 
 #include <fpa/VTK/Image2DObserver.hxx>
 #include <fpa/VTK/Image3DObserver.hxx>
+#include <itkSimpleDataObjectDecorator.h>
 
 // -------------------------------------------------------------------------
 template< class _TFilter >

diff --git a/plugins/fpa/CMakeLists.txt b/plugins/fpa/CMakeLists.txt
index 0186f7f0fc70cba8ec7ad39aeecab0b8820791d6..bbbd673276b274aa72b0a2c58508d1e6f38615d7 100644 (file)
--- a/plugins/fpa/CMakeLists.txt
+++ b/plugins/fpa/CMakeLists.txt
@@ -52,12 +52,8 @@ SET(
   target_LIBRARIES
   ${cpExtensions_LIBRARY}
   ${cpPlugins_LIBRARY}
-  cpPlugins_ITKInstances_Base
-  cpPlugins_ITKInstances_Image
-  cpPlugins_ITKInstances_ImageIterators
-  cpPlugins_ITKInstances_ImageFilters
-  cpPlugins_ITKInstances_Mesh
-  cpPlugins_ITKInstances_Paths
+  cpPlugins_ImageIterators
+  cpPlugins_Paths
   ${ITK_LIBRARIES}
   )
 

diff --git a/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.cxx b/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.cxx
index 997fa49f06250d315c65c84223aee85021a87919..fca4620c39b5183760be87a3feb6de5a7602c5b8 100644 (file)
--- a/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.cxx
+++ b/plugins/fpa/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.cxx
@@ -2,6 +2,7 @@
 #include "MinimumSpanningTree.h"
 
 #include <cpPlugins/Image.h>
+#include <itkSimpleDataObjectDecorator.hxx>
 #include <fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.h>
 #include <fpa/Base/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx>
 #include <fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx>

diff --git a/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx b/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx
index 6a2aef5ad7a68883153c61519b8669518c989ae9..bde69fc1802c4b98923e44c1a6cd2228cf6a6a5c 100644 (file)
--- a/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx
+++ b/plugins/fpa/ExtractPathFromMinimumSpanningTree.cxx
@@ -3,7 +3,8 @@
 
 #include <itkDataObject.h>
 #include <itkIndex.h>
-#include <cpPlugins_ITKInstances/Paths.h>
+#include <itkSimpleDataObjectDecorator.hxx>
+#include <cpPlugins_Instances/Paths.h>
 #include <cpPlugins/DataObject.h>
 #include <fpa/Base/ExtractPathFromMinimumSpanningTree.h>
 #include <fpa/Base/ExtractPathFromMinimumSpanningTree.hxx>

diff --git a/plugins/fpa/ImageDijkstra.cxx b/plugins/fpa/ImageDijkstra.cxx
index 44f5822e4ebbb05bbde2146a243315309e4858d6..cd34a9c7c30687f1e1b778cafaeee7c658213e80 100644 (file)
--- a/plugins/fpa/ImageDijkstra.cxx
+++ b/plugins/fpa/ImageDijkstra.cxx
@@ -8,6 +8,7 @@
 #include <fpa/Base/Algorithm.hxx>
 #include <fpa/Image/Algorithm.hxx>
 #include <fpa/Base/Functors/InvertCostFunction.h>
+#include <itkSimpleDataObjectDecorator.hxx>
 
 // -------------------------------------------------------------------------
 fpaPlugins::ImageDijkstra::