From cd0404b717776e7302a18dacd079b2f1b7ea0019 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leonardo=20Fl=C3=B3rez-Valencia?= Date: Thu, 3 Nov 2016 21:25:22 -0500 Subject: [PATCH] ... --- appli/bash/Config.h.in | 6 +----- lib/Instances/BaseObjects.i | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/appli/bash/Config.h.in b/appli/bash/Config.h.in index 859965d..8306fe5 100644 --- a/appli/bash/Config.h.in +++ b/appli/bash/Config.h.in @@ -133,10 +133,6 @@ namespace cpPlugins_bash // ----------------------------------------------------------------------- inline void LoadDefinitions( TCommands& commands ) { - commands[ "define" ].push_back( - std::string( "bool_types=" ) + - std::string( cpPlugins_CONFIG_BOOLEAN_TYPES ) - ); commands[ "define" ].push_back( std::string( "int_types=" ) + std::string( cpPlugins_CONFIG_INTEGER_TYPES ) @@ -175,7 +171,7 @@ namespace cpPlugins_bash ); commands[ "define" ].push_back( std::string( - "scalar_pixels=#bool_types#;#int_types#;#uint_types#;#real_types#" + "scalar_pixels=#int_types#;#uint_types#;#real_types#" ) ); } diff --git a/lib/Instances/BaseObjects.i b/lib/Instances/BaseObjects.i index 704af33..b632a6c 100644 --- a/lib/Instances/BaseObjects.i +++ b/lib/Instances/BaseObjects.i @@ -1,11 +1,11 @@ header #define ITK_MANUAL_INSTANTIATION -header #include -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 +* 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 }; tinclude itkArray2D:h|hxx tinclude itkArray:h|hxx @@ -17,13 +17,13 @@ tinclude itk#diff_tensors#:h|hxx 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# > -- 2.45.0