...

[cpPlugins.git] / plugins / ITKIO / ImageReader.cxx

diff --git a/plugins/ITKIO/ImageReader.cxx b/plugins/ITKIO/ImageReader.cxx
index b336078ddb12d82010a298ba923a5bb085d1ed25..90b032fc2fedfc01439bac24aff94887cbabbcf9 100644 (file)
--- a/plugins/ITKIO/ImageReader.cxx
+++ b/plugins/ITKIO/ImageReader.cxx
@@ -1,5 +1,5 @@
 #include <ITKIO/ImageReader.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 #include <cpPlugins/QT/OpenFileDialog.h>
 
 #define ITKIOImageBase_HIDDEN
@@ -34,7 +34,7 @@ cpPluginsITKIO::ImageReader::
 ImageReader( )
   : Superclass( )
 {
-  this->_ConfigureOutput< cpInstances::Image >( "Output" );
+  this->_ConfigureOutput< cpInstances::DataObjects::Image >( "Output" );
   this->m_Parameters.Clear( );
   this->m_Parameters.ConfigureAsOpenFileNameList( "FileNames" );
   this->m_Parameters.SetAcceptedFileExtensions(
@@ -78,18 +78,18 @@ _GenerateData( )
       io->ReadImageInformation( );
       bool success = false;
       unsigned int dim = io->GetNumberOfDimensions( );
-#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_1
+#ifdef cpPlugins_PROCESS_DIMS_1
       if( dim == 1 ) success = this->_GD0< 1 >( io );
-#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_1
-#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_2
+#endif // cpPlugins_PROCESS_DIMS_1
+#ifdef cpPlugins_PROCESS_DIMS_2
       if( dim == 2 ) success = this->_GD0< 2 >( io );
-#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_2
-#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_3
+#endif // cpPlugins_PROCESS_DIMS_2
+#ifdef cpPlugins_PROCESS_DIMS_3
       if( dim == 3 ) success = this->_GD0< 3 >( io );
-#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_3
-#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_4
+#endif // cpPlugins_PROCESS_DIMS_3
+#ifdef cpPlugins_PROCESS_DIMS_4
       if( dim == 4 ) success = this->_GD0< 4 >( io );
-#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_4
+#endif // cpPlugins_PROCESS_DIMS_4
       if( !success )
         this->_Error( "Image dimension not supported." );
     }