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=085b597d7b56e9776396d3a6639e3a9de7647d90;p=cpPlugins.git

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

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 45758d7..09a0f16 100644
--- a/lib/Instances/BaseObjects.i
+++ b/lib/Instances/BaseObjects.i
@@ -1,11 +1,11 @@
 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
 
@@ -19,13 +19,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# >