From: Leonardo Flórez-Valencia <florez-l@javeriana.edu.co>
Date: Fri, 4 Nov 2016 02:25:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins
X-Git-Tag: v0.1~61
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=cpPlugins.git;a=commitdiff_plain;h=28e0611aecbf78647fb8062d0524f60e56bef26c

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins
---

28e0611aecbf78647fb8062d0524f60e56bef26c
diff --cc lib/Instances/BaseObjects.i
index b632a6c,45758d7..09a0f16
--- a/lib/Instances/BaseObjects.i
+++ b/lib/Instances/BaseObjects.i
@@@ -1,12 -1,14 +1,14 @@@
  header #define ITK_MANUAL_INSTANTIATION
 -header #include <vnl/vnl_complex_traits.h>
 -header VCL_DEFINE_SPECIALIZATION struct vnl_complex_traits< bool >
 -header {
 -header   enum { isreal = true };
 -header   static bool conjugate( bool x ) { return( x ); }
 -header   static std::complex< bool > complexify( bool x ) { return( std::complex< bool >( x, false ) ); }
 -header };
 +* header #include <vnl/vnl_complex_traits.h>
 +* header VCL_DEFINE_SPECIALIZATION struct vnl_complex_traits< bool >
 +* header {
 +* header   enum { isreal = true };
 +* header   static bool conjugate( bool x ) { return( x ); }
 +* header   static std::complex< bool > complexify( bool x ) { return( std::complex< bool >( x, false ) ); }
 +* header };
  
+ define other_dims=6;8;10
+ 
  tinclude itkArray2D:h|hxx
  tinclude itkArray:h|hxx
  tinclude itkFixedArray:h|hxx