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

diff --git a/lib/Instances/BaseObjects.i b/lib/Instances/BaseObjects.i
index b632a6cb87899667a464f82eeb89156de51cb0d8..09a0f160e6e593cebb6dc33da87c014fa049020f 100644 (file)
--- a/lib/Instances/BaseObjects.i
+++ b/lib/Instances/BaseObjects.i
@@ -7,6 +7,8 @@ header #define ITK_MANUAL_INSTANTIATION
 * 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
@@ -27,7 +29,7 @@ tinclude itkVariableLengthVector:h|hxx
 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 @@ instances itk::VariableLengthVector< #scalar_pixels# >
 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$

diff --git a/lib/cpPlugins/Interface/Dirent.h b/lib/cpPlugins/Interface/Dirent.h
index 5e2c02571af31ee0bd8c644ae6fe6e73fc67a63c..7461f91e8b1d70c7c2638150093727ce4e5244d8 100644 (file)
--- a/lib/cpPlugins/Interface/Dirent.h
+++ b/lib/cpPlugins/Interface/Dirent.h
@@ -841,7 +841,8 @@ dirent_set_errno(
 
 // florez-l: use the standard linux header
 #else // defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
-#include <dirent.h>
+#  include <sys/types.h>
+#  include <dirent.h>
 #endif // defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
 
 #endif /*__cpPlugins__dirent__h__*/