From b90df15e193f919926bd6688e4f3a774ba84373d Mon Sep 17 00:00:00 2001 From: dsarrut Date: Mon, 11 Oct 2010 14:55:50 +0000 Subject: [PATCH] add clitkCommon.h --- tools/clitkAverageTemporalDimension.cxx | 2 +- tools/clitkComposeVF.cxx | 18 ++++-------------- tools/clitkComposeVFGenericFilter.h | 8 +++++--- tools/clitkImageExtractLine.cxx | 1 + tools/clitkImageInfo.cxx | 1 + tools/clitkMergeSequence.cxx | 1 + tools/clitkMinMaxMask.cxx | 1 + tools/clitkSetBackground.cxx | 2 +- tools/clitkVFMerge.cxx | 4 +--- tools/clitkWriteDicomSeries.cxx | 2 +- tools/clitkZeroVF.cxx | 1 + 11 files changed, 18 insertions(+), 23 deletions(-) diff --git a/tools/clitkAverageTemporalDimension.cxx b/tools/clitkAverageTemporalDimension.cxx index 72832e5..6ce3a0a 100644 --- a/tools/clitkAverageTemporalDimension.cxx +++ b/tools/clitkAverageTemporalDimension.cxx @@ -29,9 +29,9 @@ // clitk #include "clitkAverageTemporalDimension_ggo.h" #include "clitkIO.h" +#include "clitkCommon.h" #include "clitkAverageTemporalDimensionGenericFilter.h" - //-------------------------------------------------------------------- int main(int argc, char * argv[]) { diff --git a/tools/clitkComposeVF.cxx b/tools/clitkComposeVF.cxx index ed510d9..a5c84df 100755 --- a/tools/clitkComposeVF.cxx +++ b/tools/clitkComposeVF.cxx @@ -15,24 +15,13 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html ======================================================================-====*/ -#ifndef CLITKCOMPOSEVF_CXX -#define CLITKCOMPOSEVF_CXX - -/** - * @file clitkComposeVF.cxx - * @author Jef Vandemeulebroucke - * @date July 20 10:14:53 2007 - * - * @brief Read in two VF (ex mhd, vf)compose them using lirear interpolation. - * - */ // clitk include #include "clitkComposeVF_ggo.h" -#include "clitkIO.h" -#include "clitkImageCommon.h" +#include "clitkCommon.h" #include "clitkComposeVFGenericFilter.h" +//-------------------------------------------------------------------- int main( int argc, char *argv[] ) { @@ -54,5 +43,6 @@ int main( int argc, char *argv[] ) return EXIT_SUCCESS; } -#endif +//-------------------------------------------------------------------- + diff --git a/tools/clitkComposeVFGenericFilter.h b/tools/clitkComposeVFGenericFilter.h index 90638d2..50ee16b 100755 --- a/tools/clitkComposeVFGenericFilter.h +++ b/tools/clitkComposeVFGenericFilter.h @@ -15,18 +15,20 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html ======================================================================-====*/ + #ifndef __clitkComposeVFGenericFilter_h #define __clitkComposeVFGenericFilter_h -#include "clitkImageCommon.h" + +// clitk +#include "clitkIO.h" #include "clitkImageCommon.h" #include "clitkComposeVFFilter.h" -//itk include +//itk #include "itkLightObject.h" #include "itkImage.h" #include "itkVector.h" - namespace clitk { diff --git a/tools/clitkImageExtractLine.cxx b/tools/clitkImageExtractLine.cxx index 0cf9454..bd7c978 100644 --- a/tools/clitkImageExtractLine.cxx +++ b/tools/clitkImageExtractLine.cxx @@ -28,6 +28,7 @@ #include "clitkImageExtractLine_ggo.h" #include "clitkIO.h" #include "clitkImageCommon.h" +#include "clitkCommon.h" #include //-------------------------------------------------------------------- diff --git a/tools/clitkImageInfo.cxx b/tools/clitkImageInfo.cxx index dc1aae0..cbb65c8 100644 --- a/tools/clitkImageInfo.cxx +++ b/tools/clitkImageInfo.cxx @@ -29,6 +29,7 @@ #include "clitkImageInfo_ggo.h" #include "clitkIO.h" #include "clitkImageCommon.h" +#include "clitkCommon.h" //==================================================================== int main(int argc, char * argv[]) diff --git a/tools/clitkMergeSequence.cxx b/tools/clitkMergeSequence.cxx index e2c0eb0..2240a89 100755 --- a/tools/clitkMergeSequence.cxx +++ b/tools/clitkMergeSequence.cxx @@ -31,6 +31,7 @@ #include "clitkMergeSequence_ggo.h" #include "clitkIO.h" #include "clitkImageCommon.h" +#include "clitkCommon.h" #include "clitkMergeSequenceGenericFilter.h" int main( int argc, char *argv[] ) diff --git a/tools/clitkMinMaxMask.cxx b/tools/clitkMinMaxMask.cxx index 8a41a8a..13ed941 100644 --- a/tools/clitkMinMaxMask.cxx +++ b/tools/clitkMinMaxMask.cxx @@ -20,6 +20,7 @@ #include "clitkMinMaxMask_ggo.h" #include "clitkIO.h" #include "clitkImageCommon.h" +#include "clitkCommon.h" #include "itkConstSliceIterator.h" #include "itkImageRegionIteratorWithIndex.h" diff --git a/tools/clitkSetBackground.cxx b/tools/clitkSetBackground.cxx index 420f4fe..a23278b 100644 --- a/tools/clitkSetBackground.cxx +++ b/tools/clitkSetBackground.cxx @@ -29,9 +29,9 @@ // clitk #include "clitkSetBackground_ggo.h" #include "clitkIO.h" +#include "clitkCommon.h" #include "clitkSetBackgroundGenericFilter.h" - //-------------------------------------------------------------------- int main(int argc, char * argv[]) { diff --git a/tools/clitkVFMerge.cxx b/tools/clitkVFMerge.cxx index d98cfef..ec5e4e5 100644 --- a/tools/clitkVFMerge.cxx +++ b/tools/clitkVFMerge.cxx @@ -32,14 +32,12 @@ #include "clitkVFMerge_ggo.h" #include "clitkIO.h" #include "clitkImageCommon.h" +#include "clitkCommon.h" // itk include -//#include "itkReadTransform.h" #include "itkImageFileWriter.h" #include #include "itkImageFileReader.h" -//#include "itkRawImageIO.h" -//#include "macro.h" int main( int argc, char *argv[] ) { diff --git a/tools/clitkWriteDicomSeries.cxx b/tools/clitkWriteDicomSeries.cxx index 607b13b..ff927de 100644 --- a/tools/clitkWriteDicomSeries.cxx +++ b/tools/clitkWriteDicomSeries.cxx @@ -30,7 +30,7 @@ #include "clitkWriteDicomSeries_ggo.h" #include "clitkIO.h" #include "clitkWriteDicomSeriesGenericFilter.h" - +#include "clitkCommon.h" //-------------------------------------------------------------------- int main(int argc, char * argv[]) diff --git a/tools/clitkZeroVF.cxx b/tools/clitkZeroVF.cxx index 65f46c4..f31d7f5 100644 --- a/tools/clitkZeroVF.cxx +++ b/tools/clitkZeroVF.cxx @@ -31,6 +31,7 @@ #include "clitkZeroVF_ggo.h" #include "clitkIO.h" #include "clitkImageCommon.h" +#include "clitkCommon.h" #include "clitkZeroVFGenericFilter.h" int main( int argc, char *argv[] ) -- 2.47.1