Major refactoring: API-HCI bug corrected.

[cpPlugins.git] / lib / cpPlugins / Plugins / ImageReader.h

diff --git a/lib/cpPlugins/Plugins/ImageReader.h b/lib/cpPlugins/Plugins/ImageReader.h
index 61efe0d2858e556d11e2cce2c7a1fce009f35253..07aeebaec6ef8c63415baae0d8d317e7d31a2e6a 100644 (file)
--- a/lib/cpPlugins/Plugins/ImageReader.h
+++ b/lib/cpPlugins/Plugins/ImageReader.h
@@ -1,9 +1,13 @@
 #ifndef __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 #define __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 
+#include <vector>
+
 #include <cpPlugins/Plugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ImageSource.h>
-#include <itkProcessObject.h>
+
+#define ITK_MANUAL_INSTANTIATION
+#include <itkImageIOBase.h>
 
 namespace cpPlugins
 {
@@ -20,13 +24,14 @@ namespace cpPlugins
       typedef itk::SmartPointer< Self >         Pointer;
       typedef itk::SmartPointer< const Self >   ConstPointer;
 
+      typedef
+        std::vector< cpPlugins::Interface::Parameters::TString >
+        TStringList;
+
     public:
       itkNewMacro( Self );
       itkTypeMacro( ImageReader, cpPluginsInterfaceImageSource );
 
-    public:
-      virtual std::string GetClassName( ) const;
-
     protected:
       ImageReader( );
       virtual ~ImageReader( );
@@ -34,10 +39,13 @@ namespace cpPlugins
       virtual std::string _GenerateData( );
 
       template< unsigned int D >
-        std::string _GD0( );
+        std::string _GD0( itk::ImageIOBase* io, const TStringList& names );
+
+      template< class P, unsigned int D >
+        std::string _GD1( itk::ImageIOBase* io, const TStringList& names );
 
       template< class P, unsigned int D >
-        std::string _GD1( );
+        std::string _GD2( const TStringList& names );
 
     private:
       // Purposely not implemented