X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=filters%2FclitkBinarizeImageGenericFilter.txx;h=cdf09619d4ee30dc4d8de2af4cbc57ab65fa9ed8;hb=48d8569538b93bf923de2f8d5c4b9db51640978f;hp=56d85e968dd82605a4495b40a0d4a2a94777961e;hpb=cf5d06f41440fd7f41748aea480b2b18deaa1bc6;p=clitk.git

diff --git a/filters/clitkBinarizeImageGenericFilter.txx b/filters/clitkBinarizeImageGenericFilter.txx
index 56d85e9..cdf0961 100644
--- a/filters/clitkBinarizeImageGenericFilter.txx
+++ b/filters/clitkBinarizeImageGenericFilter.txx
@@ -1,20 +1,32 @@
-#ifndef clitkBinarizeImageGenericFilter_txx
-#define clitkBinarizeImageGenericFilter_txx
-
-/* =================================================
- * @file   clitkBinarizeImageGenericFilter.txx
- * @author Jef Vandemeulebroucke <jef@creatis.insa-lyon.fr>
- * @date   29 june 2009
- * 
- * @brief 
- * 
- ===================================================*/
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
+
+#ifndef CLITKBINARIZEIMAGEGENERICFILTER_TXX
+#define CLITKBINARIZEIMAGEGENERICFILTER_TXX
 
 // itk include
 #include "itkBinaryThresholdImageFilter.h"
 #include "itkMaskImageFilter.h"
 #include "itkMaskNegatedImageFilter.h"
 
+#include <clitkCommon.h>
+// #include <tiff.h>
+
 namespace clitk
 {
   
@@ -22,9 +34,9 @@ namespace clitk
   template<class args_info_type>
   BinarizeImageGenericFilter<args_info_type>::BinarizeImageGenericFilter():
     ImageToImageGenericFilter<Self>("Binarize") {
-    //    InitializeImageType<2>();
+    InitializeImageType<2>();
     InitializeImageType<3>();
-    //InitializeImageType<4>();
+    InitializeImageType<4>();
   }
   //--------------------------------------------------------------------
 
@@ -33,10 +45,7 @@ namespace clitk
   template<class args_info_type>
   template<unsigned int Dim>
   void BinarizeImageGenericFilter<args_info_type>::InitializeImageType() {      
-    //ADD_IMAGE_TYPE(Dim, char);
-    ADD_IMAGE_TYPE(Dim, short);
-    //ADD_IMAGE_TYPE(Dim, int);
-    //ADD_IMAGE_TYPE(Dim, float);
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
   }
   //--------------------------------------------------------------------
   
@@ -46,7 +55,6 @@ namespace clitk
   void BinarizeImageGenericFilter<args_info_type>::SetArgsInfo(const args_info_type & a) {
     mArgsInfo=a;
     SetIOVerbose(mArgsInfo.verbose_flag);
-
     if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes();
 
     if (mArgsInfo.input_given) {
@@ -83,17 +91,16 @@ namespace clitk
     if (mArgsInfo.lower_given) thresholdFilter->SetLowerThreshold(static_cast<PixelType>(mArgsInfo.lower_arg));
     if (mArgsInfo.upper_given) thresholdFilter->SetUpperThreshold(static_cast<PixelType>(mArgsInfo.upper_arg));
 
-    DD(mArgsInfo.lower_given);
-    DD(mArgsInfo.upper_given);
-    DD(mArgsInfo.lower_arg);
-    DD(mArgsInfo.upper_arg);
-    DD(mArgsInfo.fg_arg);
-    DD(mArgsInfo.bg_arg);
-    DD(mArgsInfo.fg_given);
-    DD(mArgsInfo.bg_given);
-    DD(mArgsInfo.mode_arg);
-
-// <<<<<<< clitkBinarizeImageGenericFilter.txx
+    // DD(mArgsInfo.lower_given);
+    // DD(mArgsInfo.upper_given);
+    // DD(mArgsInfo.lower_arg);
+    // DD(mArgsInfo.upper_arg);
+    // DD(mArgsInfo.fg_arg);
+    // DD(mArgsInfo.bg_arg);
+    // DD(mArgsInfo.fg_given);
+    // DD(mArgsInfo.bg_given);
+    // DD(mArgsInfo.mode_arg);
+
 //     DD(mArgsInfo.useFG_flag);
 //     DD(mArgsInfo.useBG_flag);