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/?a=commitdiff_plain;h=28e0611aecbf78647fb8062d0524f60e56bef26c;hp=-c;p=cpPlugins.git

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

28e0611aecbf78647fb8062d0524f60e56bef26c
diff --combined 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
@@@ -17,17 -19,17 +19,17 @@@ tinclude itk#diff_tensors#:h|hx
  tinclude itkSymmetricEigenAnalysis:h|hxx
  tinclude itkSimpleDataObjectDecorator:h|hxx
  tinclude itkVariableLengthVector:h|hxx
 -tinclude vnl/vnl_vector:h|hxx
 -tinclude vnl/vnl_matrix:h|hxx
  
 -cinclude vnl/vnl_c_vector.hxx
 +* tinclude vnl/vnl_vector:h|hxx
 +* tinclude vnl/vnl_matrix:h|hxx
 +* cinclude vnl/vnl_c_vector.hxx
 +* instances vnl_vector< bool >
 +* instances vnl_matrix< bool >
  
 -instances vnl_vector< bool >
 -instances vnl_matrix< bool >
  instances itk::Array2D< #scalar_pixels# >
  instances itk::Array< #scalar_pixels# >
  instances itk::FixedArray< #scalar_pixels#, #process_dims# >
- instances itk::FixedArray< #scalar_pixels#, 8 >
+ instances itk::FixedArray< #scalar_pixels#, #other_dims# >
  instances itk::#color_pixels#< #scalar_pixels# >
  instances itk::#vectors#< #real_types#, #process_dims# >
  instances itk::#diff_tensors#< #real_types# >
@@@ -40,5 -42,6 +42,6 @@@ instances itk::VariableLengthVector< #s
  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 )
  
  ** eof - $RCSfile$