From a6a044f0189e499e78ddb14039fca21546b269b7 Mon Sep 17 00:00:00 2001 From: Leonardo Florez Date: Thu, 3 Nov 2016 20:33:33 -0500 Subject: [PATCH] ... --- lib/Instances/BaseObjects.i | 5 ++++- lib/cpPlugins/Interface/Dirent.h | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Instances/BaseObjects.i b/lib/Instances/BaseObjects.i index 704af33..45758d7 100644 --- a/lib/Instances/BaseObjects.i +++ b/lib/Instances/BaseObjects.i @@ -7,6 +7,8 @@ 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 @@ -27,7 +29,7 @@ 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 @@ 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 5e2c025..513779f 100644 --- a/lib/cpPlugins/Interface/Dirent.h +++ b/lib/cpPlugins/Interface/Dirent.h @@ -30,7 +30,6 @@ // florez-l: use this file in windows environments #if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - /* * Define architecture flags so we don't need to include windows.h. * Avoiding windows.h makes it simpler to use windows sockets in conjunction @@ -841,7 +840,7 @@ dirent_set_errno( // florez-l: use the standard linux header #else // defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) -#include +# include #endif // defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) #endif /*__cpPlugins__dirent__h__*/ -- 2.45.0