X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=plugins%2FITKIO%2FImageReader.cxx;h=64d63a2b3dd4569c0305b7c55a80d7b914a1bf73;hb=a52d42076db836c8af9106109b7f899d928de397;hp=c4f310e3842f558beee2a73fe63fa84e22af40ca;hpb=24d5c00294fc95f6f0d858a35799b77d97055745;p=cpPlugins.git

diff --git a/plugins/ITKIO/ImageReader.cxx b/plugins/ITKIO/ImageReader.cxx
index c4f310e..64d63a2 100644
--- a/plugins/ITKIO/ImageReader.cxx
+++ b/plugins/ITKIO/ImageReader.cxx
@@ -114,150 +114,82 @@ _GD0( itk::ImageIOBase* io )
   bool success = false;
   if( pt == itk::ImageIOBase::SCALAR )
   {
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
     if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< char, _Dim >( io );
     if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< uchar, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
     if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< short, _Dim >( io );
     if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< ushort, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
     if( ct == itk::ImageIOBase::INT ) success = this->_GD1< int, _Dim >( io );
     if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< uint, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
     if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< long, _Dim >( io );
     if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< ulong, _Dim >( io );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< float, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< double, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::RGB )
   {
-#ifdef cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
     if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< itk::RGBPixel< char >, _Dim >( io );
     if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< itk::RGBPixel< uchar >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
     if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< itk::RGBPixel< short >, _Dim >( io );
     if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< itk::RGBPixel< ushort >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
     if( ct == itk::ImageIOBase::INT ) success = this->_GD1< itk::RGBPixel< int >, _Dim >( io );
     if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< itk::RGBPixel< uint >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
     if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< itk::RGBPixel< long >, _Dim >( io );
     if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< itk::RGBPixel< ulong >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::RGBPixel< float >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_float
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::RGBPixel< double >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_double
-#endif // cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
   }
   else if( pt == itk::ImageIOBase::RGBA )
   {
-#ifdef cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
     if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< itk::RGBAPixel< char >, _Dim >( io );
     if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< itk::RGBAPixel< uchar >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
     if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< itk::RGBAPixel< short >, _Dim >( io );
     if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< itk::RGBAPixel< ushort >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
     if( ct == itk::ImageIOBase::INT ) success = this->_GD1< itk::RGBAPixel< int >, _Dim >( io );
     if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< itk::RGBAPixel< uint >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
     if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< itk::RGBAPixel< long >, _Dim >( io );
     if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< itk::RGBAPixel< ulong >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::RGBAPixel< float >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_float
-#  ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::RGBAPixel< double >, _Dim >( io );
-#  endif // cpPlugins_CONFIG_REAL_TYPES_double
-#endif // cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
   }
   else if( pt == itk::ImageIOBase::COMPLEX )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< std::complex< float >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
     if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< std::complex< double >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::COVARIANTVECTOR )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::CovariantVector< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::CovariantVector< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::CovariantVector< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::POINT )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Point< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Point< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::Point< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::VECTOR )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Vector< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Vector< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::Vector< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::SYMMETRICSECONDRANKTENSOR )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::SymmetricSecondRankTensor< float, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::SymmetricSecondRankTensor< double, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::SymmetricSecondRankTensor< double, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::DIFFUSIONTENSOR3D )
   {
     if( _Dim == 3 )
     {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
       if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::DiffusionTensor3D< float >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-      if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::DiffusionTensor3D< double >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+      if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::DiffusionTensor3D< double >, _Dim >( io );
     }
     else
       this->_Error( "DiffusionTensor3D dimension not supported." );
   }
   else if( pt == itk::ImageIOBase::MATRIX )
   {
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
     if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Matrix< float, _Dim, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
-    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Matrix< double, _Dim, _Dim >, _Dim >( io );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::Matrix< double, _Dim, _Dim >, _Dim >( io );
   }
   else if( pt == itk::ImageIOBase::OFFSET )
   {