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

diff --cc lib/Instances/BaseObjects.i
index b632a6cb87899667a464f82eeb89156de51cb0d8,45758d7298343500b30df02f1d7325af1fdf6e6a..09a0f160e6e593cebb6dc33da87c014fa049020f
--- 1/lib/Instances/BaseObjects.i
--- 2/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