X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FConfig.h.in;h=831fb7217ce967e9f698fd48254deb60800ba23a;hb=34f4ff5d31c70f1127d43865c61e9f57a7071190;hp=4ecc222653750b7405ee77a7096b025379457fcb;hpb=e977d1bb57ca61759a1fb1a1d0d8937718ef8722;p=FrontAlgorithms.git

diff --git a/lib/fpa/Config.h.in b/lib/fpa/Config.h.in
index 4ecc222..831fb72 100644
--- a/lib/fpa/Config.h.in
+++ b/lib/fpa/Config.h.in
@@ -7,48 +7,24 @@
 
 #include <itkMacro.h>
 
-#define VTK_FOUND @VTK_FOUND@
-#if VTK_FOUND == 1
-#  define USE_VTK
-#else
-#  undef USE_VTK
-#endif
-
-// -------------------------------------------------------------------------
-#define fpaTraitsMacro( __p__, __t__ )                                  \
-  typedef __p__ __t__::TFilter         TFilter;                         \
-  typedef __p__ __t__::TMarksInterface TMarksInterface;                 \
-  typedef __p__ __t__::TSeedsInterface TSeedsInterface;                 \
-  typedef __p__ __t__::TInternalTraits::TInputValue   TInputValue;      \
-  typedef __p__ __t__::TInternalTraits::TMark         TMark;            \
-  typedef __p__ __t__::TInternalTraits::TNeighborhood TNeighborhood;    \
-  typedef __p__ __t__::TInternalTraits::TNode         TNode;            \
-  typedef __p__ __t__::TInternalTraits::TNodes        TNodes;           \
-  typedef __p__ __t__::TInternalTraits::TOutputValue  TOutputValue;     \
-  typedef __p__ __t__::TInternalTraits::TPoint        TPoint;           \
-  typedef __p__ __t__::TInternalTraits::TSeed         TSeed;            \
-  typedef __p__ __t__::TInternalTraits::TSeeds        TSeeds;           \
-  typedef __p__ __t__::TInternalTraits::TVertex       TVertex;          \
-  itkStaticConstMacro(                                                  \
-    Dimension, unsigned int, __t__::TInternalTraits::Dimension          \
-    )
-
 // -------------------------------------------------------------------------
-#define fpaInternalTraitsMacro( __p__, __t__ )                          \
-  typedef __p__ __t__::TInputValue   TInputValue;                       \
-  typedef __p__ __t__::TMark         TMark;                             \
-  typedef __p__ __t__::TNeighborhood TNeighborhood;                     \
-  typedef __p__ __t__::TNode         TNode;                             \
-  typedef __p__ __t__::TNodes        TNodes;                            \
-  typedef __p__ __t__::TOutputValue  TOutputValue;                      \
-  typedef __p__ __t__::TPoint        TPoint;                            \
-  typedef __p__ __t__::TSeed         TSeed;                             \
-  typedef __p__ __t__::TSeeds        TSeeds;                            \
-  typedef __p__ __t__::TVertex       TVertex;                           \
-  itkStaticConstMacro( Dimension, unsigned int, __t__::Dimension )
+#define fpaTraitsMacro( __t__ )                                 \
+  typedef __t__::TInternalTraits::TInputValue   TInputValue;    \
+  typedef __t__::TInternalTraits::TNeighborhood TNeighborhood;  \
+  typedef __t__::TInternalTraits::TMark         TMark;          \
+  typedef __t__::TInternalTraits::TNode         TNode;          \
+  typedef __t__::TInternalTraits::TNodes        TNodes;         \
+  typedef __t__::TInternalTraits::TOutputValue  TOutputValue;   \
+  typedef __t__::TInternalTraits::TPoint        TPoint;         \
+  typedef __t__::TInternalTraits::TSeed         TSeed;          \
+  typedef __t__::TInternalTraits::TSeeds        TSeeds;         \
+  typedef __t__::TInternalTraits::TVertex       TVertex
 
 // -------------------------------------------------------------------------
 #define fpaFilterInputMacro( __n__, __t__ )                             \
+  private:                                                              \
+  unsigned int m_##__n__##Idx;                                          \
+  public:                                                               \
   __t__* Get##__n__( )                                                  \
   {                                                                     \
     return(                                                             \
@@ -79,6 +55,9 @@
 
 // -------------------------------------------------------------------------
 #define fpaFilterOutputMacro( __n__, __t__ )    \
+  private:                                      \
+  unsigned int m_##__n__##Idx;                  \
+  public:                                       \
   __t__* Get##__n__( )                          \
   {                                             \
     return(                                     \