Garbage collector added

[cpPlugins.git] / lib / cpPlugins / Plugins / ImageWriter.cxx

diff --git a/lib/cpPlugins/Plugins/ImageWriter.cxx b/lib/cpPlugins/Plugins/ImageWriter.cxx
index afd5b30858b5b9b72b4f8f1c3af2bf8d1e0d0d86..aea4a21e7d42914c01d9f7d33d5cf05abf8eae98 100644 (file)
--- a/lib/cpPlugins/Plugins/ImageWriter.cxx
+++ b/lib/cpPlugins/Plugins/ImageWriter.cxx
@@ -23,6 +23,13 @@
     )                                                                   \
     r = this->f< itk::RGBPixel< p >, d >( )
 
+// -------------------------------------------------------------------------
+std::string cpPlugins::Plugins::ImageWriter::
+GetClassName( ) const
+{
+  return( "cpPlugins::Plugins::ImageWriter" );
+}
+
 // -------------------------------------------------------------------------
 cpPlugins::Plugins::ImageWriter::
 ImageWriter( )
@@ -40,20 +47,13 @@ cpPlugins::Plugins::ImageWriter::
 {
 }
 
-// -------------------------------------------------------------------------
-std::string cpPlugins::Plugins::ImageWriter::
-GetClassName( ) const
-{
-  return( "cpPlugins::Plugins::ImageWriter" );
-}
-
 // -------------------------------------------------------------------------
 std::string cpPlugins::Plugins::ImageWriter::
 _GenerateData( )
 {
   itk::DataObject* o = this->_GetInput( 0 );
 
-  std::string r = "itk::Image dimension not supported.";
+  std::string r = "cpPlugins::Plugins::ImageWriter: itk::Image dimension not supported.";
   cpPlugins_ImageWriter_Dimension( r, 1, o, _GD0 );
   else cpPlugins_ImageWriter_Dimension( r, 2, o, _GD0 );
   else cpPlugins_ImageWriter_Dimension( r, 3, o, _GD0 );
@@ -69,7 +69,7 @@ _GD0( )
   itk::ImageBase< D >* i =
     dynamic_cast< itk::ImageBase< D >* >( this->_GetInput( 0 ) );
 
-  std::string r = "itk::Image pixel type not supported";
+  std::string r = "cpPlugins::Plugins::ImageWriter: itk::Image pixel type not supported";
   cpPlugins_ImageWriter_Pixel( r, char, D, i, _GD1 );
   else cpPlugins_ImageWriter_Pixel( r, short, D, i, _GD1 );
   else cpPlugins_ImageWriter_Pixel( r, int, D, i, _GD1 );
@@ -99,7 +99,7 @@ std::string cpPlugins::Plugins::ImageWriter::
 _GD1( )
 {
   typedef itk::Image< P, D > _TImage;
-  typedef itk::ImageFileWriter< _TImage > _TImageWriter;
+  typedef itk::ImageFileWriter< _TImage > _TWriter;
 
   TParameters::const_iterator fIt;
 
@@ -108,12 +108,13 @@ _GD1( )
   if( fIt == this->m_Parameters.end( ) )
     fIt = this->m_DefaultParameters.find( "FileName" );
 
-  _TImageWriter* writer =
-    dynamic_cast< _TImageWriter* >( this->m_Writer.GetPointer( ) );
+  _TWriter* writer =
+    dynamic_cast< _TWriter* >( this->m_RealProcessObject.GetPointer( ) );
   if( writer == NULL )
   {
-    this->m_Writer = _TImageWriter::New( );
-    writer = dynamic_cast< _TImageWriter* >( this->m_Writer.GetPointer( ) );
+    this->m_RealProcessObject = _TWriter::New( );
+    writer =
+      dynamic_cast< _TWriter* >( this->m_RealProcessObject.GetPointer( ) );
 
   } // fi
   writer->SetFileName( fIt->second.second );