X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FImageReader.cxx;h=0aa4bfc233f7ae56f0f57c259ec86ed8cd9cd711;hb=cb833d2fface96e020fe91584d2206860a8174ee;hp=8838bf469f12a8f3f80bfefaaa4d4a1486f2c034;hpb=b007dfbd638db86c5e8da53299da58f4c9d9e8b8;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/ImageReader.cxx b/lib/cpPlugins/Plugins/ImageReader.cxx
index 8838bf4..0aa4bfc 100644
--- a/lib/cpPlugins/Plugins/ImageReader.cxx
+++ b/lib/cpPlugins/Plugins/ImageReader.cxx
@@ -7,6 +7,13 @@
 #include <itkImage.h>
 #include <itkRGBPixel.h>
 
+// -------------------------------------------------------------------------
+std::string cpPlugins::Plugins::ImageReader::
+GetClassName( ) const
+{
+  return( "cpPlugins::Plugins::ImageReader" );
+}
+
 // -------------------------------------------------------------------------
 cpPlugins::Plugins::ImageReader::
 ImageReader( )
@@ -28,13 +35,6 @@ cpPlugins::Plugins::ImageReader::
 {
 }
 
-// -------------------------------------------------------------------------
-std::string cpPlugins::Plugins::ImageReader::
-GetClassName( ) const
-{
-  return( "cpPlugins::Plugins::ImageReader" );
-}
-
 // -------------------------------------------------------------------------
 std::string cpPlugins::Plugins::ImageReader::
 _GenerateData( )
@@ -46,7 +46,7 @@ _GenerateData( )
   if( dIt == this->m_Parameters.end( ) )
     dIt = this->m_DefaultParameters.find( "ImageDimension" );
 
-  std::string r = "itk::Image dimension not supported.";
+  std::string r = "cpPlugins::Plugins::ImageReader: itk::Image dimension not supported.";
   if     ( dIt->second.second == "1" ) r = this->_GD0< 1 >( );
   else if( dIt->second.second == "2" ) r = this->_GD0< 2 >( );
   else if( dIt->second.second == "3" ) r = this->_GD0< 3 >( );
@@ -70,7 +70,7 @@ _GD0( )
   if( cIt == this->m_Parameters.end( ) )
     cIt = this->m_DefaultParameters.find( "IsColorImage" );
 
-  std::string r = "itk::Image pixel type not supported";
+  std::string r = "cpPlugins::Plugins::ImageReader: itk::Image pixel type not supported";
   if( cIt->second.second == "0" )
   {
     if( tIt->second.second == "char" )
@@ -133,14 +133,15 @@ _GD1( )
     fIt = this->m_DefaultParameters.find( "FileName" );
 
   typedef itk::Image< P, D > _TImage;
-  typedef itk::ImageFileReader< _TImage > _TImageReader;
+  typedef itk::ImageFileReader< _TImage > _TReader;
 
-  _TImageReader* reader =
-    dynamic_cast< _TImageReader* >( this->m_Reader.GetPointer( ) );
+  _TReader* reader =
+    dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
   if( reader == NULL )
   {
-    this->m_Reader = _TImageReader::New( );
-    reader = dynamic_cast< _TImageReader* >( this->m_Reader.GetPointer( ) );
+    this->m_RealProcessObject = _TReader::New( );
+    reader =
+      dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
 
   } // fi
   reader->SetFileName( fIt->second.second );