update

[FrontAlgorithms.git] / plugins / ImageAlgorithms / RegionGrow.cxx

diff --git a/plugins/ImageAlgorithms/RegionGrow.cxx b/plugins/ImageAlgorithms/RegionGrow.cxx
index f620b719d8b4041787a1f09284fe71803b8cc8bf..bec55ee530f1c332248ff7d8834bcffca51ac53d 100644 (file)
--- a/plugins/ImageAlgorithms/RegionGrow.cxx
+++ b/plugins/ImageAlgorithms/RegionGrow.cxx
@@ -1,5 +1,5 @@
 #include <ImageAlgorithms/RegionGrow.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <fpa/Image/RegionGrow.h>
 
@@ -8,7 +8,7 @@ fpaPluginsImageAlgorithms::RegionGrow::
 RegionGrow( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
+  typedef cpPlugins::Pipeline::DataObject _TData;
 
   this->_ConfigureInput< _TData >( "GrowFunction", true, false );
   this->m_Parameters.ConfigureAsInt( "InsideValue", 1 );
@@ -37,14 +37,15 @@ void fpaPluginsImageAlgorithms::RegionGrow::
 _GD0( _TImage* image )
 {
   auto rtype = this->m_Parameters.GetSelectedChoice( "ResultType" );
-  if( rtype == "char" ) this->_GD1< _TImage, char >( image );
-  if( rtype == "uchar" ) this->_GD1< _TImage, unsigned char >( image );
-  if( rtype == "short" ) this->_GD1< _TImage, short >( image );
-  if( rtype == "ushort" ) this->_GD1< _TImage, unsigned short >( image );
-  if( rtype == "int" ) this->_GD1< _TImage, int >( image );
-  if( rtype == "uint" ) this->_GD1< _TImage, unsigned int >( image );
-  if( rtype == "long" ) this->_GD1< _TImage, long >( image );
-  if( rtype == "ulong" ) this->_GD1< _TImage, unsigned long >( image );
+  if( rtype == "char" )        this->_GD1< _TImage, char >( image );
+  else if( rtype == "uchar" )  this->_GD1< _TImage, unsigned char >( image );
+  else if( rtype == "short" )  this->_GD1< _TImage, short >( image );
+  else if( rtype == "ushort" ) this->_GD1< _TImage, unsigned short >( image );
+  else if( rtype == "int" )    this->_GD1< _TImage, int >( image );
+  else if( rtype == "uint" )   this->_GD1< _TImage, unsigned int >( image );
+  else if( rtype == "long" )   this->_GD1< _TImage, long >( image );
+  else if( rtype == "ulong" )  this->_GD1< _TImage, unsigned long >( image );
+  else                         this->_GD1< _TImage, char >( image );
 }
 
 // -------------------------------------------------------------------------