From 084cd7d3b59b96540fb85dc30e1b60a9c7317d77 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Fri, 22 Jul 2011 00:18:35 -0700
Subject: [PATCH] ENH: itkv4 preparation, replace include of itkExceptionObject
by itkMacro
---
Code/BasicFilters/otbFastICAImageFilter.txx | 2 +-
.../otbFastICAInternalOptimizerVectorImageFilter.txx | 2 +-
Code/BasicFilters/otbFrostImageFilter.txx | 2 +-
Code/BasicFilters/otbLeeImageFilter.txx | 2 +-
Code/BasicFilters/otbMNFImageFilter.txx | 2 +-
Code/BasicFilters/otbNAPCAImageFilter.txx | 2 +-
Code/BasicFilters/otbNormalizeVectorImageFilter.h | 2 +-
Code/BasicFilters/otbPCAImageFilter.txx | 2 +-
Code/BasicFilters/otbPointSetExtractROI.txx | 2 +-
Code/BasicFilters/otbTransformPointSetFilter.txx | 2 +-
Code/Common/otbDrawLineSpatialObjectFilter.txx | 2 +-
Code/Common/otbVariableLengthVectorConverter.h | 2 +-
Code/DisparityMap/otbFineRegistrationImageFilter.txx | 2 +-
Code/DisparityMap/otbNCCRegistrationFunction.txx | 2 +-
.../otbLineCorrelationDetectorImageFilter.txx | 2 +-
Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx | 2 +-
Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx | 2 +-
.../otbPixelSuppressionByDirectionImageFilter.txx | 2 +-
Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx | 2 +-
Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx | 2 +-
Code/IO/otbBSQImageIO.cxx | 2 +-
Code/IO/otbGDALImageIO.cxx | 2 +-
Code/IO/otbImageSeriesFileReaderBase.h | 2 +-
Code/IO/otbJPEG2000ImageIO.cxx | 2 +-
Code/IO/otbKMLVectorDataIO.cxx | 2 +-
Code/IO/otbLUMImageIO.cxx | 2 +-
Code/IO/otbMSTARImageIO.cxx | 2 +-
Code/IO/otbMWImageIO.cxx | 2 +-
Code/IO/otbOGRVectorDataIO.cxx | 2 +-
Code/IO/otbONERAImageIO.cxx | 2 +-
Code/IO/otbRADImageIO.cxx | 2 +-
Code/IO/otbSpectralSensitivityReader.cxx | 2 +-
Code/IO/otbTileMapImageIO.cxx | 2 +-
Code/IO/otbVectorDataFileReader.h | 2 +-
Code/IO/otbVectorDataFileWriter.h | 2 +-
Code/Learning/otbModelComponentBase.txx | 2 +-
Code/Learning/otbSEMClassifier.txx | 2 +-
Code/MultiScale/otbWaveletGenerator.cxx | 2 +-
Code/MultiScale/otbWaveletOperator.h | 2 +-
Code/MultiScale/otbWaveletOperatorBase.h | 2 +-
Code/ObjectDetection/otbStatisticsXMLFileReader.txx | 2 +-
Code/ObjectDetection/otbStatisticsXMLFileWriter.txx | 2 +-
Code/Projections/otbForwardSensorModel.txx | 2 +-
Code/Projections/otbGenericMapProjection.h | 2 +-
Code/Projections/otbGenericRSTransform.h | 2 +-
Code/Projections/otbGenericRSTransform.txx | 2 +-
Code/Projections/otbInverseSensorModel.txx | 2 +-
Code/Projections/otbRationalTransform.h | 2 +-
Code/Projections/otbSensorModelBase.txx | 2 +-
Code/SpatialReasoning/otbRCC8GraphFileReader.h | 2 +-
Code/SpatialReasoning/otbRCC8GraphFileWriter.h | 2 +-
Code/UtilitiesAdapters/OssimAdapters/otbAeronetFileReader.h | 2 +-
Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx | 2 +-
Examples/BasicFilters/BandMathFilterExample.cxx | 2 +-
Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx | 2 +-
Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx | 2 +-
Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx | 2 +-
Examples/DataRepresentation/Image/ImageListExample.cxx | 2 +-
Examples/FeatureExtraction/CloudDetectionExample.cxx | 2 +-
Examples/FeatureExtraction/ComplexMomentPathExample.cxx | 2 +-
.../FeatureExtraction/ComplexMomentsImageFunctionExample.cxx | 2 +-
.../FeatureExtraction/FlusserMomentsImageFunctionExample.cxx | 2 +-
Examples/FeatureExtraction/HarrisExample.cxx | 2 +-
Examples/FeatureExtraction/HuMomentsImageFunctionExample.cxx | 2 +-
Examples/FeatureExtraction/PanTexExample.cxx | 2 +-
Examples/FeatureExtraction/SFSExample.cxx | 2 +-
Examples/FeatureExtraction/TextureExample.cxx | 2 +-
Examples/GeospatialAnalysis/PostGISCreateTable.cxx | 2 +-
Examples/IO/DEMToImageGenerator.cxx | 2 +-
Examples/IO/MetadataExample.cxx | 2 +-
Examples/Learning/SOMExample.cxx | 2 +-
.../Learning/SVMGenericKernelImageModelEstimatorExample.cxx | 2 +-
.../Learning/SVMImageEstimatorClassificationMultiExample.cxx | 2 +-
Examples/Learning/SVMImageModelEstimatorExample.cxx | 2 +-
Examples/Learning/SVMPointSetClassificationExample.cxx | 2 +-
Examples/Learning/SVMPointSetExample.cxx | 2 +-
Examples/Learning/SVMPointSetModelEstimatorExample.cxx | 2 +-
.../MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx | 2 +-
.../MultiScale/MorphologicalPyramidSegmentationExample.cxx | 2 +-
Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx | 2 +-
.../MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx | 2 +-
.../ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx | 2 +-
Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx | 2 +-
Examples/Tutorials/BasicApplication/otbBasicApplication.cxx | 2 +-
Examples/Tutorials/SmarterFilteringPipeline.cxx | 2 +-
Examples/Visualization/VisuExample1.cxx | 2 +-
Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx | 2 +-
.../Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx | 2 +-
.../BasicFilters/otbBSplineDecompositionImageFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx | 2 +-
.../BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx | 2 +-
Testing/Code/BasicFilters/otbBandMathImageFilter.cxx | 2 +-
.../otbBinaryImageMinimalBoundingRegionCalculator.cxx | 2 +-
.../otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx | 2 +-
Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbClosePathFunctor.cxx | 2 +-
.../BasicFilters/otbClosingOpeningMorphologicalFilter.cxx | 2 +-
.../BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx | 2 +-
.../BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx | 2 +-
.../otbContinuousMinimumMaximumImageCalculatorNew.cxx | 2 +-
Testing/Code/BasicFilters/otbFrostFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbFrostFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx | 2 +-
.../BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx | 2 +-
.../otbFunctionWithNeighborhoodToImageFilterNew.cxx | 2 +-
.../BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx | 2 +-
.../otbImageAndVectorImageOperationFilterTest.cxx | 2 +-
.../Code/BasicFilters/otbImageListToImageListApplyFilter.cxx | 2 +-
.../BasicFilters/otbImageListToImageListApplyFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbImageListToVectorImageFilter.cxx | 2 +-
.../Code/BasicFilters/otbImageListToVectorImageFilter2.cxx | 2 +-
.../Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx | 2 +-
.../otbImaginaryImageToComplexImageFilterTest.cxx | 2 +-
.../Code/BasicFilters/otbImportGeoInformationImageFilter.cxx | 2 +-
.../BasicFilters/otbImportGeoInformationImageFilterNew.cxx | 2 +-
.../otbImportGeoInformationImageFilterWithKeywordList.cxx | 2 +-
.../BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx | 2 +-
Testing/Code/BasicFilters/otbLeeFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx | 2 +-
.../Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx | 2 +-
.../BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx | 2 +-
.../Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx | 2 +-
.../BasicFilters/otbOpeningClosingMorphologicalFilter.cxx | 2 +-
.../BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbPathLengthFunctor.cxx | 2 +-
Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx | 2 +-
.../otbPerBandVectorImageFilterWithMeanFilter.cxx | 2 +-
.../otbPerBandVectorImageFilterWithSobelFilter.cxx | 2 +-
.../Code/BasicFilters/otbPersistentVectorizationFilter.cxx | 2 +-
.../Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx | 2 +-
Testing/Code/BasicFilters/otbPrintableImageFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbProlateInterpolateImageFunction.cxx | 2 +-
.../BasicFilters/otbProlateInterpolateImageFunctionNew.cxx | 2 +-
Testing/Code/BasicFilters/otbProlateValidationTest.cxx | 2 +-
.../otbRealAndImaginaryImageToComplexImageFilterTest.cxx | 2 +-
.../BasicFilters/otbRealImageToComplexImageFilterTest.cxx | 2 +-
.../Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx | 2 +-
.../BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx | 2 +-
.../BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx | 2 +-
.../BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx | 2 +-
Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx | 2 +-
.../Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx | 2 +-
.../BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx | 2 +-
.../otbStreamingResampleImageFilterCompareWithITK.cxx | 2 +-
.../Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx | 2 +-
.../BasicFilters/otbStreamingStatisticsImageFilterNew.cxx | 2 +-
.../BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx | 2 +-
.../otbStreamingStatisticsVectorImageFilterNew.cxx | 2 +-
.../otbUnaryImageFunctorWithVectorImageFilter.cxx | 2 +-
.../otbUnaryImageFunctorWithVectorImageFilterNew.cxx | 2 +-
.../Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx | 2 +-
.../BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx | 2 +-
Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx | 2 +-
.../Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx | 2 +-
.../BasicFilters/otbVectorImageToIntensityImageFilter.cxx | 2 +-
.../BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx | 2 +-
.../BasicFilters/otbVectorRescaleIntensityImageFilter.cxx | 2 +-
.../BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageBlackmanFunction.cxx | 2 +-
.../otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageCosineFunction.cxx | 2 +-
.../otbWindowedSincInterpolateImageCosineFunctionNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageFunctionBaseNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageGaussianFunction.cxx | 2 +-
.../otbWindowedSincInterpolateImageGaussianFunctionNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageHammingFunction.cxx | 2 +-
.../otbWindowedSincInterpolateImageHammingFunctionNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageLanczosFunction.cxx | 2 +-
.../otbWindowedSincInterpolateImageLanczosFunctionNew.cxx | 2 +-
.../otbWindowedSincInterpolateImageWelchFunction.cxx | 2 +-
.../otbWindowedSincInterpolateImageWelchFunctionNew.cxx | 2 +-
.../ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx | 2 +-
.../otbKullbackLeiblerDistanceImageFilterNew.cxx | 2 +-
.../ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx | 2 +-
.../otbKullbackLeiblerProfileImageFilterNew.cxx | 2 +-
.../otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx | 2 +-
Testing/Code/Common/otbConcatenateVectorImageFilter.cxx | 2 +-
Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx | 2 +-
Testing/Code/Common/otbConfigurationTest.cxx | 2 +-
Testing/Code/Common/otbDataNodeTest.cxx | 2 +-
Testing/Code/Common/otbDrawLineSpatialObject.cxx | 2 +-
Testing/Code/Common/otbDrawLineSpatialObjectList.cxx | 2 +-
Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx | 2 +-
Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx | 2 +-
Testing/Code/Common/otbDrawPathFilter.cxx | 2 +-
Testing/Code/Common/otbDrawPathFilterNew.cxx | 2 +-
Testing/Code/Common/otbDrawPathListFilter.cxx | 2 +-
Testing/Code/Common/otbDrawPathListFilterNew.cxx | 2 +-
Testing/Code/Common/otbDrawPathListFilterWithValue.cxx | 2 +-
Testing/Code/Common/otbExtractROI.cxx | 2 +-
Testing/Code/Common/otbExtractROI2.cxx | 2 +-
Testing/Code/Common/otbExtractROINew.cxx | 2 +-
Testing/Code/Common/otbExtractROI_RGB.cxx | 2 +-
Testing/Code/Common/otbGISTableNew.cxx | 2 +-
Testing/Code/Common/otbGISTableSourceNew.cxx | 2 +-
Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx | 2 +-
Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx | 2 +-
Testing/Code/Common/otbImageList.cxx | 2 +-
Testing/Code/Common/otbImageListNew.cxx | 2 +-
Testing/Code/Common/otbImageListSourceNew.cxx | 2 +-
Testing/Code/Common/otbImageListToImageFilterNew.cxx | 2 +-
Testing/Code/Common/otbImageListToImageListFilterNew.cxx | 2 +-
Testing/Code/Common/otbImageToImageListFilterNew.cxx | 2 +-
Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx | 2 +-
Testing/Code/Common/otbImageToPathFilterNew.cxx | 2 +-
Testing/Code/Common/otbImageToVectorImageCastFilter.cxx | 2 +-
Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx | 2 +-
Testing/Code/Common/otbLineSpatialObjectList.cxx | 2 +-
Testing/Code/Common/otbLineSpatialObjectNew.cxx | 2 +-
Testing/Code/Common/otbMultiChannelExtractROI.cxx | 2 +-
Testing/Code/Common/otbMultiChannelExtractROINew.cxx | 2 +-
Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx | 2 +-
Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx | 2 +-
Testing/Code/Common/otbObjectList.cxx | 2 +-
Testing/Code/Common/otbObjectList2.cxx | 2 +-
Testing/Code/Common/otbObjectListNew.cxx | 2 +-
Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx | 2 +-
Testing/Code/Common/otbParserTest.cxx | 2 +-
Testing/Code/Common/otbPathListToHistogramGenerator.cxx | 2 +-
Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx | 2 +-
Testing/Code/Common/otbPathListToPathListFilterNew.cxx | 2 +-
Testing/Code/Common/otbPointSetSourceTest.cxx | 2 +-
Testing/Code/Common/otbPolyLineImageConstIterator.cxx | 2 +-
Testing/Code/Common/otbPolyLineImageIterator.cxx | 2 +-
Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx | 2 +-
Testing/Code/Common/otbPolygon.cxx | 2 +-
Testing/Code/Common/otbPolygonNew.cxx | 2 +-
.../Common/otbPostGISConnectionImplementationConnectToDB.cxx | 2 +-
Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx | 2 +-
.../otbPostGISConnectionImplementationPerformTransaction.cxx | 2 +-
Testing/Code/Common/otbPostGISTableNew.cxx | 2 +-
Testing/Code/Common/otbQuickLookImageGenerator.cxx | 2 +-
Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx | 2 +-
Testing/Code/Common/otbRGBAPixelConverter.cxx | 2 +-
Testing/Code/Common/otbShiftScaleImageAdaptor.cxx | 2 +-
Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx | 2 +-
Testing/Code/Common/otbSpatialObjectSourceNew.cxx | 2 +-
Testing/Code/Common/otbStandardFilterWatcherNew.cxx | 2 +-
Testing/Code/Common/otbStandardWriterWatcher.cxx | 2 +-
Testing/Code/Common/otbSystemTest.cxx | 2 +-
Testing/Code/Common/otbTestCommandLineArgumentParser.cxx | 2 +-
Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx | 2 +-
Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx | 2 +-
.../Code/Common/otbTestCommandLineArgumentParserWithError.cxx | 2 +-
Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx | 2 +-
.../Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx | 2 +-
.../Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx | 2 +-
.../otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx | 2 +-
.../otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx | 2 +-
Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx | 2 +-
.../Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx | 2 +-
Testing/Code/Common/otbVariableLengthVectorConverter.cxx | 2 +-
Testing/Code/Common/otbVectorData.cxx | 2 +-
Testing/Code/Common/otbVectorDataNew.cxx | 2 +-
Testing/Code/Common/otbVectorDataSourceNew.cxx | 2 +-
Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx | 2 +-
Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx | 2 +-
Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx | 2 +-
.../otbBSplinesInterpolateDeformationFieldGenerator.cxx | 2 +-
.../otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx | 2 +-
...bBSplinesInterpolateTransformDeformationFieldGenerator.cxx | 2 +-
...plinesInterpolateTransformDeformationFieldGeneratorNew.cxx | 2 +-
...earestPointsLinearInterpolateDeformationFieldGenerator.cxx | 2 +-
...estPointsLinearInterpolateDeformationFieldGeneratorNew.cxx | 2 +-
...stTransformsLinearInterpolateDeformationFieldGenerator.cxx | 2 +-
...ransformsLinearInterpolateDeformationFieldGeneratorNew.cxx | 2 +-
.../DisparityMap/otbNearestPointDeformationFieldGenerator.cxx | 2 +-
.../otbNearestPointDeformationFieldGeneratorNew.cxx | 2 +-
.../otbNearestTransformDeformationFieldGenerator.cxx | 2 +-
.../otbNearestTransformDeformationFieldGeneratorNew.cxx | 2 +-
.../otbPointSetToDeformationFieldGeneratorNew.cxx | 2 +-
...otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx | 2 +-
.../Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx | 2 +-
.../FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx | 2 +-
.../FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx | 2 +-
.../otbAssymmetricFusionOfLineDetectorNew.cxx | 2 +-
.../Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx | 2 +-
.../FeatureExtraction/otbBreakAngularPathListFilterNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx | 2 +-
.../Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx | 2 +-
Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx | 2 +-
Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx | 2 +-
Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx | 2 +-
Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx | 2 +-
Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx | 2 +-
.../Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx | 2 +-
Testing/Code/FeatureExtraction/otbDrawPath.cxx | 2 +-
Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx | 2 +-
Testing/Code/FeatureExtraction/otbExtractSegments.cxx | 2 +-
Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx | 2 +-
Testing/Code/FeatureExtraction/otbFlusserPath.cxx | 2 +-
Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx | 2 +-
.../Code/FeatureExtraction/otbFourierMellinDescriptors.cxx | 2 +-
...ooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx | 2 +-
...currenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbHarrisImage.cxx | 2 +-
Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx | 2 +-
.../otbHistogramOfOrientedGradientCovariantImageFunction.cxx | 2 +-
Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx | 2 +-
Testing/Code/FeatureExtraction/otbHuPath.cxx | 2 +-
Testing/Code/FeatureExtraction/otbHuPathNew.cxx | 2 +-
.../FeatureExtraction/otbImageFittingPolygonListFilter.cxx | 2 +-
.../FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx | 2 +-
.../Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx | 2 +-
.../otbImageToHessianDeterminantImageFilter.cxx | 2 +-
.../otbImageToHessianDeterminantImageFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx | 2 +-
.../Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx | 2 +-
.../FeatureExtraction/otbLineCorrelationDetectorLinear.cxx | 2 +-
.../Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLocalHough.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx | 2 +-
Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx | 2 +-
...askedScalarImageToGreyLevelRunLengthMatrixGeneratorNew.cxx | 2 +-
.../otbModulusAndDirectionImageFiltersNew.cxx | 2 +-
.../Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx | 2 +-
.../FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx | 2 +-
.../otbNeighborhoodScalarProductFilterNew.cxx | 2 +-
.../FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx | 2 +-
.../otbNonMaxRemovalByDirectionFilterNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbOrientationPath.cxx | 2 +-
Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx | 2 +-
.../Code/FeatureExtraction/otbParallelLinePathListFilter.cxx | 2 +-
.../FeatureExtraction/otbParallelLinePathListFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx | 2 +-
.../FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx | 2 +-
.../FeatureExtraction/otbRadiometricMomentsImageFunction.cxx | 2 +-
.../Code/FeatureExtraction/otbRealMomentsImageFunction.cxx | 2 +-
.../otbRegionImageToRectangularPathListFilter.cxx | 2 +-
.../otbRegionImageToRectangularPathListFilterNew.cxx | 2 +-
.../FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx | 2 +-
.../otbRemoveIsolatedByDirectionFilterNew.cxx | 2 +-
.../FeatureExtraction/otbRemoveTortuousPathListFilter.cxx | 2 +-
.../FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx | 2 +-
.../FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx | 2 +-
Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx | 2 +-
.../otbScalarImageToAdvancedTexturesFilter.cxx | 2 +-
.../otbScalarImageToAdvancedTexturesFilterNew.cxx | 2 +-
.../otbScalarImageToHigherOrderTexturesFilter.cxx | 2 +-
.../otbScalarImageToHigherOrderTexturesFilterNew.cxx | 2 +-
.../FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx | 2 +-
.../otbScalarImageToPanTexTextureFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx | 2 +-
.../FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx | 2 +-
.../Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx | 2 +-
.../FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx | 2 +-
Testing/Code/FeatureExtraction/otbTextureFunctor.cxx | 2 +-
Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx | 2 +-
.../otbThresholdImageToPointSetFilterNew.cxx | 2 +-
.../FeatureExtraction/otbThresholdImageToPointSetTest.cxx | 2 +-
Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx | 2 +-
.../Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx | 2 +-
Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx | 2 +-
.../FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx | 2 +-
.../FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx | 2 +-
.../Code/FeatureExtraction/otbVectorizationPathListFilter.cxx | 2 +-
.../FeatureExtraction/otbVectorizationPathListFilterNew.cxx | 2 +-
Testing/Code/Fusion/otbBayesianFusionFilter.cxx | 2 +-
Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx | 2 +-
Testing/Code/Fusion/otbFusionImageBaseNew.cxx | 2 +-
.../Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx | 2 +-
.../Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx | 2 +-
.../otbPostGISCreateTableTransactorAccessors.cxx | 2 +-
.../otbPostGISCreateTableTransactorCreate.cxx | 2 +-
.../GeospatialAnalysis/otbPostGISCreateTableTransactorNew.cxx | 2 +-
.../GeospatialAnalysis/otbPostGISFromStringTransactorNew.cxx | 2 +-
Testing/Code/Gui/otbFltkWriterWatcher.cxx | 2 +-
Testing/Code/IO/otbBSQImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx | 2 +-
Testing/Code/IO/otbCompareWritingComplexImage.cxx | 2 +-
Testing/Code/IO/otbComplexImageTests.cxx | 2 +-
Testing/Code/IO/otbDEMHandlerNew.cxx | 2 +-
Testing/Code/IO/otbDEMHandlerTest.cxx | 4 ++--
Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx | 2 +-
Testing/Code/IO/otbDEMToImageGeneratorNew.cxx | 2 +-
Testing/Code/IO/otbDEMToImageGeneratorTest.cxx | 2 +-
Testing/Code/IO/otbDefaultImageMetadataInterface.cxx | 2 +-
.../Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx | 2 +-
Testing/Code/IO/otbDoubleImageIOTest.cxx | 2 +-
Testing/Code/IO/otbFloatImageIOTest.cxx | 2 +-
Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbGDALImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx | 2 +-
Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderONERA.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderONERAComplex.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADChar.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADFloat.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRADInt.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderRGBTest.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderServerName.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderTest.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderTestFloat.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx | 2 +-
Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx | 2 +-
Testing/Code/IO/otbImageFileWriterONERAComplex.cxx | 2 +-
Testing/Code/IO/otbImageFileWriterRGBTest.cxx | 2 +-
Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx | 2 +-
Testing/Code/IO/otbImageFileWriterTest.cxx | 2 +-
Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx | 2 +-
Testing/Code/IO/otbImageIOFactoryNew.cxx | 2 +-
Testing/Code/IO/otbImageMetadataFileWriterTest.cxx | 2 +-
Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx | 2 +-
Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx | 2 +-
Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx | 2 +-
.../Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx | 2 +-
Testing/Code/IO/otbImageTest.cxx | 2 +-
Testing/Code/IO/otbIntImageIOTest.cxx | 2 +-
Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx | 2 +-
Testing/Code/IO/otbLUMImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx | 2 +-
Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbMWImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbMWImageIOTestCanWrite.cxx | 2 +-
Testing/Code/IO/otbMultiDatasetReadingInfo.cxx | 2 +-
Testing/Code/IO/otbONERAImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx | 2 +-
.../IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx | 2 +-
.../Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx | 2 +-
Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx | 2 +-
Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx | 2 +-
.../Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx | 2 +-
Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbRADImageIOTestCanRead.cxx | 2 +-
Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx | 2 +-
.../Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx | 2 +-
Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx | 2 +-
Testing/Code/IO/otbShortImageIOTest.cxx | 2 +-
Testing/Code/IO/otbShortRGBImageIOTest.cxx | 2 +-
Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbStreamingImageFileWriterTest.cxx | 2 +-
...StreamingImageFileWriterTestCalculateNumberOfDivisions.cxx | 2 +-
Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx | 2 +-
Testing/Code/IO/otbStreamingImageFilterTest.cxx | 2 +-
Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx | 2 +-
...amingWithImageFileWriterTestCalculateNumberOfDivisions.cxx | 2 +-
Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx | 2 +-
Testing/Code/IO/otbVectorDataFileReaderWriter.cxx | 2 +-
Testing/Code/IO/otbVectorDataFileWriter.cxx | 2 +-
Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx | 2 +-
Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx | 2 +-
Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx | 2 +-
Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx | 2 +-
.../IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx | 2 +-
Testing/Code/IO/otbVectorImageTest.cxx | 2 +-
Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx | 2 +-
Testing/Code/Learning/otbDecisionTreeBuild.cxx | 2 +-
Testing/Code/Learning/otbDecisionTreeNew.cxx | 2 +-
Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx | 2 +-
Testing/Code/Learning/otbPeriodicSOM.cxx | 2 +-
Testing/Code/Learning/otbPeriodicSOMNew.cxx | 2 +-
Testing/Code/Learning/otbSEMClassifierNew.cxx | 2 +-
Testing/Code/Learning/otbSOM.cxx | 2 +-
Testing/Code/Learning/otbSOMActivationBuilder.cxx | 2 +-
Testing/Code/Learning/otbSOMActivationBuilderNew.cxx | 2 +-
Testing/Code/Learning/otbSOMMap.cxx | 2 +-
Testing/Code/Learning/otbSOMMapNew.cxx | 2 +-
Testing/Code/Learning/otbSOMNew.cxx | 2 +-
Testing/Code/Learning/otbSOMWithMissingValue.cxx | 2 +-
.../Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx | 2 +-
.../Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx | 2 +-
Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx | 2 +-
Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx | 2 +-
.../Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx | 2 +-
...seCosSpectralAngleKernelFunctorImageClassificationTest.cxx | 2 +-
...seCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx | 2 +-
Testing/Code/Learning/otbSVMModelAccessor.cxx | 2 +-
Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx | 2 +-
Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx | 2 +-
Testing/Code/Learning/otbSVMModelCopyTest.cxx | 2 +-
Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx | 2 +-
Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx | 2 +-
Testing/Code/Learning/otbSVMModelLoad.cxx | 2 +-
Testing/Code/Learning/otbSVMModelLoadSave.cxx | 2 +-
Testing/Code/Learning/otbSVMModelNew.cxx | 2 +-
Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx | 2 +-
Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx | 2 +-
Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx | 2 +-
Testing/Code/Learning/otbSVMValidation.cxx | 2 +-
Testing/Code/Markov/otbMRFSamplerMAPNew.cxx | 2 +-
...otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx | 2 +-
.../Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx | 2 +-
.../MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx | 2 +-
.../MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx | 2 +-
.../MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx | 2 +-
Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx | 2 +-
.../Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx | 2 +-
.../MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx | 2 +-
.../otbMorphologicalPyramidSegmentationFilterNew.cxx | 2 +-
Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx | 2 +-
.../Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx | 2 +-
.../MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx | 2 +-
.../MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx | 2 +-
Testing/Code/OBIA/otbLabelMapSourceNew.cxx | 2 +-
Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx | 2 +-
Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx | 2 +-
Testing/Code/Projections/otbCompositeTransform.cxx | 2 +-
Testing/Code/Projections/otbCompositeTransformNew.cxx | 2 +-
.../Code/Projections/otbCreateInverseForwardSensorModel.cxx | 2 +-
Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx | 2 +-
Testing/Code/Projections/otbCreateProjectionWithOTB.cxx | 2 +-
Testing/Code/Projections/otbGenericMapProjectionNew.cxx | 2 +-
Testing/Code/Projections/otbGenericRSTransformNew.cxx | 2 +-
Testing/Code/Projections/otbMapProjectionsNew.cxx | 2 +-
.../Code/Projections/otbOrthoRectificationFilterWithDEM.cxx | 2 +-
Testing/Code/Projections/otbProjectionBaseNew.cxx | 2 +-
Testing/Code/Projections/otbRegionProjectionResampler.cxx | 2 +-
Testing/Code/Projections/otbSensorModelsNew.cxx | 2 +-
.../otbVectorDataIntoImageProjectionFilterTest.cxx | 2 +-
Testing/Code/Projections/otbVectorDataProjectionFilter.cxx | 2 +-
.../Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx | 2 +-
.../Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx | 2 +-
.../otbVectorDataProjectionFilterFromMapToImage.cxx | 2 +-
.../otbVectorDataProjectionFilterFromMapToSensor.cxx | 2 +-
Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx | 2 +-
...tbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx | 2 +-
Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx | 2 +-
Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx | 2 +-
Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx | 2 +-
...tbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbFilterFunctionValues.cxx | 2 +-
Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx | 2 +-
Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx | 2 +-
.../otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx | 2 +-
.../Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx | 2 +-
.../Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx | 2 +-
Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx | 2 +-
Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx | 2 +-
.../Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx | 2 +-
.../Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx | 2 +-
.../Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx | 2 +-
.../Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx | 2 +-
.../otbLandsatTMSpectralRuleBasedClassifierTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx | 2 +-
Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx | 2 +-
.../Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx | 2 +-
.../Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx | 2 +-
.../Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx | 2 +-
.../Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx | 2 +-
.../Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx | 2 +-
.../otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
...tbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx | 2 +-
.../otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx | 2 +-
.../otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx | 2 +-
.../otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx | 2 +-
.../Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx | 2 +-
.../Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbRAndBAndNIRVegetationIndexImageFilterNew.cxx | 2 +-
.../otbRAndGAndNIRVegetationIndexImageFilterNew.cxx | 2 +-
.../Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx | 2 +-
.../otbReflectanceToSurfaceReflectanceImageFilterTest.cxx | 2 +-
...maniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx | 2 +-
.../Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx | 2 +-
.../Radiometry/otbSarParametricMapFunctionToImageFilter.cxx | 2 +-
.../Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx | 2 +-
.../otbSarRadiometricCalibrationFunctorWithoutNoise.cxx | 2 +-
...bSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbSetASetBRAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx | 2 +-
.../otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew.cxx | 2 +-
...SARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx | 2 +-
Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx | 2 +-
.../otbTerraSarBrightnessImageComplexFilterTest.cxx | 2 +-
.../Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx | 2 +-
.../Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx | 2 +-
.../Code/Radiometry/otbTerraSarCalibrationImageFilterNew.cxx | 2 +-
.../otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx | 2 +-
.../Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx | 2 +-
.../SARPolarimetry/otbHHnHVPolarimetricSynthesisFilter.cxx | 2 +-
.../SARPolarimetry/otbHHnHVnVVPolarimetricSynthesisFilter.cxx | 2 +-
Testing/Code/SARPolarimetry/otbHermitianEigenAnalysisTest.cxx | 2 +-
.../otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx | 2 +-
.../otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx | 2 +-
.../otbMuellerToReciprocalCovarianceFunctor.cxx | 2 +-
.../otbMuellerToReciprocalCovarianceImageFilter.cxx | 2 +-
.../otbMuellerToReciprocalCovarianceImageFilterNew.cxx | 2 +-
.../otbMultiChannelsPolarimetricSynthesisFilter.cxx | 2 +-
.../otbMultiChannelsPolarimetricSynthesisFilterNew.cxx | 2 +-
Testing/Code/SARPolarimetry/otbPolarimetricData.cxx | 2 +-
.../Code/SARPolarimetry/otbPolarimetricSynthesisFilter.cxx | 2 +-
.../Code/SARPolarimetry/otbPolarimetricSynthesisFilterNew.cxx | 2 +-
.../Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx | 2 +-
.../otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx | 2 +-
...tbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx | 2 +-
.../otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx | 2 +-
...otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx | 2 +-
...tbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx | 2 +-
...eciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx | 2 +-
.../Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx | 2 +-
.../Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx | 2 +-
...earCovarianceToReciprocalCircularCovarianceImageFilter.cxx | 2 +-
...CovarianceToReciprocalCircularCovarianceImageFilterNew.cxx | 2 +-
Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx | 2 +-
.../Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx | 2 +-
.../otbSinclairToCircularCovarianceMatrixFunctor.cxx | 2 +-
.../SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx | 2 +-
.../SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx | 2 +-
.../Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx | 2 +-
...otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx | 2 +-
.../otbSinclairToReciprocalCoherencyMatrixFunctor.cxx | 2 +-
.../otbSinclairToReciprocalCovarianceMatrixFunctor.cxx | 2 +-
.../SARPolarimetry/otbVHnVVPolarimetricSynthesisFilter.cxx | 2 +-
.../otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx | 2 +-
.../Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx | 2 +-
Testing/Code/Simulation/otbAtmosphericEffects.cxx | 2 +-
Testing/Code/Simulation/otbProspectReflTest.cxx | 2 +-
Testing/Code/Simulation/otbProspectTransTest.cxx | 2 +-
Testing/Code/Simulation/otbReduceSpectralResponse.cxx | 2 +-
.../Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx | 2 +-
Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx | 2 +-
.../Simulation/otbReduceSpectralResponseSVMClassifier.cxx | 2 +-
Testing/Code/Simulation/otbSailReflHTest.cxx | 2 +-
Testing/Code/Simulation/otbSailReflVTest.cxx | 2 +-
Testing/Code/Simulation/otbSatelliteRSR.cxx | 2 +-
Testing/Code/Simulation/otbSatelliteRSRNew.cxx | 2 +-
Testing/Code/Simulation/otbSpatialisationTestNew.cxx | 2 +-
Testing/Code/Simulation/otbSpectralResponse.cxx | 2 +-
Testing/Code/Simulation/otbSpectralResponseNew.cxx | 2 +-
.../otbSurfaceReflectanceToReflectanceFilterNew.cxx | 2 +-
.../SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx | 2 +-
.../otbImageMultiSegmentationToRCC8GraphFilter.cxx | 2 +-
.../otbImageMultiSegmentationToRCC8GraphFilterNew.cxx | 2 +-
.../Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx | 2 +-
.../SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx | 2 +-
.../Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx | 2 +-
.../SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx | 2 +-
.../SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx | 2 +-
.../SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8Edge.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8Graph.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx | 2 +-
Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx | 2 +-
.../Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx | 2 +-
.../Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx | 2 +-
Testing/Code/TestSystem/otbCompareAsciiTests.cxx | 2 +-
Testing/Code/TestSystem/otbCompareAsciiTests2.cxx | 2 +-
Testing/Code/TestSystem/otbCompareAsciiTests3.cxx | 2 +-
Testing/Code/TestSystem/otbCompareAsciiTests4.cxx | 2 +-
Testing/Code/TestSystem/otbCompareAsciiTests5.cxx | 2 +-
.../TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx | 2 +-
Testing/Code/Visu/otbDoubleImageViewerWithLink.cxx | 2 +-
Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.cxx | 2 +-
.../Code/Visu/otbImageToGrayscaleAnaglyphImageFilterNew.cxx | 2 +-
Testing/Code/Visu/otbImageViewer.cxx | 2 +-
Testing/Code/Visu/otbImageViewerNew.cxx | 2 +-
Testing/Code/Visu/otbImageViewerWithMultiBandFilter.cxx | 2 +-
Testing/Code/Visu/otbImageViewerWithOtbImage.cxx | 2 +-
Testing/Code/Visu/otbImageViewerWithOverlay.cxx | 2 +-
.../Visu/otbVectorImageToColorAnaglyphVectorImageFilter.cxx | 2 +-
.../otbVectorImageToColorAnaglyphVectorImageFilterNew.cxx | 2 +-
Testing/Code/Visualization/otbAmplitudeFunctorTest.cxx | 2 +-
Testing/Fa/0000169-fftcomplextocomplex.cxx | 2 +-
.../000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx | 2 +-
Testing/Fa/PolygonsVectorization.cxx | 2 +-
Testing/Utilities/otbSVMComposedKernelFunctorTest.cxx | 2 +-
739 files changed, 740 insertions(+), 740 deletions(-)
diff --git a/Code/BasicFilters/otbFastICAImageFilter.txx b/Code/BasicFilters/otbFastICAImageFilter.txx
index 3f9b15d9d7..3c5f57af0c 100644
--- a/Code/BasicFilters/otbFastICAImageFilter.txx
+++ b/Code/BasicFilters/otbFastICAImageFilter.txx
@@ -22,7 +22,7 @@
#include "otbMacro.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkNumericTraits.h"
#include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx b/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
index c4fbdf5779..89060da33e 100644
--- a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
+++ b/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
@@ -19,7 +19,7 @@
#define __otbFastICAInternalOptimizerVectorImageFilter_txx
#include "otbFastICAInternalOptimizerVectorImageFilter.h"
-#include <itkExceptionObject.h>
+#include <itkMacro.h>
#include <itkImageRegionConstIterator.h>
#include <itkImageRegionIterator.h>
diff --git a/Code/BasicFilters/otbFrostImageFilter.txx b/Code/BasicFilters/otbFrostImageFilter.txx
index 3badf151f7..c566b158f7 100644
--- a/Code/BasicFilters/otbFrostImageFilter.txx
+++ b/Code/BasicFilters/otbFrostImageFilter.txx
@@ -21,7 +21,7 @@
#include "otbFrostImageFilter.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbLeeImageFilter.txx b/Code/BasicFilters/otbLeeImageFilter.txx
index 6c6a4dd27e..b213174e0d 100644
--- a/Code/BasicFilters/otbLeeImageFilter.txx
+++ b/Code/BasicFilters/otbLeeImageFilter.txx
@@ -21,7 +21,7 @@
#include "otbLeeImageFilter.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbMNFImageFilter.txx b/Code/BasicFilters/otbMNFImageFilter.txx
index 3bc49a4a61..9e5d52fdca 100644
--- a/Code/BasicFilters/otbMNFImageFilter.txx
+++ b/Code/BasicFilters/otbMNFImageFilter.txx
@@ -19,7 +19,7 @@
#define __otbMNFImageFilter_txx
#include "otbMNFImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <vnl/vnl_matrix.h>
#include <vnl/algo/vnl_matrix_inverse.h>
diff --git a/Code/BasicFilters/otbNAPCAImageFilter.txx b/Code/BasicFilters/otbNAPCAImageFilter.txx
index b2bfa132f4..8ec1f50247 100644
--- a/Code/BasicFilters/otbNAPCAImageFilter.txx
+++ b/Code/BasicFilters/otbNAPCAImageFilter.txx
@@ -19,7 +19,7 @@
#define __otbNAPCAImageFilter_txx
#include "otbNAPCAImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <vnl/vnl_matrix.h>
#include <vnl/algo/vnl_matrix_inverse.h>
diff --git a/Code/BasicFilters/otbNormalizeVectorImageFilter.h b/Code/BasicFilters/otbNormalizeVectorImageFilter.h
index a399879456..077da0a103 100644
--- a/Code/BasicFilters/otbNormalizeVectorImageFilter.h
+++ b/Code/BasicFilters/otbNormalizeVectorImageFilter.h
@@ -21,7 +21,7 @@
#include <vnl/vnl_math.h>
#include <itkNumericTraits.h>
-#include <itkExceptionObject.h>
+#include <itkMacro.h>
#include <itkVariableLengthVector.h>
#include <otbVectorImage.h>
#include <otbUnaryFunctorVectorImageFilter.h>
diff --git a/Code/BasicFilters/otbPCAImageFilter.txx b/Code/BasicFilters/otbPCAImageFilter.txx
index 71f3f3dc1e..b5cc741d45 100644
--- a/Code/BasicFilters/otbPCAImageFilter.txx
+++ b/Code/BasicFilters/otbPCAImageFilter.txx
@@ -19,7 +19,7 @@
#define __otbPCAImageFilter_txx
#include "otbPCAImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <vnl/vnl_matrix.h>
#include <vnl/algo/vnl_symmetric_eigensystem.h>
diff --git a/Code/BasicFilters/otbPointSetExtractROI.txx b/Code/BasicFilters/otbPointSetExtractROI.txx
index faec29cd0d..f2d5d935b2 100644
--- a/Code/BasicFilters/otbPointSetExtractROI.txx
+++ b/Code/BasicFilters/otbPointSetExtractROI.txx
@@ -19,7 +19,7 @@
#define __otbPointSetExtractROI_txx
#include "otbPointSetExtractROI.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/BasicFilters/otbTransformPointSetFilter.txx b/Code/BasicFilters/otbTransformPointSetFilter.txx
index 323afe56c5..5658d1fe1a 100644
--- a/Code/BasicFilters/otbTransformPointSetFilter.txx
+++ b/Code/BasicFilters/otbTransformPointSetFilter.txx
@@ -19,7 +19,7 @@
#define __otbTransformPointSetFilter_txx
#include "otbTransformPointSetFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.txx b/Code/Common/otbDrawLineSpatialObjectFilter.txx
index 5f9242c2a4..19dc2885c8 100644
--- a/Code/Common/otbDrawLineSpatialObjectFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.txx
@@ -21,7 +21,7 @@
#include "otbDrawLineSpatialObjectFilter.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageRegionIterator.h"
#include "itkImageIteratorWithIndex.h"
#include "itkImageConstIteratorWithIndex.h"
diff --git a/Code/Common/otbVariableLengthVectorConverter.h b/Code/Common/otbVariableLengthVectorConverter.h
index e42eba8b81..d74c120c79 100644
--- a/Code/Common/otbVariableLengthVectorConverter.h
+++ b/Code/Common/otbVariableLengthVectorConverter.h
@@ -21,7 +21,7 @@
#include "itkProcessObject.h"
#include "itkVariableLengthVector.h"
#include "itkNumericTraits.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "itkHistogram.h"
#include "itkSmartPointer.h"
diff --git a/Code/DisparityMap/otbFineRegistrationImageFilter.txx b/Code/DisparityMap/otbFineRegistrationImageFilter.txx
index eadbfeadc7..cea613e1b0 100644
--- a/Code/DisparityMap/otbFineRegistrationImageFilter.txx
+++ b/Code/DisparityMap/otbFineRegistrationImageFilter.txx
@@ -24,7 +24,7 @@
#include "itkLinearInterpolateImageFunction.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkNormalizedCorrelationImageToImageMetric.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.txx b/Code/DisparityMap/otbNCCRegistrationFunction.txx
index 1093ca589b..9fc24ff9c8 100644
--- a/Code/DisparityMap/otbNCCRegistrationFunction.txx
+++ b/Code/DisparityMap/otbNCCRegistrationFunction.txx
@@ -22,7 +22,7 @@
#define __otbNCCRegistrationFunction_txx
#include "otbNCCRegistrationFunction.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "vnl/vnl_math.h"
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
index d4bad19665..77916e487d 100644
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
@@ -21,7 +21,7 @@
#include "otbLineCorrelationDetectorImageFilter.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
index 65d8ef5416..76153e82db 100644
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
@@ -21,7 +21,7 @@
#include "otbLineDetectorImageFilterBase.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstantPadImageFilter.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
index cf0e8044cc..32fefe88c3 100644
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
@@ -22,7 +22,7 @@
#include "otbMacro.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
index 303cec1c2a..1318b9e2d8 100644
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
@@ -21,7 +21,7 @@
#include "otbPixelSuppressionByDirectionImageFilter.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
index e017ee1552..12bc1e2f1d 100644
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
@@ -21,7 +21,7 @@
#include "otbTouziEdgeDetectorImageFilter.h"
#include "itkDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNeighborhoodInnerProduct.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx b/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx
index 9793ed2b19..d137c8dc46 100644
--- a/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx
+++ b/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
#include "otbFuzzyDescriptorsModelManager.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itksys/SystemTools.hxx"
#include "tinyxml.h"
diff --git a/Code/IO/otbBSQImageIO.cxx b/Code/IO/otbBSQImageIO.cxx
index 1500aef62b..4af93cf261 100644
--- a/Code/IO/otbBSQImageIO.cxx
+++ b/Code/IO/otbBSQImageIO.cxx
@@ -23,7 +23,7 @@
#include "itkByteSwapper.h"
#include "itksys/SystemTools.hxx"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "itkMacro.h"
diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index a2739cbef7..e5f1950313 100644
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -28,7 +28,7 @@
#include "itkMetaDataObject.h"
#include "otbMetaDataKey.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkMacro.h"
#include "itkRGBPixel.h"
#include "itkRGBAPixel.h"
diff --git a/Code/IO/otbImageSeriesFileReaderBase.h b/Code/IO/otbImageSeriesFileReaderBase.h
index a60c958edf..68d798b69d 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.h
+++ b/Code/IO/otbImageSeriesFileReaderBase.h
@@ -26,7 +26,7 @@
#include <string>
#include "itkMacro.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx
index b7dd3067d6..9c0ddc231f 100644
--- a/Code/IO/otbJPEG2000ImageIO.cxx
+++ b/Code/IO/otbJPEG2000ImageIO.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
#include "otbJPEG2000ImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSystem.h"
diff --git a/Code/IO/otbKMLVectorDataIO.cxx b/Code/IO/otbKMLVectorDataIO.cxx
index fd656f1410..38a2b49ebe 100644
--- a/Code/IO/otbKMLVectorDataIO.cxx
+++ b/Code/IO/otbKMLVectorDataIO.cxx
@@ -28,7 +28,7 @@
#include "ogrsf_frmts.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSystem.h"
#include "otbDataNode.h"
diff --git a/Code/IO/otbLUMImageIO.cxx b/Code/IO/otbLUMImageIO.cxx
index 9c147386b4..856fdef7c2 100644
--- a/Code/IO/otbLUMImageIO.cxx
+++ b/Code/IO/otbLUMImageIO.cxx
@@ -19,7 +19,7 @@
#include "itkByteSwapper.h"
#include "itksys/SystemTools.hxx"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "itkMacro.h"
diff --git a/Code/IO/otbMSTARImageIO.cxx b/Code/IO/otbMSTARImageIO.cxx
index 36ca4dc295..53da187296 100644
--- a/Code/IO/otbMSTARImageIO.cxx
+++ b/Code/IO/otbMSTARImageIO.cxx
@@ -33,7 +33,7 @@
#define LSB_FIRST 0 /* Implies little-endian CPU... */
#define MSB_FIRST 1 /* Implies big-endian CPU... */
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <list>
diff --git a/Code/IO/otbMWImageIO.cxx b/Code/IO/otbMWImageIO.cxx
index 7ee3de01cf..6a8f9fadd1 100644
--- a/Code/IO/otbMWImageIO.cxx
+++ b/Code/IO/otbMWImageIO.cxx
@@ -19,7 +19,7 @@
#include "itkByteSwapper.h"
#include "itksys/SystemTools.hxx"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "itkMacro.h"
diff --git a/Code/IO/otbOGRVectorDataIO.cxx b/Code/IO/otbOGRVectorDataIO.cxx
index df2235a7f4..44a19407a9 100644
--- a/Code/IO/otbOGRVectorDataIO.cxx
+++ b/Code/IO/otbOGRVectorDataIO.cxx
@@ -23,7 +23,7 @@
#include "ogrsf_frmts.h"
#include "itksys/SystemTools.hxx"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkByteSwapper.h"
#include "otbMacro.h"
#include "otbSystem.h"
diff --git a/Code/IO/otbONERAImageIO.cxx b/Code/IO/otbONERAImageIO.cxx
index 9c9407fb06..3d2988bbf3 100644
--- a/Code/IO/otbONERAImageIO.cxx
+++ b/Code/IO/otbONERAImageIO.cxx
@@ -19,7 +19,7 @@
#include "itkByteSwapper.h"
#include "itksys/SystemTools.hxx"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "itkMacro.h"
diff --git a/Code/IO/otbRADImageIO.cxx b/Code/IO/otbRADImageIO.cxx
index 687441f6b9..10ced7a099 100644
--- a/Code/IO/otbRADImageIO.cxx
+++ b/Code/IO/otbRADImageIO.cxx
@@ -23,7 +23,7 @@
#include "itkByteSwapper.h"
#include "itksys/SystemTools.hxx"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "itkMacro.h"
diff --git a/Code/IO/otbSpectralSensitivityReader.cxx b/Code/IO/otbSpectralSensitivityReader.cxx
index 3b93697928..b29cd84335 100644
--- a/Code/IO/otbSpectralSensitivityReader.cxx
+++ b/Code/IO/otbSpectralSensitivityReader.cxx
@@ -25,7 +25,7 @@
#include "itksys/SystemTools.hxx"
#include "otbSpotImageMetadataInterface.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/IO/otbTileMapImageIO.cxx b/Code/IO/otbTileMapImageIO.cxx
index 0b3ff5fbad..11f25e511a 100644
--- a/Code/IO/otbTileMapImageIO.cxx
+++ b/Code/IO/otbTileMapImageIO.cxx
@@ -23,7 +23,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkMacro.h"
#include "itksys/SystemTools.hxx"
diff --git a/Code/IO/otbVectorDataFileReader.h b/Code/IO/otbVectorDataFileReader.h
index 043cd8d5a0..a6e22e2d9e 100644
--- a/Code/IO/otbVectorDataFileReader.h
+++ b/Code/IO/otbVectorDataFileReader.h
@@ -20,7 +20,7 @@
#include "otbVectorDataSource.h"
#include "otbVectorDataIOBase.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/IO/otbVectorDataFileWriter.h b/Code/IO/otbVectorDataFileWriter.h
index 686703be7b..143823e87e 100644
--- a/Code/IO/otbVectorDataFileWriter.h
+++ b/Code/IO/otbVectorDataFileWriter.h
@@ -19,7 +19,7 @@
#define __otbVectorDataFileWriter_h
#include "itkProcessObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataIOBase.h"
namespace otb
diff --git a/Code/Learning/otbModelComponentBase.txx b/Code/Learning/otbModelComponentBase.txx
index 195276e15c..112a1f52ab 100644
--- a/Code/Learning/otbModelComponentBase.txx
+++ b/Code/Learning/otbModelComponentBase.txx
@@ -22,7 +22,7 @@
#include <iostream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbModelComponentBase.h"
diff --git a/Code/Learning/otbSEMClassifier.txx b/Code/Learning/otbSEMClassifier.txx
index f4c2392e7c..27f17459af 100644
--- a/Code/Learning/otbSEMClassifier.txx
+++ b/Code/Learning/otbSEMClassifier.txx
@@ -5,7 +5,7 @@
#include <iostream>
#include "itkNumericTraits.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageIterator.h"
#include "itkImageRegionIterator.h"
diff --git a/Code/MultiScale/otbWaveletGenerator.cxx b/Code/MultiScale/otbWaveletGenerator.cxx
index 56d06102ee..04b4ee1824 100644
--- a/Code/MultiScale/otbWaveletGenerator.cxx
+++ b/Code/MultiScale/otbWaveletGenerator.cxx
@@ -21,7 +21,7 @@
#include "otbWaveletGenerator.h"
#include <vcl_cmath.h>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMath.h"
namespace otb {
diff --git a/Code/MultiScale/otbWaveletOperator.h b/Code/MultiScale/otbWaveletOperator.h
index c33f55843c..6f5ed4b77e 100644
--- a/Code/MultiScale/otbWaveletOperator.h
+++ b/Code/MultiScale/otbWaveletOperator.h
@@ -20,7 +20,7 @@
#ifndef __otbWaveletOperator_h
#define __otbWaveletOperator_h
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkNeighborhoodOperator.h"
// This include is needed here to define Wavelet::Wavelet...
diff --git a/Code/MultiScale/otbWaveletOperatorBase.h b/Code/MultiScale/otbWaveletOperatorBase.h
index 054c66dea6..c8e5b94311 100644
--- a/Code/MultiScale/otbWaveletOperatorBase.h
+++ b/Code/MultiScale/otbWaveletOperatorBase.h
@@ -20,7 +20,7 @@
#ifndef __otbWaveletOperatorBase_h
#define __otbWaveletOperatorBase_h
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkNeighborhoodOperator.h"
// This include is needed here to define MotherWaveletOperatorEnum...
diff --git a/Code/ObjectDetection/otbStatisticsXMLFileReader.txx b/Code/ObjectDetection/otbStatisticsXMLFileReader.txx
index 3e20f6dd51..691f9bb9cf 100644
--- a/Code/ObjectDetection/otbStatisticsXMLFileReader.txx
+++ b/Code/ObjectDetection/otbStatisticsXMLFileReader.txx
@@ -19,7 +19,7 @@
#define __otbStatisticsXMLFileReader_txx
#include "otbStatisticsXMLFileReader.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itksys/SystemTools.hxx"
#include "tinyxml.h"
diff --git a/Code/ObjectDetection/otbStatisticsXMLFileWriter.txx b/Code/ObjectDetection/otbStatisticsXMLFileWriter.txx
index 7bdf51300d..194e93276b 100644
--- a/Code/ObjectDetection/otbStatisticsXMLFileWriter.txx
+++ b/Code/ObjectDetection/otbStatisticsXMLFileWriter.txx
@@ -19,7 +19,7 @@
#define __otbStatisticsXMLFileWriter_txx
#include "otbStatisticsXMLFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itksys/SystemTools.hxx"
#include "tinyxml.h"
diff --git a/Code/Projections/otbForwardSensorModel.txx b/Code/Projections/otbForwardSensorModel.txx
index 77379fc5e2..55028c2a40 100644
--- a/Code/Projections/otbForwardSensorModel.txx
+++ b/Code/Projections/otbForwardSensorModel.txx
@@ -19,7 +19,7 @@
#define __otbForwardSensorModel_txx
#include "otbForwardSensorModel.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
namespace otb
diff --git a/Code/Projections/otbGenericMapProjection.h b/Code/Projections/otbGenericMapProjection.h
index cc44e465b2..5486121c50 100644
--- a/Code/Projections/otbGenericMapProjection.h
+++ b/Code/Projections/otbGenericMapProjection.h
@@ -22,7 +22,7 @@
#include <sstream>
#include "itkTransform.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkMacro.h"
#include "otbMapProjectionAdapter.h"
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index 3f22d0754e..30bd3d1285 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -22,7 +22,7 @@
#include <sstream>
#include <stdio.h>
#include "itkTransform.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkMacro.h"
#include "otbCompositeTransform.h"
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index 120472f4b0..b134423729 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -22,7 +22,7 @@
#include "otbMacro.h"
#include "otbMetaDataKey.h"
#include "itkMetaDataObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbGeoInformationConversion.h"
#include "ogr_spatialref.h"
diff --git a/Code/Projections/otbInverseSensorModel.txx b/Code/Projections/otbInverseSensorModel.txx
index 25fa1f67d2..78ffe1fea3 100644
--- a/Code/Projections/otbInverseSensorModel.txx
+++ b/Code/Projections/otbInverseSensorModel.txx
@@ -19,7 +19,7 @@
#define __otbInverseSensorModel_txx
#include "otbInverseSensorModel.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
namespace otb
diff --git a/Code/Projections/otbRationalTransform.h b/Code/Projections/otbRationalTransform.h
index ad587978b2..f23365757d 100644
--- a/Code/Projections/otbRationalTransform.h
+++ b/Code/Projections/otbRationalTransform.h
@@ -19,7 +19,7 @@
#define __otbRationalTransform_h
#include "itkTransform.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkMacro.h"
namespace otb
diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx
index a0490c75ce..996b94e301 100644
--- a/Code/Projections/otbSensorModelBase.txx
+++ b/Code/Projections/otbSensorModelBase.txx
@@ -21,7 +21,7 @@
#include "otbSensorModelBase.h"
#include "otbMacro.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileReader.h b/Code/SpatialReasoning/otbRCC8GraphFileReader.h
index 93905277ec..9e1ff30545 100644
--- a/Code/SpatialReasoning/otbRCC8GraphFileReader.h
+++ b/Code/SpatialReasoning/otbRCC8GraphFileReader.h
@@ -19,7 +19,7 @@
#define __otbRCC8GraphFileReader_h
#include "otbRCC8GraphSource.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileWriter.h b/Code/SpatialReasoning/otbRCC8GraphFileWriter.h
index b3247b7265..7b6b8db94b 100644
--- a/Code/SpatialReasoning/otbRCC8GraphFileWriter.h
+++ b/Code/SpatialReasoning/otbRCC8GraphFileWriter.h
@@ -19,7 +19,7 @@
#define __otbRCC8GraphFileWriter_h
#include "itkProcessObject.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
namespace otb
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbAeronetFileReader.h b/Code/UtilitiesAdapters/OssimAdapters/otbAeronetFileReader.h
index 2dd7eb8e48..0a80d6e47f 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbAeronetFileReader.h
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbAeronetFileReader.h
@@ -21,7 +21,7 @@
#include <string>
#include <vector>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkProcessObject.h"
#include "otbMacro.h"
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx
index ea62a1743e..5d093c47a7 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx
@@ -18,7 +18,7 @@
#include "otbDEMConvertAdapter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
// OSSIM include
#include "base/ossimKeywordNames.h"
diff --git a/Examples/BasicFilters/BandMathFilterExample.cxx b/Examples/BasicFilters/BandMathFilterExample.cxx
index 0d73cadadb..57b46023a4 100644
--- a/Examples/BasicFilters/BandMathFilterExample.cxx
+++ b/Examples/BasicFilters/BandMathFilterExample.cxx
@@ -41,7 +41,7 @@
//
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx b/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
index bbea9e423d..bc2db95b76 100644
--- a/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
+++ b/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
@@ -37,7 +37,7 @@
//
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
#include "otbStreamingImageFileWriter.h"
diff --git a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
index f6b8b133b2..25ff0cb8d4 100644
--- a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
+++ b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
@@ -74,7 +74,7 @@
//
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
index 2fb9f417ba..fa359e75d6 100644
--- a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
+++ b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
@@ -42,7 +42,7 @@
//
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbMultiChannelExtractROI.h"
#include "otbVectorRescaleIntensityImageFilter.h"
diff --git a/Examples/DataRepresentation/Image/ImageListExample.cxx b/Examples/DataRepresentation/Image/ImageListExample.cxx
index 7126c36bf6..6181a7af47 100644
--- a/Examples/DataRepresentation/Image/ImageListExample.cxx
+++ b/Examples/DataRepresentation/Image/ImageListExample.cxx
@@ -37,7 +37,7 @@
#include "otbImageList.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Examples/FeatureExtraction/CloudDetectionExample.cxx b/Examples/FeatureExtraction/CloudDetectionExample.cxx
index 43724f3513..446757676a 100644
--- a/Examples/FeatureExtraction/CloudDetectionExample.cxx
+++ b/Examples/FeatureExtraction/CloudDetectionExample.cxx
@@ -47,7 +47,7 @@
#include "otbCloudDetectionFilter.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/ComplexMomentPathExample.cxx b/Examples/FeatureExtraction/ComplexMomentPathExample.cxx
index a8f7fb6c4f..867ab4f7aa 100644
--- a/Examples/FeatureExtraction/ComplexMomentPathExample.cxx
+++ b/Examples/FeatureExtraction/ComplexMomentPathExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/ComplexMomentsImageFunctionExample.cxx b/Examples/FeatureExtraction/ComplexMomentsImageFunctionExample.cxx
index 419b3c7110..513dc503fe 100644
--- a/Examples/FeatureExtraction/ComplexMomentsImageFunctionExample.cxx
+++ b/Examples/FeatureExtraction/ComplexMomentsImageFunctionExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/FlusserMomentsImageFunctionExample.cxx b/Examples/FeatureExtraction/FlusserMomentsImageFunctionExample.cxx
index 3c8195c7ee..eeeff99dc5 100644
--- a/Examples/FeatureExtraction/FlusserMomentsImageFunctionExample.cxx
+++ b/Examples/FeatureExtraction/FlusserMomentsImageFunctionExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/HarrisExample.cxx b/Examples/FeatureExtraction/HarrisExample.cxx
index 012803f321..af03ef0902 100644
--- a/Examples/FeatureExtraction/HarrisExample.cxx
+++ b/Examples/FeatureExtraction/HarrisExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/HuMomentsImageFunctionExample.cxx b/Examples/FeatureExtraction/HuMomentsImageFunctionExample.cxx
index 463b4b4a66..8f1b978ca3 100644
--- a/Examples/FeatureExtraction/HuMomentsImageFunctionExample.cxx
+++ b/Examples/FeatureExtraction/HuMomentsImageFunctionExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/PanTexExample.cxx b/Examples/FeatureExtraction/PanTexExample.cxx
index 3165c871bb..6d3da9ccc0 100644
--- a/Examples/FeatureExtraction/PanTexExample.cxx
+++ b/Examples/FeatureExtraction/PanTexExample.cxx
@@ -22,7 +22,7 @@
// OUTPUTS: {PanTexOutput.tif}, {pretty_PanTexInput.png}, {pretty_PanTexOutput.png}
// Software Guide : EndCommandLineArgs
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Examples/FeatureExtraction/SFSExample.cxx b/Examples/FeatureExtraction/SFSExample.cxx
index 75a9d4699b..07ddd0b965 100644
--- a/Examples/FeatureExtraction/SFSExample.cxx
+++ b/Examples/FeatureExtraction/SFSExample.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/TextureExample.cxx b/Examples/FeatureExtraction/TextureExample.cxx
index c99778c47a..c2b63b8ac1 100644
--- a/Examples/FeatureExtraction/TextureExample.cxx
+++ b/Examples/FeatureExtraction/TextureExample.cxx
@@ -23,7 +23,7 @@
// 2 1 1
// Software Guide : EndCommandLineArgs
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Examples/GeospatialAnalysis/PostGISCreateTable.cxx b/Examples/GeospatialAnalysis/PostGISCreateTable.cxx
index 493b78a23c..71550bd5f5 100644
--- a/Examples/GeospatialAnalysis/PostGISCreateTable.cxx
+++ b/Examples/GeospatialAnalysis/PostGISCreateTable.cxx
@@ -26,7 +26,7 @@
// must be included.
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
// Software Guide : BeginCodeSnippet
diff --git a/Examples/IO/DEMToImageGenerator.cxx b/Examples/IO/DEMToImageGenerator.cxx
index 728ac7c596..ad33f8abe1 100644
--- a/Examples/IO/DEMToImageGenerator.cxx
+++ b/Examples/IO/DEMToImageGenerator.cxx
@@ -45,7 +45,7 @@
#include "itkRescaleIntensityImageFilter.h"
#include "itkThresholdImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileWriter.h"
#include "otbImage.h"
diff --git a/Examples/IO/MetadataExample.cxx b/Examples/IO/MetadataExample.cxx
index ab19b814b4..741c1fa733 100644
--- a/Examples/IO/MetadataExample.cxx
+++ b/Examples/IO/MetadataExample.cxx
@@ -35,7 +35,7 @@
//
// SoftwareGuide: EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <fstream>
#include <string>
diff --git a/Examples/Learning/SOMExample.cxx b/Examples/Learning/SOMExample.cxx
index 65baa138cf..d484cab9b7 100644
--- a/Examples/Learning/SOMExample.cxx
+++ b/Examples/Learning/SOMExample.cxx
@@ -50,7 +50,7 @@
#include "otbSOMActivationBuilder.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "itkVariableLengthVector.h"
diff --git a/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx b/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx
index 9eda487372..f69af05ea8 100644
--- a/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx
+++ b/Examples/Learning/SVMGenericKernelImageModelEstimatorExample.cxx
@@ -29,7 +29,7 @@
//
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx b/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx
index 964022c5ed..cd2c182e5a 100644
--- a/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx
+++ b/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx
@@ -43,7 +43,7 @@
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Examples/Learning/SVMImageModelEstimatorExample.cxx b/Examples/Learning/SVMImageModelEstimatorExample.cxx
index a5ec654c9f..e660da22c2 100644
--- a/Examples/Learning/SVMImageModelEstimatorExample.cxx
+++ b/Examples/Learning/SVMImageModelEstimatorExample.cxx
@@ -42,7 +42,7 @@
//
// Software Guide : EndLatex
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Examples/Learning/SVMPointSetClassificationExample.cxx b/Examples/Learning/SVMPointSetClassificationExample.cxx
index 6157807f27..7e70efdf6b 100644
--- a/Examples/Learning/SVMPointSetClassificationExample.cxx
+++ b/Examples/Learning/SVMPointSetClassificationExample.cxx
@@ -22,7 +22,7 @@
// OUTPUTS:
// Software Guide : EndCommandLineArgs
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include <iostream>
#include <cstdlib>
diff --git a/Examples/Learning/SVMPointSetExample.cxx b/Examples/Learning/SVMPointSetExample.cxx
index 1b6fb43d50..50723ad0b7 100644
--- a/Examples/Learning/SVMPointSetExample.cxx
+++ b/Examples/Learning/SVMPointSetExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include <iostream>
#include <cstdlib>
diff --git a/Examples/Learning/SVMPointSetModelEstimatorExample.cxx b/Examples/Learning/SVMPointSetModelEstimatorExample.cxx
index 937a337157..86cdaa2afb 100644
--- a/Examples/Learning/SVMPointSetModelEstimatorExample.cxx
+++ b/Examples/Learning/SVMPointSetModelEstimatorExample.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include <iostream>
#include <cstdlib>
diff --git a/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx b/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx
index de09e992a8..6028d3e46a 100644
--- a/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx
@@ -52,7 +52,7 @@
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int main(int argc, char * argv[])
{
diff --git a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
index 17e3b5e498..5bdcf75398 100644
--- a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
@@ -71,7 +71,7 @@
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int main(int argc, char * argv[])
{
diff --git a/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx
index 81937081bc..2d012c46fb 100644
--- a/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx
@@ -41,7 +41,7 @@
#include "otbMorphologicalPyramidSegmenter.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx b/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx
index 152526c5f8..74846fe225 100644
--- a/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
// Software Guide : BeginCommandLineArgs
// INPUTS: {suburb2.jpeg}
diff --git a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index edd0e4cb16..067be2a05d 100644
--- a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -83,7 +83,7 @@
#include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
index 65f5f6096a..57e8d175e4 100644
--- a/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -68,7 +68,7 @@
#include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx
index 0412d9b530..aaddaafc2b 100644
--- a/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx
@@ -64,7 +64,7 @@
#include "otbRAndNIRIndexImageFilter.h"
// Software Guide : EndCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Examples/Tutorials/BasicApplication/otbBasicApplication.cxx b/Examples/Tutorials/BasicApplication/otbBasicApplication.cxx
index fdc5f341dd..815d48774c 100644
--- a/Examples/Tutorials/BasicApplication/otbBasicApplication.cxx
+++ b/Examples/Tutorials/BasicApplication/otbBasicApplication.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBasicApplicationController.h"
#include "otbBasicApplicationView.h"
#include "otbImageFileReader.h"
diff --git a/Examples/Tutorials/SmarterFilteringPipeline.cxx b/Examples/Tutorials/SmarterFilteringPipeline.cxx
index 0e369f3abf..058adbbc8a 100644
--- a/Examples/Tutorials/SmarterFilteringPipeline.cxx
+++ b/Examples/Tutorials/SmarterFilteringPipeline.cxx
@@ -55,7 +55,7 @@
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
// Software Guide : EndCodeSnippet
diff --git a/Examples/Visualization/VisuExample1.cxx b/Examples/Visualization/VisuExample1.cxx
index a8d0f9af3c..5f2fd8f240 100644
--- a/Examples/Visualization/VisuExample1.cxx
+++ b/Examples/Visualization/VisuExample1.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
#include <stdlib.h>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
index b2e12c6562..9d594cee7a 100644
--- a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
+++ b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBCOInterpolateImageFunction.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx b/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx
index 32e514a3be..2556f01e98 100644
--- a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBSplineDecompositionImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx
index 98b8822434..0fdd4deab9 100644
--- a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBSplineDecompositionImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx
index 5497319b0d..d4dfdb5c60 100644
--- a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx
+++ b/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBSplineInterpolateImageFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx b/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx
index 6e14abdaaa..d527cc641a 100644
--- a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBSplineInterpolateImageFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbBandMathImageFilter.cxx b/Testing/Code/BasicFilters/otbBandMathImageFilter.cxx
index 8dafb04a81..f55847fc05 100644
--- a/Testing/Code/BasicFilters/otbBandMathImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbBandMathImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <complex> //only for the isnan() test line 148
diff --git a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.cxx b/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.cxx
index c6b570f07a..d0ccf586e2 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbBinaryImageMinimalBoundingRegionCalculator.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx b/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
index c4e7be7217..092e436627 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbBinaryImageMinimalBoundingRegionCalculator.h"
diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
index 0f3d5d0181..a8493abc04 100644
--- a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
@@ -18,7 +18,7 @@
#include "otbBoxAndWhiskerImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx b/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx
index 230eb09ac8..6c1ca30427 100644
--- a/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx b/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx
index f4372e96a1..3ec49a19b8 100644
--- a/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbChangeLabelImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbClosePathFunctor.cxx b/Testing/Code/BasicFilters/otbClosePathFunctor.cxx
index 81a56840fd..2b4289254e 100644
--- a/Testing/Code/BasicFilters/otbClosePathFunctor.cxx
+++ b/Testing/Code/BasicFilters/otbClosePathFunctor.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.cxx b/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.cxx
index 095b0e4045..20f2d2c514 100644
--- a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.cxx
+++ b/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbClosingOpeningMorphologicalFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx b/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx
index 477a507617..7987e91d4a 100644
--- a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbClosingOpeningMorphologicalFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx b/Testing/Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx
index f31cd06167..e29817b456 100644
--- a/Testing/Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx
+++ b/Testing/Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbComplexToVectorImageCastFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx b/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
index 57c164ee54..fea44e3492 100644
--- a/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
+++ b/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx
index f943d241c3..8c5d74504b 100644
--- a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx
+++ b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbContinuousMinimumMaximumImageCalculator.h"
diff --git a/Testing/Code/BasicFilters/otbFrostFilter.cxx b/Testing/Code/BasicFilters/otbFrostFilter.cxx
index aebd2f47d5..f3e1f60dc1 100644
--- a/Testing/Code/BasicFilters/otbFrostFilter.cxx
+++ b/Testing/Code/BasicFilters/otbFrostFilter.cxx
@@ -20,7 +20,7 @@
#include "otbImageFileReader.h"
#include "otbFrostImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileWriter.h"
#include "itkImage.h"
#include "itkRandomImageSource.h"
diff --git a/Testing/Code/BasicFilters/otbFrostFilterNew.cxx b/Testing/Code/BasicFilters/otbFrostFilterNew.cxx
index 6cdab25935..ee75af3228 100644
--- a/Testing/Code/BasicFilters/otbFrostFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbFrostFilterNew.cxx
@@ -20,7 +20,7 @@
#include "otbImageFileReader.h"
#include "otbFrostImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageFileWriter.h"
#include "otbImage.h"
#include "itkRandomImageSource.h"
diff --git a/Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx b/Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx
index 634b4a86a3..1018c44187 100644
--- a/Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbFunctionToImageFilter.h"
#include "itkVarianceImageFunction.h"
diff --git a/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx
index 67a4186be0..0dbda7c5d8 100644
--- a/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbFunctionToImageFilter.h"
#include "itkVarianceImageFunction.h"
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
index 8257baeceb..567e2e6492 100644
--- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbFunctionWithNeighborhoodToImageFilter.h"
#include "itkVarianceImageFunction.h"
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
index 354339991f..235a7903a0 100644
--- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkNeighborhood.h"
#include "otbImage.h"
//#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx b/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx
index d3d8bc7b8a..c77a2f2a09 100644
--- a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterTest.cxx b/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterTest.cxx
index 05ad6d1f11..7bac0dcd57 100644
--- a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterTest.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilter.cxx b/Testing/Code/BasicFilters/otbImageListToImageListApplyFilter.cxx
index f5e30d777a..fdee351980 100644
--- a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilter.cxx
+++ b/Testing/Code/BasicFilters/otbImageListToImageListApplyFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToImageListApplyFilter.h"
#include "otbImageList.h"
diff --git a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx b/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx
index 7216ff32ef..03da7fe3d3 100644
--- a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToImageListApplyFilter.h"
#include "otbImageList.h"
diff --git a/Testing/Code/BasicFilters/otbImageListToVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbImageListToVectorImageFilter.cxx
index 27a145acdf..a040832b5c 100644
--- a/Testing/Code/BasicFilters/otbImageListToVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbImageListToVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbImageListToVectorImageFilter2.cxx b/Testing/Code/BasicFilters/otbImageListToVectorImageFilter2.cxx
index 8003c68a75..f2894acdc5 100644
--- a/Testing/Code/BasicFilters/otbImageListToVectorImageFilter2.cxx
+++ b/Testing/Code/BasicFilters/otbImageListToVectorImageFilter2.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx
index 6079947e33..800a97ebbd 100644
--- a/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbImageListToVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbImaginaryImageToComplexImageFilterTest.cxx b/Testing/Code/BasicFilters/otbImaginaryImageToComplexImageFilterTest.cxx
index f6f82e8c2f..c6049d0b5b 100644
--- a/Testing/Code/BasicFilters/otbImaginaryImageToComplexImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbImaginaryImageToComplexImageFilterTest.cxx
@@ -18,7 +18,7 @@
#include "otbImaginaryImageToComplexImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilter.cxx b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilter.cxx
index 533d60f867..928985b339 100644
--- a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImportGeoInformationImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx
index d72766d382..d5aa47f4bb 100644
--- a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImportGeoInformationImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
index 7b6b7bf179..587893aa6c 100644
--- a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
+++ b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImportGeoInformationImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx b/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
index 82b76af817..9e347a0d2f 100644
--- a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/BasicFilters/otbLeeFilter.cxx b/Testing/Code/BasicFilters/otbLeeFilter.cxx
index 892900ebe5..e0fdcdf211 100644
--- a/Testing/Code/BasicFilters/otbLeeFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLeeFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx b/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
index 950396a810..bc8cc61127 100644
--- a/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
index 7d9ab99c8c..542a10cfac 100644
--- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx
index 934b13622f..ca7b619f8b 100644
--- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbStreamingMatrixTransposeMatrixImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx b/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
index 5c45186e7f..25ff21d170 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbStreamingImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
index 02d16b5fd0..6a1db944f0 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbMeanShiftImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx
index 98563dc3f1..b989a4aceb 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
#include "otbStreamingImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx
index 51c454ecc4..b43de34f8c 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
#include "otbMeanShiftVectorImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.cxx b/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.cxx
index 41687b98da..496b7f449d 100644
--- a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.cxx
+++ b/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbOpeningClosingMorphologicalFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx b/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx
index acd725acd8..7f664195d9 100644
--- a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbOpeningClosingMorphologicalFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/BasicFilters/otbPathLengthFunctor.cxx b/Testing/Code/BasicFilters/otbPathLengthFunctor.cxx
index 02739e5127..397bc9f154 100644
--- a/Testing/Code/BasicFilters/otbPathLengthFunctor.cxx
+++ b/Testing/Code/BasicFilters/otbPathLengthFunctor.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
index cc679219d1..e902f76f41 100644
--- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPerBandVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
index f97e3f357b..c470547418 100644
--- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPerBandVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
index c48c25a611..904e2ad32f 100644
--- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPerBandVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbPersistentVectorizationFilter.cxx b/Testing/Code/BasicFilters/otbPersistentVectorizationFilter.cxx
index 89b8b3ced5..899c6cd06e 100644
--- a/Testing/Code/BasicFilters/otbPersistentVectorizationFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPersistentVectorizationFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx b/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx
index 88fb2ee6ab..1410b14658 100644
--- a/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx b/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
index d4af5ea8e8..2a38a4ed14 100644
--- a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
+++ b/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilter.cxx b/Testing/Code/BasicFilters/otbPrintableImageFilter.cxx
index 94bedc9091..af62a61379 100644
--- a/Testing/Code/BasicFilters/otbPrintableImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPrintableImageFilter.cxx
@@ -19,7 +19,7 @@
#include "otbImageFileReader.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx
index 0549c55587..52788b83ca 100644
--- a/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbPrintableImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
index 506d4dd00b..f6bfafc24b 100644
--- a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
+++ b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbProlateInterpolateImageFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx
index 0b40f3bfdc..75cb0f17eb 100644
--- a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbProlateInterpolateImageFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbProlateValidationTest.cxx b/Testing/Code/BasicFilters/otbProlateValidationTest.cxx
index bec48dbf9a..154c4ee4b1 100644
--- a/Testing/Code/BasicFilters/otbProlateValidationTest.cxx
+++ b/Testing/Code/BasicFilters/otbProlateValidationTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbProlateInterpolateImageFunction.h"
#include "itkNearestNeighborInterpolateImageFunction.h"
diff --git a/Testing/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilterTest.cxx b/Testing/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
index 1531f03ad3..a7c4f4cb28 100644
--- a/Testing/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
@@ -18,7 +18,7 @@
#include "otbRealAndImaginaryImageToComplexImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbRealImageToComplexImageFilterTest.cxx b/Testing/Code/BasicFilters/otbRealImageToComplexImageFilterTest.cxx
index 658d3fcb2a..b1f9a3de57 100644
--- a/Testing/Code/BasicFilters/otbRealImageToComplexImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbRealImageToComplexImageFilterTest.cxx
@@ -18,7 +18,7 @@
#include "otbRealImageToComplexImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx
index c49d63e289..e69c74bc59 100644
--- a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbShiftScaleVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx b/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx
index 33e44198e9..86275cc5bf 100644
--- a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbShiftScaleVectorImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx b/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx
index 5b7383f6c9..89eaea34d7 100644
--- a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx
+++ b/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSpatialObjectToImageDrawingFilter.h"
#include "itkEllipseSpatialObject.h"
diff --git a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx b/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx
index 71c0373502..07872d850a 100644
--- a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSpatialObjectToImageDrawingFilter.h"
#include "itkGroupSpatialObject.h"
diff --git a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx b/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx
index 9a3e4bbac4..3aa685a2b9 100644
--- a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx b/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx
index 0f3f74b54a..f2c076bcf5 100644
--- a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbSpectralAngleDistanceImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx
index b1e359c2dc..cef4d0f14f 100644
--- a/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkShiftScaleImageFilter.h"
#include "otbStreamingCompareImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
index 161f1e5aaa..7acb27cc80 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbStreamingMinMaxImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx
index 822030ea02..579cb0b4f0 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingMinMaxImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
index 10a22a2007..dd71b229e4 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingMinMaxVectorImageFilter.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx
index fdb48345ee..009d2d57ca 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingMinMaxVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
index 399282fad0..9599448eb8 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingResampleImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
index 9878ad381a..ac8c1793ac 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingResampleImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
index af92b754c9..ec1b5051d9 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingResampleImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
index 445724580f..e17b1a76b7 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingStatisticsImageFilter.h"
#include "itkStatisticsImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx
index 94a1c450ce..358657cc5d 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingStatisticsImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
index ffe649be54..70c58d4140 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingStatisticsVectorImageFilter.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx
index 3e818149d1..2f3ea695d7 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingStatisticsVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
index 4bf3a8688b..d27507d910 100644
--- a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
index 8001c99ad2..a24d1c2686 100644
--- a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
index 7388ec4a9c..b215f9eeda 100644
--- a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
index 5da7b4ad17..4876971a80 100644
--- a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
#include "otbVectorImageTo3DScalarImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx b/Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx
index 4e31f75efe..e409bff6d2 100644
--- a/Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImageToImageListFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx
index 4e7daa8d9d..facfb494b0 100644
--- a/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImageToImageListFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilter.cxx b/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilter.cxx
index 04763d5042..59712a6668 100644
--- a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx
index 72742f2536..4c22e142d1 100644
--- a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbVectorImageToIntensityImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
index df5a28502e..ba519a825f 100644
--- a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorRescaleIntensityImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx
index 59937d1859..fcd5ced629 100644
--- a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorRescaleIntensityImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.cxx
index 82edccbbfa..66d0dd832a 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageBlackmanFunction.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
index 3b01bd7585..f166a0d9bb 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageBlackmanFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.cxx
index 2da4110854..43701715f6 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageCosineFunction.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
index c06d5456b9..f9b4f9ebc1 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageCosineFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
index 1ea979c0ae..296df08e52 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageFunctionBase.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.cxx
index abbac7f3fb..e57aadfb3a 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageGaussianFunction.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
index 75824a8b55..119170a1d4 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageGaussianFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.cxx
index 787fea71b9..cbf96bb275 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageHammingFunction.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
index c39c3ce14f..8b89683a5a 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageHammingFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.cxx
index 7103b9cba7..e6005f4e04 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageLanczosFunction.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
index e3b924221a..454ff9747b 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageLanczosFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.cxx
index 50a7339ac4..af6553102a 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageWelchFunction.h"
#include "itkConstantBoundaryCondition.h"
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
index 2fe6be521b..81ecea1a63 100644
--- a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWindowedSincInterpolateImageWelchFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx
index bb7747a730..0630081df8 100644
--- a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx
+++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx
index 43fa600f3b..5b59713f61 100644
--- a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx
+++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbKullbackLeiblerDistanceImageFilter.h"
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx
index 32fd426d63..625d2f7410 100644
--- a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx
+++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx
index 46c55477f9..71406cab6d 100644
--- a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx
+++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbKullbackLeiblerProfileImageFilter.h"
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
index 8e35d06e40..375336c66c 100644
--- a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
+++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbKullbackLeiblerSupervizedDistanceImageFilter.h"
diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx b/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
index 02dafa5257..f173570019 100644
--- a/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
+++ b/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx b/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
index 5c2ac7f026..7bb9ce5cb6 100644
--- a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
+++ b/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbConcatenateVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Testing/Code/Common/otbConfigurationTest.cxx
index 9ff7b054a8..770e96d911 100644
--- a/Testing/Code/Common/otbConfigurationTest.cxx
+++ b/Testing/Code/Common/otbConfigurationTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbI18n.h"
#include <fstream>
diff --git a/Testing/Code/Common/otbDataNodeTest.cxx b/Testing/Code/Common/otbDataNodeTest.cxx
index 217e536e75..8419b6b498 100644
--- a/Testing/Code/Common/otbDataNodeTest.cxx
+++ b/Testing/Code/Common/otbDataNodeTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include <cstdlib>
diff --git a/Testing/Code/Common/otbDrawLineSpatialObject.cxx b/Testing/Code/Common/otbDrawLineSpatialObject.cxx
index d280aebed7..9fbaeb39a3 100644
--- a/Testing/Code/Common/otbDrawLineSpatialObject.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObject.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include "itkLineSpatialObject.h"
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
index 0841169313..3bd508a27b 100644
--- a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
index 45404ad6ab..3da5013adf 100644
--- a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
index 6a28036f98..8735690114 100644
--- a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Common/otbDrawPathFilter.cxx b/Testing/Code/Common/otbDrawPathFilter.cxx
index a6e7c04977..ba97b33e99 100644
--- a/Testing/Code/Common/otbDrawPathFilter.cxx
+++ b/Testing/Code/Common/otbDrawPathFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDrawPathFilter.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbDrawPathFilterNew.cxx b/Testing/Code/Common/otbDrawPathFilterNew.cxx
index 9ed9504cf4..24a0189fef 100644
--- a/Testing/Code/Common/otbDrawPathFilterNew.cxx
+++ b/Testing/Code/Common/otbDrawPathFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDrawPathFilter.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbDrawPathListFilter.cxx b/Testing/Code/Common/otbDrawPathListFilter.cxx
index 92a64f490f..54b71ce536 100644
--- a/Testing/Code/Common/otbDrawPathListFilter.cxx
+++ b/Testing/Code/Common/otbDrawPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDrawPathListFilter.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbDrawPathListFilterNew.cxx b/Testing/Code/Common/otbDrawPathListFilterNew.cxx
index 4393373410..8ee4b53950 100644
--- a/Testing/Code/Common/otbDrawPathListFilterNew.cxx
+++ b/Testing/Code/Common/otbDrawPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDrawPathListFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbDrawPathListFilterWithValue.cxx b/Testing/Code/Common/otbDrawPathListFilterWithValue.cxx
index fded732758..dc16a4353e 100644
--- a/Testing/Code/Common/otbDrawPathListFilterWithValue.cxx
+++ b/Testing/Code/Common/otbDrawPathListFilterWithValue.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDrawPathListFilter.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbExtractROI.cxx b/Testing/Code/Common/otbExtractROI.cxx
index 08c8c4e468..f903e2bda8 100644
--- a/Testing/Code/Common/otbExtractROI.cxx
+++ b/Testing/Code/Common/otbExtractROI.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "itkImage.h"
diff --git a/Testing/Code/Common/otbExtractROI2.cxx b/Testing/Code/Common/otbExtractROI2.cxx
index 92adf195ba..99bbcec458 100644
--- a/Testing/Code/Common/otbExtractROI2.cxx
+++ b/Testing/Code/Common/otbExtractROI2.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbExtractROINew.cxx b/Testing/Code/Common/otbExtractROINew.cxx
index 7551640571..3337bfc7ba 100644
--- a/Testing/Code/Common/otbExtractROINew.cxx
+++ b/Testing/Code/Common/otbExtractROINew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "otbExtractROI.h"
diff --git a/Testing/Code/Common/otbExtractROI_RGB.cxx b/Testing/Code/Common/otbExtractROI_RGB.cxx
index 618aa6f4ff..c19e037e3e 100644
--- a/Testing/Code/Common/otbExtractROI_RGB.cxx
+++ b/Testing/Code/Common/otbExtractROI_RGB.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbGISTableNew.cxx b/Testing/Code/Common/otbGISTableNew.cxx
index f5f4c94088..31f815636c 100644
--- a/Testing/Code/Common/otbGISTableNew.cxx
+++ b/Testing/Code/Common/otbGISTableNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbGISTable.h"
diff --git a/Testing/Code/Common/otbGISTableSourceNew.cxx b/Testing/Code/Common/otbGISTableSourceNew.cxx
index e870fdfa06..9bf08d2f15 100644
--- a/Testing/Code/Common/otbGISTableSourceNew.cxx
+++ b/Testing/Code/Common/otbGISTableSourceNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbGISTableSource.h"
diff --git a/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx b/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx
index 96664c48e9..f341ab3ac0 100644
--- a/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx
+++ b/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbGISTable.h"
diff --git a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx b/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
index 61de3e66ec..8bdcc0b864 100644
--- a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
+++ b/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbGenericInterpolateImageFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageList.cxx b/Testing/Code/Common/otbImageList.cxx
index db019263ce..b5c3427615 100644
--- a/Testing/Code/Common/otbImageList.cxx
+++ b/Testing/Code/Common/otbImageList.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbImageListNew.cxx b/Testing/Code/Common/otbImageListNew.cxx
index 2475962eb2..a29075b2c3 100644
--- a/Testing/Code/Common/otbImageListNew.cxx
+++ b/Testing/Code/Common/otbImageListNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageList.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageListSourceNew.cxx b/Testing/Code/Common/otbImageListSourceNew.cxx
index 3b777db92b..6afffc7f04 100644
--- a/Testing/Code/Common/otbImageListSourceNew.cxx
+++ b/Testing/Code/Common/otbImageListSourceNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListSource.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageListToImageFilterNew.cxx b/Testing/Code/Common/otbImageListToImageFilterNew.cxx
index 8d8c21ceb1..bb8b684eba 100644
--- a/Testing/Code/Common/otbImageListToImageFilterNew.cxx
+++ b/Testing/Code/Common/otbImageListToImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageListToImageListFilterNew.cxx b/Testing/Code/Common/otbImageListToImageListFilterNew.cxx
index 5d23113778..04f1e64f86 100644
--- a/Testing/Code/Common/otbImageListToImageListFilterNew.cxx
+++ b/Testing/Code/Common/otbImageListToImageListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageListToImageListFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageToImageListFilterNew.cxx b/Testing/Code/Common/otbImageToImageListFilterNew.cxx
index 4cc9b8cd3f..53440a14be 100644
--- a/Testing/Code/Common/otbImageToImageListFilterNew.cxx
+++ b/Testing/Code/Common/otbImageToImageListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToImageListFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx b/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
index 8ccc92f43c..5e168bef97 100644
--- a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
+++ b/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Common/otbImageToPathFilterNew.cxx b/Testing/Code/Common/otbImageToPathFilterNew.cxx
index 7ba84f0ac5..f669c09f5d 100644
--- a/Testing/Code/Common/otbImageToPathFilterNew.cxx
+++ b/Testing/Code/Common/otbImageToPathFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "otbImageToPathFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbImageToVectorImageCastFilter.cxx b/Testing/Code/Common/otbImageToVectorImageCastFilter.cxx
index e7ebc5b7e0..3f7949492b 100644
--- a/Testing/Code/Common/otbImageToVectorImageCastFilter.cxx
+++ b/Testing/Code/Common/otbImageToVectorImageCastFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToVectorImageCastFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx b/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx
index 91d2fed623..101d529b38 100644
--- a/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx
+++ b/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToVectorImageCastFilter.h"
#include "otbVectorImage.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbLineSpatialObjectList.cxx b/Testing/Code/Common/otbLineSpatialObjectList.cxx
index 75fc86017d..2c4845cdf2 100644
--- a/Testing/Code/Common/otbLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbLineSpatialObjectList.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLineSpatialObjectList.h"
#include <list>
diff --git a/Testing/Code/Common/otbLineSpatialObjectNew.cxx b/Testing/Code/Common/otbLineSpatialObjectNew.cxx
index 979f4384a3..edbd27dc63 100644
--- a/Testing/Code/Common/otbLineSpatialObjectNew.cxx
+++ b/Testing/Code/Common/otbLineSpatialObjectNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLineSpatialObject.h"
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
index 71bacb9394..fe320eeefa 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
index bd0916e259..4729a56f07 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelExtractROI.h"
int otbMultiChannelExtractROINew(int argc, char * argv[])
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
index fb73f4cc78..a0366f2019 100644
--- a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
index 6811805067..bc4bdbcf35 100644
--- a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiToMonoChannelExtractROI.h"
int otbMultiToMonoChannelExtractROINew(int argc, char * argv[])
diff --git a/Testing/Code/Common/otbObjectList.cxx b/Testing/Code/Common/otbObjectList.cxx
index 80195bcb4b..c1c5cd424a 100644
--- a/Testing/Code/Common/otbObjectList.cxx
+++ b/Testing/Code/Common/otbObjectList.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbObjectList.h"
diff --git a/Testing/Code/Common/otbObjectList2.cxx b/Testing/Code/Common/otbObjectList2.cxx
index 781f0442bf..8b126c97f4 100644
--- a/Testing/Code/Common/otbObjectList2.cxx
+++ b/Testing/Code/Common/otbObjectList2.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbObjectList.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/Common/otbObjectListNew.cxx b/Testing/Code/Common/otbObjectListNew.cxx
index 333e972c72..f3c8797627 100644
--- a/Testing/Code/Common/otbObjectListNew.cxx
+++ b/Testing/Code/Common/otbObjectListNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbObjectList.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx b/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
index d2bec4ffbd..aea4ed2783 100644
--- a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
+++ b/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbObjectListToObjectListFilter.h"
#include "otbObjectList.h"
#include <complex>
diff --git a/Testing/Code/Common/otbParserTest.cxx b/Testing/Code/Common/otbParserTest.cxx
index 73e598efec..97ef704013 100644
--- a/Testing/Code/Common/otbParserTest.cxx
+++ b/Testing/Code/Common/otbParserTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include <cmath>
diff --git a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
index b2b7a1c4c0..dd65efc18f 100644
--- a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
+++ b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "otbOrientationPathFunction.h"
#include "otbPathListToHistogramGenerator.h"
diff --git a/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx b/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx
index 0dbf03cd38..3d502ee8c0 100644
--- a/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx
+++ b/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "otbOrientationPathFunction.h"
#include "otbPathListToHistogramGenerator.h"
diff --git a/Testing/Code/Common/otbPathListToPathListFilterNew.cxx b/Testing/Code/Common/otbPathListToPathListFilterNew.cxx
index a1016c5e48..a0e5a3a12b 100644
--- a/Testing/Code/Common/otbPathListToPathListFilterNew.cxx
+++ b/Testing/Code/Common/otbPathListToPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include "otbPathListToPathListFilter.h"
diff --git a/Testing/Code/Common/otbPointSetSourceTest.cxx b/Testing/Code/Common/otbPointSetSourceTest.cxx
index 37cb1885ce..92990eb7a4 100644
--- a/Testing/Code/Common/otbPointSetSourceTest.cxx
+++ b/Testing/Code/Common/otbPointSetSourceTest.cxx
@@ -20,7 +20,7 @@
#include "itkPointSet.h"
#include "otbPointSetSource.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbPointSetSourceTest(int argc, char* argv[])
{
diff --git a/Testing/Code/Common/otbPolyLineImageConstIterator.cxx b/Testing/Code/Common/otbPolyLineImageConstIterator.cxx
index 783bcd4bba..70e993e2cc 100644
--- a/Testing/Code/Common/otbPolyLineImageConstIterator.cxx
+++ b/Testing/Code/Common/otbPolyLineImageConstIterator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPolyLineImageIterator.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/Common/otbPolyLineImageIterator.cxx b/Testing/Code/Common/otbPolyLineImageIterator.cxx
index 956ee55289..124abb4845 100644
--- a/Testing/Code/Common/otbPolyLineImageIterator.cxx
+++ b/Testing/Code/Common/otbPolyLineImageIterator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPolyLineImageIterator.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx b/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx
index 453cae3494..8323afd97a 100644
--- a/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx
+++ b/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include "otbPolyLineParametricPathWithValue.h"
diff --git a/Testing/Code/Common/otbPolygon.cxx b/Testing/Code/Common/otbPolygon.cxx
index 3be3b049af..3a2648b59e 100644
--- a/Testing/Code/Common/otbPolygon.cxx
+++ b/Testing/Code/Common/otbPolygon.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
#include <cstdlib>
diff --git a/Testing/Code/Common/otbPolygonNew.cxx b/Testing/Code/Common/otbPolygonNew.cxx
index 2ab7553a8f..febff8ceb0 100644
--- a/Testing/Code/Common/otbPolygonNew.cxx
+++ b/Testing/Code/Common/otbPolygonNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include "otbPolygon.h"
diff --git a/Testing/Code/Common/otbPostGISConnectionImplementationConnectToDB.cxx b/Testing/Code/Common/otbPostGISConnectionImplementationConnectToDB.cxx
index 8e9c100e78..3923a8bcc7 100644
--- a/Testing/Code/Common/otbPostGISConnectionImplementationConnectToDB.cxx
+++ b/Testing/Code/Common/otbPostGISConnectionImplementationConnectToDB.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISConnectionImplementation.h"
diff --git a/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx b/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx
index 0bfcd7cfc7..50e3f976e7 100644
--- a/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx
+++ b/Testing/Code/Common/otbPostGISConnectionImplementationNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISConnectionImplementation.h"
diff --git a/Testing/Code/Common/otbPostGISConnectionImplementationPerformTransaction.cxx b/Testing/Code/Common/otbPostGISConnectionImplementationPerformTransaction.cxx
index 4e58e41c33..b1d82de078 100644
--- a/Testing/Code/Common/otbPostGISConnectionImplementationPerformTransaction.cxx
+++ b/Testing/Code/Common/otbPostGISConnectionImplementationPerformTransaction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISConnectionImplementation.h"
diff --git a/Testing/Code/Common/otbPostGISTableNew.cxx b/Testing/Code/Common/otbPostGISTableNew.cxx
index 0ac4f8832d..5a773d4b83 100644
--- a/Testing/Code/Common/otbPostGISTableNew.cxx
+++ b/Testing/Code/Common/otbPostGISTableNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISTable.h"
diff --git a/Testing/Code/Common/otbQuickLookImageGenerator.cxx b/Testing/Code/Common/otbQuickLookImageGenerator.cxx
index 0427fb4012..2ecb835ab3 100644
--- a/Testing/Code/Common/otbQuickLookImageGenerator.cxx
+++ b/Testing/Code/Common/otbQuickLookImageGenerator.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbQuickLookImageGenerator.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx b/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx
index 7dc980ae86..654bc652a6 100644
--- a/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx
+++ b/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbQuickLookImageGenerator.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Common/otbRGBAPixelConverter.cxx b/Testing/Code/Common/otbRGBAPixelConverter.cxx
index abaed2da39..73b8daba3c 100644
--- a/Testing/Code/Common/otbRGBAPixelConverter.cxx
+++ b/Testing/Code/Common/otbRGBAPixelConverter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include <cmath>
diff --git a/Testing/Code/Common/otbShiftScaleImageAdaptor.cxx b/Testing/Code/Common/otbShiftScaleImageAdaptor.cxx
index 4c1748b33f..be8da19d22 100644
--- a/Testing/Code/Common/otbShiftScaleImageAdaptor.cxx
+++ b/Testing/Code/Common/otbShiftScaleImageAdaptor.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx b/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx
index 05cd5db12b..7d45291c08 100644
--- a/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx
+++ b/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbShiftScaleImageAdaptor.h"
diff --git a/Testing/Code/Common/otbSpatialObjectSourceNew.cxx b/Testing/Code/Common/otbSpatialObjectSourceNew.cxx
index 3e62e0eac7..daf7ed35ad 100644
--- a/Testing/Code/Common/otbSpatialObjectSourceNew.cxx
+++ b/Testing/Code/Common/otbSpatialObjectSourceNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSpatialObjectSource.h"
#include "itkGroupSpatialObject.h"
diff --git a/Testing/Code/Common/otbStandardFilterWatcherNew.cxx b/Testing/Code/Common/otbStandardFilterWatcherNew.cxx
index b9480e78f2..ae09ea57d5 100644
--- a/Testing/Code/Common/otbStandardFilterWatcherNew.cxx
+++ b/Testing/Code/Common/otbStandardFilterWatcherNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbStandardWriterWatcher.cxx b/Testing/Code/Common/otbStandardWriterWatcher.cxx
index c486451329..e4f6cd84d1 100644
--- a/Testing/Code/Common/otbStandardWriterWatcher.cxx
+++ b/Testing/Code/Common/otbStandardWriterWatcher.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbSystemTest.cxx b/Testing/Code/Common/otbSystemTest.cxx
index c9ab20534f..98fec914dc 100644
--- a/Testing/Code/Common/otbSystemTest.cxx
+++ b/Testing/Code/Common/otbSystemTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <cstdlib>
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
index 9425fd90c3..4559bb825a 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
@@ -18,7 +18,7 @@
#include <iostream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
int otbTestCommandLineArgumentParser(int argc, char * argv[])
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
index 3e39d5b040..9b9eb5e2b5 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
@@ -18,7 +18,7 @@
#include <iostream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
// Test de sortie en erreur
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
index b360b218d4..8af0e62b15 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
@@ -18,7 +18,7 @@
#include <iostream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
int otbTestCommandLineArgumentParserList(int argc, char * argv[])
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
index 9bcd10cab3..8189639288 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
@@ -18,7 +18,7 @@
#include <iostream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
int otbTestCommandLineArgumentParserWithError(int argc, char * argv[])
diff --git a/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx b/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
index f102005f5f..7b28eb6cd9 100644
--- a/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
+++ b/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx
index a9c52d625a..566c1054ea 100644
--- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorNeighborhoodImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
index 6413495d14..40188449ed 100644
--- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorNeighborhoodImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
index 0d739b4140..a86325f4fc 100644
--- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
index a804e32400..0bdae26831 100644
--- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx b/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx
index 6869f7294d..56f77d43d7 100644
--- a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorWithIndexImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx
index b1fddb1106..14a6ce6aa6 100644
--- a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorWithIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Common/otbVariableLengthVectorConverter.cxx b/Testing/Code/Common/otbVariableLengthVectorConverter.cxx
index d3e9a32ce1..4cbb6f1006 100644
--- a/Testing/Code/Common/otbVariableLengthVectorConverter.cxx
+++ b/Testing/Code/Common/otbVariableLengthVectorConverter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include <cmath>
diff --git a/Testing/Code/Common/otbVectorData.cxx b/Testing/Code/Common/otbVectorData.cxx
index 7d76c92631..b125c5f77a 100644
--- a/Testing/Code/Common/otbVectorData.cxx
+++ b/Testing/Code/Common/otbVectorData.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include <fstream>
#include "otbVectorData.h"
diff --git a/Testing/Code/Common/otbVectorDataNew.cxx b/Testing/Code/Common/otbVectorDataNew.cxx
index a25195e789..cc9aae6d92 100644
--- a/Testing/Code/Common/otbVectorDataNew.cxx
+++ b/Testing/Code/Common/otbVectorDataNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/Common/otbVectorDataSourceNew.cxx b/Testing/Code/Common/otbVectorDataSourceNew.cxx
index 4b5c58af76..ad9b4f53d3 100644
--- a/Testing/Code/Common/otbVectorDataSourceNew.cxx
+++ b/Testing/Code/Common/otbVectorDataSourceNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataSource.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx b/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx
index 0fe7016b4d..52eccd74e2 100644
--- a/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx
+++ b/Testing/Code/Common/otbVectorDataToGISTableFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataToGISTableFilter.h"
#include "otbPostGISConnectionImplementation.h"
#include "otbGISTable.h"
diff --git a/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx b/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx
index 20aa4200e6..a8d417ec79 100644
--- a/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx
+++ b/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataToVectorDataFilter.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx b/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx
index b2227b9800..3f631d37ca 100644
--- a/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx
+++ b/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <cstdlib>
#include "otbVectorImageToASImageAdaptor.h"
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.cxx
index d25c72bd3a..1a954fa73c 100644
--- a/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbBSplinesInterpolateDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx
index f34a6f632d..7bfb55c749 100644
--- a/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbBSplinesInterpolateDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
index 0821e30f9b..9403d09383 100644
--- a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbBSplinesInterpolateTransformDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx
index 23adeee1ad..f9091f99f4 100644
--- a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbBSplinesInterpolateTransformDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.cxx
index 5fe8b75105..94700fd14d 100644
--- a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx
index c8d3688242..e6d6513a5d 100644
--- a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx
index 14fb7d474a..dfd577e522 100644
--- a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
index d57e9fa2f4..8300b04ba7 100644
--- a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.cxx
index fcdd8a6678..6da9657d6c 100644
--- a/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNearestPointDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx
index c12cf1f21f..d09cfdb579 100644
--- a/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbNearestPointDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNearestPointDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx
index 18aa6917e6..0a7a16f3fa 100644
--- a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNearestTransformDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx
index 7f3555f1f6..95ce0f5285 100644
--- a/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbNearestTransformDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbNearestTransformDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx
index b508317254..c6b8d43ee1 100644
--- a/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbPointSetToDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbPointSetToDeformationFieldGenerator.h"
diff --git a/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx
index 6972da9f92..0261ef82e6 100644
--- a/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx
+++ b/Testing/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include "otbVectorImage.h"
#include "otbPointSetWithTransformToDeformationFieldGenerator.h"
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
index 3b9d0855c9..4690934fe7 100644
--- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
@@ -19,7 +19,7 @@
#include "otbMacro.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
index 8a3aae6cdd..225f385526 100644
--- a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
index 21ba71ffbc..d36db9c7cf 100644
--- a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
index 3711fa93a6..5ed0c4d8c9 100644
--- a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include "itkLinearInterpolateImageFunction.h"
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
index 7948a7b894..dbbafa4ec5 100644
--- a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include "itkLinearInterpolateImageFunction.h"
diff --git a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
index ee569d96b2..d592d5e461 100644
--- a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBreakAngularPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilterNew.cxx
index 7eda74bf08..7313b69345 100644
--- a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbBreakAngularPathListFilter.h"
#include "itkPolyLineParametricPath.h"
#include <cstdlib>
diff --git a/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx b/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
index 50bef72a0e..007e140b78 100644
--- a/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx b/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
index fad69d5889..878780fffc 100644
--- a/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx b/Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx
index 4c9be0aade..89c29f70e1 100644
--- a/Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx b/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
index d78dc5f8be..542149e2dc 100644
--- a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
+++ b/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
@@ -20,7 +20,7 @@
#include <cstdlib>
#include "otbCompacityPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMath.h"
int otbCompacityPathCircle(int argc, char * argv[])
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx b/Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx
index 84513f074f..6d2597d602 100644
--- a/Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx
@@ -22,7 +22,7 @@
#include "otbCompacityPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbCompacityPathNew(int argc, char * argv[])
{
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx b/Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx
index 56c6b408cf..829eb33469 100644
--- a/Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx
+++ b/Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx
@@ -20,7 +20,7 @@
#include <cstdlib>
#include "otbCompacityPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMath.h"
int otbCompacityPathRectangle(int argc, char * argv[])
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx b/Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx
index fc4ba040ac..ea4ce63e5b 100644
--- a/Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx
+++ b/Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx
@@ -20,7 +20,7 @@
#include <cstdlib>
#include "otbCompacityPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMath.h"
int otbCompacityPathSquare(int argc, char * argv[])
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
index 2aa97cc795..c101959495 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
@@ -23,7 +23,7 @@
#include <fstream>
#include "otbImageFileReader.h"
#include "otbComplexMomentPathFunction.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
int otbComplexMomentPath(int argc, char * argv[])
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
index 28ca9b5c7c..a306b641bc 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
@@ -23,7 +23,7 @@
#include <fstream>
#include "otbImageFileReader.h"
#include "otbComplexMomentPathFunction.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
int otbComplexMomentPathFloat(int argc, char * argv[])
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
index 86b1668786..d2739a3405 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbComplexMomentPathFunction.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
index 075c54c098..444db225aa 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbDrawPath.cxx b/Testing/Code/FeatureExtraction/otbDrawPath.cxx
index 92c18f2149..c55ea53fae 100644
--- a/Testing/Code/FeatureExtraction/otbDrawPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbDrawPath.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
index 0ccb67cd7c..50abcb61bb 100644
--- a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
+++ b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx b/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
index fd99806889..ed473f4a37 100644
--- a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
+++ b/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx b/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
index ea0faaa03b..98903efb29 100644
--- a/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
index 6b82802b67..c3a702340f 100644
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbFillGapsFilter.h"
#include "otbLineSpatialObjectList.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
index 59cb1b529d..2cfba1ee32 100644
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbFillGapsFilter.h"
int otbFillGapsFilterNew(int argc, char * argv[])
diff --git a/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
index ce681721de..fcf226105a 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
index 35bc434e89..bd2769e658 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
@@ -23,7 +23,7 @@
#include <fstream>
#include "otbFlusserPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbFlusserPath(int argc, char * argv[])
{
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx b/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
index 32e5df9f69..9e79bbb8e4 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
@@ -20,7 +20,7 @@
#include "otbFlusserPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbFlusserPathNew(int argc, char * argv[])
{
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx b/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
index ac2c24eab7..92603c21c5 100644
--- a/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
+++ b/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
#include <iomanip>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbFourierMellinDescriptorsImageFunction.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
index a24e13f316..505c1141ed 100644
--- a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
+++ b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkHistogram.h"
#include "vnl/vnl_math.h"
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
index fe53fa2770..4400efbece 100644
--- a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h"
diff --git a/Testing/Code/FeatureExtraction/otbHarrisImage.cxx b/Testing/Code/FeatureExtraction/otbHarrisImage.cxx
index 68dc20e852..354986148e 100644
--- a/Testing/Code/FeatureExtraction/otbHarrisImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbHarrisImage.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
index fcec6f7682..203196b134 100644
--- a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
+++ b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.cxx b/Testing/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
index 91fbce77ff..aba67c48c1 100644
--- a/Testing/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
index 6c7fae5027..fa1feb20a6 100644
--- a/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbHuPath.cxx b/Testing/Code/FeatureExtraction/otbHuPath.cxx
index bc51f82f84..f2d25a2aa1 100644
--- a/Testing/Code/FeatureExtraction/otbHuPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPath.cxx
@@ -24,7 +24,7 @@
#include "otbHuPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbHuPath(int argc, char * argv[])
{
diff --git a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx b/Testing/Code/FeatureExtraction/otbHuPathNew.cxx
index 90318b62dd..bed423f00e 100644
--- a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPathNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbHuPathFunction.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx b/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
index 426e67a9a3..2db98e528b 100644
--- a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFittingPolygonListFilter.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx
index 5fdaa76ed6..7a1469a953 100644
--- a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFittingPolygonListFilter.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
index 882f06f2cc..ab0dd27a07 100644
--- a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "otbImageToEdgePathFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx
index 8ccc5beb0b..9e5cb948df 100644
--- a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "otbImageToEdgePathFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
index 859a0fd06b..e5638b9bc8 100644
--- a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToHessianDeterminantImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
index 77e206b46e..535ffe8fe9 100644
--- a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToHessianDeterminantImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
index 171ea699f2..5622c8d90e 100644
--- a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLikelihoodPathListFilter.h"
#include "otbPolyLineParametricPathWithValue.h"
diff --git a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx
index fce6c825be..66c41a4914 100644
--- a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLikelihoodPathListFilter.h"
#include "otbPolyLineParametricPathWithValue.h"
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
index 7b55b839b9..ff4326170c 100644
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
index 0565986f33..7420b1a94f 100644
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
index c851c8278c..260bd28995 100644
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx b/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
index f405235a44..e99e1979ff 100644
--- a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
index 687563add3..3a51daa34c 100644
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
index f7db87f21b..77fcef96dd 100644
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
index 33d72aa075..4ef148e523 100644
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
index c9d7abfa1f..e8a7f11c9b 100644
--- a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLinkPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx
index 463a37fcc5..6b0c088d1d 100644
--- a/Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLinkPathListFilter.h"
#include "itkPolyLineParametricPath.h"
#include <cstdlib>
diff --git a/Testing/Code/FeatureExtraction/otbLocalHough.cxx b/Testing/Code/FeatureExtraction/otbLocalHough.cxx
index c59dfdbf5a..6492cc8903 100644
--- a/Testing/Code/FeatureExtraction/otbLocalHough.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHough.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx b/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
index 5435fb69fe..a981b30e9f 100644
--- a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <list>
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx b/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
index b5a02b4b96..ef223286e0 100644
--- a/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbMaskedScalarImageToGreyLevelRunLengthMatrixGeneratorNew.cxx b/Testing/Code/FeatureExtraction/otbMaskedScalarImageToGreyLevelRunLengthMatrixGeneratorNew.cxx
index 3396330d4c..80e77fb26f 100644
--- a/Testing/Code/FeatureExtraction/otbMaskedScalarImageToGreyLevelRunLengthMatrixGeneratorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbMaskedScalarImageToGreyLevelRunLengthMatrixGeneratorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbModulusAndDirectionImageFiltersNew.cxx b/Testing/Code/FeatureExtraction/otbModulusAndDirectionImageFiltersNew.cxx
index a540653e3a..7e697ace40 100644
--- a/Testing/Code/FeatureExtraction/otbModulusAndDirectionImageFiltersNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbModulusAndDirectionImageFiltersNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx b/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
index 2f1b616b0a..4a24f47171 100644
--- a/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "otbMultiplyByScalarImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
index 0768cd2785..06febfc5de 100644
--- a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbNeighborhoodScalarProductFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilterNew.cxx b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilterNew.cxx
index 703d391c99..aed222fa64 100644
--- a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbNeighborhoodScalarProductFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx b/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx
index a1974b0915..e840305b32 100644
--- a/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbNonMaxRemovalByDirectionFilter.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilterNew.cxx b/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilterNew.cxx
index fbf950edc2..21c3ae3c94 100644
--- a/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbNonMaxRemovalByDirectionFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbOrientationPath.cxx b/Testing/Code/FeatureExtraction/otbOrientationPath.cxx
index 6b607ab5b6..5cf0e30168 100644
--- a/Testing/Code/FeatureExtraction/otbOrientationPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbOrientationPath.cxx
@@ -22,7 +22,7 @@
#include "otbMath.h"
#include "otbOrientationPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbOrientationPath(int argc, char * argv[])
{
diff --git a/Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx b/Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx
index ce0713ec80..32826ec433 100644
--- a/Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx
@@ -21,7 +21,7 @@
#include <cstdlib>
#include "otbOrientationPathFunction.h"
#include "itkPolyLineParametricPath.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
int otbOrientationPathNew(int argc, char * argv[])
{
diff --git a/Testing/Code/FeatureExtraction/otbParallelLinePathListFilter.cxx b/Testing/Code/FeatureExtraction/otbParallelLinePathListFilter.cxx
index 400eefc53d..8e87eed145 100644
--- a/Testing/Code/FeatureExtraction/otbParallelLinePathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbParallelLinePathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbParallelLinePathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbParallelLinePathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbParallelLinePathListFilterNew.cxx
index 81d873965a..49a796e5cc 100644
--- a/Testing/Code/FeatureExtraction/otbParallelLinePathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbParallelLinePathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbParallelLinePathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
index c912b0d100..d66392c03f 100644
--- a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
index 51f455ff7a..d1171a3de4 100644
--- a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.cxx
index d4b170964d..bc635ca35c 100644
--- a/Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbRealMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbRealMomentsImageFunction.cxx
index e84b613f95..6d658d9adb 100644
--- a/Testing/Code/FeatureExtraction/otbRealMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbRealMomentsImageFunction.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
index 5dddae3eef..d944e665c3 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRegionImageToRectangularPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
index 5c81850042..0ceb82c8ff 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRegionImageToRectangularPathListFilter.h"
#include "otbImage.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx b/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx
index e80603a256..37afb88cff 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRemoveIsolatedByDirectionFilter.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilterNew.cxx
index 6c64e6075f..5fa34d4d6f 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRemoveIsolatedByDirectionFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
index a852e5ac9b..b6ca9144bf 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRemoveTortuousPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx
index 2b4f56535e..4b46f8018a 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRemoveTortuousPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx b/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx
index 6c29ccdce7..2f6156a3bc 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRemoveWrongDirectionFilter.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx
index de21de3f6e..04ceb9f03f 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRemoveWrongDirectionFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx b/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
index 5e9667ec66..dcbb98829b 100644
--- a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
index 267fbed818..02f4f13c0a 100644
--- a/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPolyLineParametricPath.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx
index f9c0028812..3c5559540d 100644
--- a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSFSTexturesImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
index 572ba3a43e..0d910930db 100644
--- a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSFSTexturesImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.cxx
index 1c829748ba..ab0e835ac3 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToAdvancedTexturesFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilterNew.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilterNew.cxx
index b2181e6013..b3d05e27ac 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToAdvancedTexturesFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.cxx
index 5f7e813560..853747259c 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToHigherOrderTexturesFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilterNew.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilterNew.cxx
index a8fb71a0d6..2e05ba67e9 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToHigherOrderTexturesFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx
index 5ea1b57646..21c23046f6 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToPanTexTextureFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilterNew.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilterNew.cxx
index 6a5f06d575..8d88ffce24 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToPanTexTextureFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx
index 8334549e80..6dd28326b6 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToTexturesFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx b/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx
index 2c4b55b3cd..7770821645 100644
--- a/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbScalarImageToTexturesFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx
index 1cbc3300f3..aa8d289143 100644
--- a/Testing/Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSimplifyPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
index 351fbd2fbd..85b963dc80 100644
--- a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSimplifyPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx
index 4ecee18512..3cbb6265f1 100644
--- a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSimplifyPathListFilter.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx b/Testing/Code/FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx
index db18cf6bf0..be59cc0f51 100644
--- a/Testing/Code/FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSqrtSpectralAngleFunctor.h"
#include "itkUnaryFunctorImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx b/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx
index 3d9a3ecb37..11b8cbe00e 100644
--- a/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
index 02660dab9e..2bce253c09 100644
--- a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbFunctionWithNeighborhoodToImageFilter.h"
#include "otbTextureImageFunction.h"
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
index 31f93e776b..78d2b279a0 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbThresholdImageToPointSetFilter.h"
#include "itkPointSet.h"
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
index da9381cb67..4579de3c88 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
index 60cbe6879b..7dcaf017bd 100644
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
index 9d43f215e1..1b39dd6047 100644
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkImageFileWriter.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
index 53b2c6bf8f..29e755e8d2 100644
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx b/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx
index 998b019323..e38972c0ee 100644
--- a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx
index ab2a79334b..caee318d4a 100644
--- a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbUrbanAreaDetectionImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
index 8f0bc942b0..b9b92135d7 100644
--- a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorizationPathListFilter.h"
#include "otbImage.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
index f8db34b4a1..1e022d63de 100644
--- a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorizationPathListFilter.h"
#include "otbImage.h"
#include "itkPolyLineParametricPath.h"
diff --git a/Testing/Code/Fusion/otbBayesianFusionFilter.cxx b/Testing/Code/Fusion/otbBayesianFusionFilter.cxx
index d53294829c..ffc1e6a002 100644
--- a/Testing/Code/Fusion/otbBayesianFusionFilter.cxx
+++ b/Testing/Code/Fusion/otbBayesianFusionFilter.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbStreamingImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx b/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
index 1a2e5eb96d..c7bfdd53e0 100644
--- a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
+++ b/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Fusion/otbFusionImageBaseNew.cxx b/Testing/Code/Fusion/otbFusionImageBaseNew.cxx
index 382491c6cc..88c7d0e9d6 100644
--- a/Testing/Code/Fusion/otbFusionImageBaseNew.cxx
+++ b/Testing/Code/Fusion/otbFusionImageBaseNew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbFusionImageBase.h"
diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
index 56a6168450..3063d46cff 100644
--- a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
+++ b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbStreamingImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
index bda0e0865d..7fc47dbcbc 100644
--- a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
+++ b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorAccessors.cxx b/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorAccessors.cxx
index 8589cf09bb..c01bfb5c45 100644
--- a/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorAccessors.cxx
+++ b/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorAccessors.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISCreateTableTransactor.h"
diff --git a/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorCreate.cxx b/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorCreate.cxx
index 0e394f5dab..eb25affa31 100644
--- a/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorCreate.cxx
+++ b/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorCreate.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISCreateTableTransactor.h"
diff --git a/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorNew.cxx b/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorNew.cxx
index 704d12a51f..804103616a 100644
--- a/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorNew.cxx
+++ b/Testing/Code/GeospatialAnalysis/otbPostGISCreateTableTransactorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISCreateTableTransactor.h"
diff --git a/Testing/Code/GeospatialAnalysis/otbPostGISFromStringTransactorNew.cxx b/Testing/Code/GeospatialAnalysis/otbPostGISFromStringTransactorNew.cxx
index 40b5248a0c..9a0c301b52 100644
--- a/Testing/Code/GeospatialAnalysis/otbPostGISFromStringTransactorNew.cxx
+++ b/Testing/Code/GeospatialAnalysis/otbPostGISFromStringTransactorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbPostGISFromStringTransactor.h"
diff --git a/Testing/Code/Gui/otbFltkWriterWatcher.cxx b/Testing/Code/Gui/otbFltkWriterWatcher.cxx
index 93b9e70a9c..8935dcc073 100644
--- a/Testing/Code/Gui/otbFltkWriterWatcher.cxx
+++ b/Testing/Code/Gui/otbFltkWriterWatcher.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImage.h"
diff --git a/Testing/Code/IO/otbBSQImageIOTestCanRead.cxx b/Testing/Code/IO/otbBSQImageIOTestCanRead.cxx
index 5eb589758c..1e43dc232a 100644
--- a/Testing/Code/IO/otbBSQImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbBSQImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbBSQImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbBSQImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx b/Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx
index 2c1db41c29..67f44696e9 100644
--- a/Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx
@@ -19,7 +19,7 @@
#include "otbBSQImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbBSQImageIOTestCanWrite(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbCompareWritingComplexImage.cxx b/Testing/Code/IO/otbCompareWritingComplexImage.cxx
index 98354b59a3..4826943152 100644
--- a/Testing/Code/IO/otbCompareWritingComplexImage.cxx
+++ b/Testing/Code/IO/otbCompareWritingComplexImage.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbComplexImageTests.cxx b/Testing/Code/IO/otbComplexImageTests.cxx
index 4f0cf5def2..3979a746f6 100644
--- a/Testing/Code/IO/otbComplexImageTests.cxx
+++ b/Testing/Code/IO/otbComplexImageTests.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <fstream>
#include <string>
diff --git a/Testing/Code/IO/otbDEMHandlerNew.cxx b/Testing/Code/IO/otbDEMHandlerNew.cxx
index dac40ebeb2..5e467551c4 100644
--- a/Testing/Code/IO/otbDEMHandlerNew.cxx
+++ b/Testing/Code/IO/otbDEMHandlerNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDEMHandler.h"
#include "otbImage.h"
diff --git a/Testing/Code/IO/otbDEMHandlerTest.cxx b/Testing/Code/IO/otbDEMHandlerTest.cxx
index 06e80cff5b..387d13346b 100644
--- a/Testing/Code/IO/otbDEMHandlerTest.cxx
+++ b/Testing/Code/IO/otbDEMHandlerTest.cxx
@@ -15,9 +15,9 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDEMHandler.h"
#include "otbImage.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx b/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
index 82d2e45290..b80152276b 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbStreamingImageFileWriter.h"
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx b/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
index 6a3b60631e..093f76d303 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDEMToImageGenerator.h"
#include "otbImage.h"
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx b/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
index 7c24d03e1b..7d844b28e1 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDEMToImageGenerator.h"
#include "otbStreamingImageFileWriter.h"
diff --git a/Testing/Code/IO/otbDefaultImageMetadataInterface.cxx b/Testing/Code/IO/otbDefaultImageMetadataInterface.cxx
index 3ec3eaa353..a289bfaad5 100644
--- a/Testing/Code/IO/otbDefaultImageMetadataInterface.cxx
+++ b/Testing/Code/IO/otbDefaultImageMetadataInterface.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDefaultImageMetadataInterface.h"
int otbDefaultImageMetadataInterface(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx b/Testing/Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx
index e62a23fdd6..36e5b3a8e8 100644
--- a/Testing/Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx
+++ b/Testing/Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDefaultImageMetadataInterfaceFactory.h"
diff --git a/Testing/Code/IO/otbDoubleImageIOTest.cxx b/Testing/Code/IO/otbDoubleImageIOTest.cxx
index fe897168f3..bd1cebabcb 100644
--- a/Testing/Code/IO/otbDoubleImageIOTest.cxx
+++ b/Testing/Code/IO/otbDoubleImageIOTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbFloatImageIOTest.cxx b/Testing/Code/IO/otbFloatImageIOTest.cxx
index b688bcbe38..6762636d24 100644
--- a/Testing/Code/IO/otbFloatImageIOTest.cxx
+++ b/Testing/Code/IO/otbFloatImageIOTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx
index 466607ba7e..e99041d90f 100644
--- a/Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx b/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
index 9f3f3a0470..a95ab10cc2 100644
--- a/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbGDALImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbGDALImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx b/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
index bba34d5b0e..9dce7bd7d7 100644
--- a/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
@@ -19,7 +19,7 @@
#include "otbGDALImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbGDALImageIOTestCanWrite(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx
index 3e1348b9c6..d20a7166fd 100644
--- a/Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/IO/otbImageFileReaderONERA.cxx b/Testing/Code/IO/otbImageFileReaderONERA.cxx
index 273e0453cf..38249b2939 100644
--- a/Testing/Code/IO/otbImageFileReaderONERA.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERA.cxx
@@ -19,7 +19,7 @@
#include "otbVectorImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx b/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
index 88c5a9fd45..de0a4c995e 100644
--- a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "itkComplexToRealImageFilter.h"
#include "itkComplexToImaginaryImageFilter.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADChar.cxx b/Testing/Code/IO/otbImageFileReaderRADChar.cxx
index dd9e2ecf43..3fc27dd8b5 100644
--- a/Testing/Code/IO/otbImageFileReaderRADChar.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADChar.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
index be263a4c0a..af00c91d7c 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
index 02af559d01..8f0a1adf58 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
index 9992768f52..27520b9d7a 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
index e6d090798c..b43d6847a7 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADFloat.cxx b/Testing/Code/IO/otbImageFileReaderRADFloat.cxx
index f320b639ab..2d70cf8a1b 100644
--- a/Testing/Code/IO/otbImageFileReaderRADFloat.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADFloat.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADInt.cxx b/Testing/Code/IO/otbImageFileReaderRADInt.cxx
index 57e40cc9d1..9c65dcbe8d 100644
--- a/Testing/Code/IO/otbImageFileReaderRADInt.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADInt.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRGBTest.cxx b/Testing/Code/IO/otbImageFileReaderRGBTest.cxx
index e08dae16e6..dcc0244273 100644
--- a/Testing/Code/IO/otbImageFileReaderRGBTest.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRGBTest.cxx
@@ -22,7 +22,7 @@
#include "otbImageFileReader.h"
#include "otbImage.h"
#include "itkRGBPixel.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbImageFileReaderRGBTest(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbImageFileReaderServerName.cxx b/Testing/Code/IO/otbImageFileReaderServerName.cxx
index f41f5d57a7..4ee3f004cd 100644
--- a/Testing/Code/IO/otbImageFileReaderServerName.cxx
+++ b/Testing/Code/IO/otbImageFileReaderServerName.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderTest.cxx b/Testing/Code/IO/otbImageFileReaderTest.cxx
index 87c9c46321..5713e4ac41 100644
--- a/Testing/Code/IO/otbImageFileReaderTest.cxx
+++ b/Testing/Code/IO/otbImageFileReaderTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderTestFloat.cxx b/Testing/Code/IO/otbImageFileReaderTestFloat.cxx
index e230db7d43..4c839788e0 100644
--- a/Testing/Code/IO/otbImageFileReaderTestFloat.cxx
+++ b/Testing/Code/IO/otbImageFileReaderTestFloat.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx b/Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx
index 441522bc19..ae2a6fc57f 100644
--- a/Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx
+++ b/Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx
@@ -20,7 +20,7 @@
#include "otbImageFileReader.h"
#include "otbVectorImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbConfigurationFile.h"
#include <cctype> // for toupper
diff --git a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
index edce6831b7..6c33ff7b3e 100644
--- a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
+++ b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
@@ -20,7 +20,7 @@
#include "otbImage.h"
#include "otbVectorImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
index 61e35175a3..2c3b30d6dd 100644
--- a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbImageFileWriterRGBTest.cxx b/Testing/Code/IO/otbImageFileWriterRGBTest.cxx
index 9ddb9e5377..79117301d5 100644
--- a/Testing/Code/IO/otbImageFileWriterRGBTest.cxx
+++ b/Testing/Code/IO/otbImageFileWriterRGBTest.cxx
@@ -20,7 +20,7 @@
#include "itkImage.h"
#include "itkRGBPixel.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx b/Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx
index 98dfbee871..b4b5309c9d 100644
--- a/Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx
@@ -20,7 +20,7 @@
#include <iostream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileWriterTest.cxx b/Testing/Code/IO/otbImageFileWriterTest.cxx
index 85af9333d4..3a6807b34f 100644
--- a/Testing/Code/IO/otbImageFileWriterTest.cxx
+++ b/Testing/Code/IO/otbImageFileWriterTest.cxx
@@ -19,7 +19,7 @@
#include "itkImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx b/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx
index f2c9b17663..bb8c6bc53f 100644
--- a/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx
+++ b/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx
@@ -25,7 +25,7 @@
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageRegionIterator.h"
diff --git a/Testing/Code/IO/otbImageIOFactoryNew.cxx b/Testing/Code/IO/otbImageIOFactoryNew.cxx
index 3339ad487d..3b59e217c6 100644
--- a/Testing/Code/IO/otbImageIOFactoryNew.cxx
+++ b/Testing/Code/IO/otbImageIOFactoryNew.cxx
@@ -19,7 +19,7 @@
#include "otbImageIOFactory.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbImageIOFactoryNew(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbImageMetadataFileWriterTest.cxx b/Testing/Code/IO/otbImageMetadataFileWriterTest.cxx
index 9e65238c98..421f3fbdea 100644
--- a/Testing/Code/IO/otbImageMetadataFileWriterTest.cxx
+++ b/Testing/Code/IO/otbImageMetadataFileWriterTest.cxx
@@ -19,7 +19,7 @@
#include "otbVectorImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx b/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
index c11ab1727e..4b4c0e1b2b 100644
--- a/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
+++ b/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
#include <iostream>
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx b/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
index 97290cc4cb..5d2a6d66fa 100644
--- a/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
+++ b/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
#include <iostream>
diff --git a/Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx b/Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx
index d2c8c06a4d..b1256d0471 100644
--- a/Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx
+++ b/Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx
@@ -19,7 +19,7 @@
#include "otbVectorImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx b/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx
index 6cd25e7989..932c3a3027 100644
--- a/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx
+++ b/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx
@@ -26,7 +26,7 @@
#include "otbImageFileWriter.h"
#include "otbStreamingImageFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageRegionIterator.h"
diff --git a/Testing/Code/IO/otbImageTest.cxx b/Testing/Code/IO/otbImageTest.cxx
index 96414b6f91..10382eac28 100644
--- a/Testing/Code/IO/otbImageTest.cxx
+++ b/Testing/Code/IO/otbImageTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <fstream>
#include <string>
diff --git a/Testing/Code/IO/otbIntImageIOTest.cxx b/Testing/Code/IO/otbIntImageIOTest.cxx
index 9c4847ede8..0a3e58d460 100644
--- a/Testing/Code/IO/otbIntImageIOTest.cxx
+++ b/Testing/Code/IO/otbIntImageIOTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx b/Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx
index 5e6ceabde1..a6cb703709 100644
--- a/Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbJPEG2000ImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbJPEG2000ImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx b/Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx
index 9c3b82dcae..7034e2e20a 100644
--- a/Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx
@@ -19,7 +19,7 @@
#include "otbJPEG2000ImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbJPEG2000ImageIOTestCanWrite(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbLUMImageIOTestCanRead.cxx b/Testing/Code/IO/otbLUMImageIOTestCanRead.cxx
index 5aaa32d28c..7c0848fd7c 100644
--- a/Testing/Code/IO/otbLUMImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbLUMImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbLUMImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbLUMImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx b/Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx
index a5c244642f..4bf10d061f 100644
--- a/Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx
@@ -19,7 +19,7 @@
#include "otbLUMImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbLUMImageIOTestCanWrite(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx b/Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx
index 69ec564c48..5189cb9b8a 100644
--- a/Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbMSTARImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbMSTARImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbMWImageIOTestCanRead.cxx b/Testing/Code/IO/otbMWImageIOTestCanRead.cxx
index d574c13c7c..7f7933fb23 100644
--- a/Testing/Code/IO/otbMWImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbMWImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbMWImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbMWImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbMWImageIOTestCanWrite.cxx b/Testing/Code/IO/otbMWImageIOTestCanWrite.cxx
index cf8d3f95c7..e76f3847a3 100644
--- a/Testing/Code/IO/otbMWImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbMWImageIOTestCanWrite.cxx
@@ -19,7 +19,7 @@
#include "otbMWImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbMWImageIOTestCanWrite(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbMultiDatasetReadingInfo.cxx b/Testing/Code/IO/otbMultiDatasetReadingInfo.cxx
index 6aab90ebfb..52d0841cb7 100644
--- a/Testing/Code/IO/otbMultiDatasetReadingInfo.cxx
+++ b/Testing/Code/IO/otbMultiDatasetReadingInfo.cxx
@@ -19,7 +19,7 @@
#include <fstream>
#include <string>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itksys/SystemTools.hxx"
#include "otbGDALImageIO.h"
diff --git a/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx b/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
index 2032c1340f..36e0bdb281 100644
--- a/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbONERAImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbONERAImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx b/Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx
index a0615e4ab8..c1c6e516a5 100644
--- a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx
+++ b/Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbOpticalDefaultImageMetadataInterface.h"
int otbOpticalDefaultImageMetadataInterface(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx b/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
index 42be11a485..819e838006 100644
--- a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
+++ b/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbOpticalDefaultImageMetadataInterfaceFactory.h"
diff --git a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx
index 48b0918be8..ed2375a05d 100644
--- a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbOpticalDefaultImageMetadataInterface.h"
diff --git a/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx b/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
index 39efb42e1b..45f5146d8f 100644
--- a/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
+++ b/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
#include <iostream>
diff --git a/Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx b/Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx
index 510b4be5dc..707b3d91b7 100644
--- a/Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx
+++ b/Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx
@@ -21,7 +21,7 @@
#include "otbImageFileReader.h"
#include "otbVectorImage.h"
#include "itkRGBPixel.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbPNGIndexedNbBandsTest(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx b/Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx
index d35d56fd5c..2f10ee95a8 100644
--- a/Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx
+++ b/Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "itkDiscreteGaussianImageFilter.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx b/Testing/Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx
index c0df352c8c..f2c1959ac5 100644
--- a/Testing/Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx
+++ b/Testing/Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "itkRescaleIntensityImageFilter.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx
index 5e616f3cfb..4d58d8632f 100644
--- a/Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/IO/otbRADImageIOTestCanRead.cxx b/Testing/Code/IO/otbRADImageIOTestCanRead.cxx
index a2087ee572..e25d901c49 100644
--- a/Testing/Code/IO/otbRADImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbRADImageIOTestCanRead.cxx
@@ -19,7 +19,7 @@
#include "otbRADImageIO.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbRADImageIOTestCanRead(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx b/Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx
index 3078138ba8..d162486530 100644
--- a/Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx
+++ b/Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarDefaultImageMetadataInterface.h"
int otbSarDefaultImageMetadataInterface(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx b/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
index ab4fc18c44..b746cd6562 100644
--- a/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
+++ b/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarDefaultImageMetadataInterfaceFactory.h"
diff --git a/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx
index ae7ca16e5b..7f46e87e7c 100644
--- a/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarDefaultImageMetadataInterface.h"
diff --git a/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx b/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
index 1d7827bcd0..71c34aa5b6 100644
--- a/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
+++ b/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
#include <iostream>
diff --git a/Testing/Code/IO/otbShortImageIOTest.cxx b/Testing/Code/IO/otbShortImageIOTest.cxx
index 2a9c8bdb74..2dd8515563 100644
--- a/Testing/Code/IO/otbShortImageIOTest.cxx
+++ b/Testing/Code/IO/otbShortImageIOTest.cxx
@@ -19,7 +19,7 @@
#include "otbImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbShortRGBImageIOTest.cxx b/Testing/Code/IO/otbShortRGBImageIOTest.cxx
index 67232cd98d..e93620a5ec 100644
--- a/Testing/Code/IO/otbShortRGBImageIOTest.cxx
+++ b/Testing/Code/IO/otbShortRGBImageIOTest.cxx
@@ -22,7 +22,7 @@
#include "otbImageFileReader.h"
#include "otbImage.h"
#include "itkRGBPixel.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
int otbShortRGBImageIOTest(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx
index 478e44fec5..7fdd7961df 100644
--- a/Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx b/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
index 823c6c44c0..f00dfd66b9 100644
--- a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "itkImage.h"
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx b/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
index f07dc2ca7d..1e23c5f141 100644
--- a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx b/Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx
index f478e37e8d..4d1f0e9564 100644
--- a/Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "itkImage.h"
diff --git a/Testing/Code/IO/otbStreamingImageFilterTest.cxx b/Testing/Code/IO/otbStreamingImageFilterTest.cxx
index bb39a22e65..f7e0b6c3b9 100644
--- a/Testing/Code/IO/otbStreamingImageFilterTest.cxx
+++ b/Testing/Code/IO/otbStreamingImageFilterTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "itkImage.h"
diff --git a/Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx b/Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx
index b3d08c62d1..0b56bfa8e7 100644
--- a/Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx
+++ b/Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx b/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx
index effb31c3b5..1de586d260 100644
--- a/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx
+++ b/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx
index b911d1861a..80aef48087 100644
--- a/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
#include <iostream>
diff --git a/Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx b/Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx
index 33eab819f3..452f888958 100644
--- a/Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx
+++ b/Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/IO/otbVectorDataFileReaderWriter.cxx b/Testing/Code/IO/otbVectorDataFileReaderWriter.cxx
index f7b55300bd..e8c9256eff 100644
--- a/Testing/Code/IO/otbVectorDataFileReaderWriter.cxx
+++ b/Testing/Code/IO/otbVectorDataFileReaderWriter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/IO/otbVectorDataFileWriter.cxx b/Testing/Code/IO/otbVectorDataFileWriter.cxx
index 075d429c0f..fabe7c6606 100644
--- a/Testing/Code/IO/otbVectorDataFileWriter.cxx
+++ b/Testing/Code/IO/otbVectorDataFileWriter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx b/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx
index 8b4642ef88..24744766eb 100644
--- a/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx
+++ b/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx b/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx
index f811e9cd38..b0c6426b94 100644
--- a/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx
+++ b/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx b/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
index 56b4ed613c..a9a08c26cd 100644
--- a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
+++ b/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
@@ -19,7 +19,7 @@
#include "otbVectorImage.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx b/Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx
index 452d575f35..c2ad4a9098 100644
--- a/Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx
+++ b/Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx
@@ -25,7 +25,7 @@
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageRegionIterator.h"
/***********
diff --git a/Testing/Code/IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx b/Testing/Code/IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx
index f2d6cc26ec..0a6771b264 100644
--- a/Testing/Code/IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx
+++ b/Testing/Code/IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx
@@ -25,7 +25,7 @@
#include "otbImageFileReader.h"
#include "otbStreamingImageFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageRegionIterator.h"
/***********
diff --git a/Testing/Code/IO/otbVectorImageTest.cxx b/Testing/Code/IO/otbVectorImageTest.cxx
index 3c485240ba..a2cc5b0ed0 100644
--- a/Testing/Code/IO/otbVectorImageTest.cxx
+++ b/Testing/Code/IO/otbVectorImageTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <fstream>
#include <string>
diff --git a/Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx
index 173e6f4b1b..a1cd5d9b2a 100644
--- a/Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx
+++ b/Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbDecisionTreeBuild.cxx b/Testing/Code/Learning/otbDecisionTreeBuild.cxx
index 78795cd798..48aca4c0a8 100644
--- a/Testing/Code/Learning/otbDecisionTreeBuild.cxx
+++ b/Testing/Code/Learning/otbDecisionTreeBuild.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDecisionTree.h"
enum WheatTypes { WinterWheat, SummerWheat };
diff --git a/Testing/Code/Learning/otbDecisionTreeNew.cxx b/Testing/Code/Learning/otbDecisionTreeNew.cxx
index 09977dbdef..468f548654 100644
--- a/Testing/Code/Learning/otbDecisionTreeNew.cxx
+++ b/Testing/Code/Learning/otbDecisionTreeNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDecisionTree.h"
enum WheatTypes { WinterWheat, SummerWheat };
diff --git a/Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx b/Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx
index 555dbcac1e..33b461bac4 100644
--- a/Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx
+++ b/Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDecisionTree.h"
enum WheatTypes { WinterWheat, SummerWheat };
diff --git a/Testing/Code/Learning/otbPeriodicSOM.cxx b/Testing/Code/Learning/otbPeriodicSOM.cxx
index c43115a3e8..bca072a2a6 100644
--- a/Testing/Code/Learning/otbPeriodicSOM.cxx
+++ b/Testing/Code/Learning/otbPeriodicSOM.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbSOMMap.h"
#include "otbPeriodicSOM.h"
diff --git a/Testing/Code/Learning/otbPeriodicSOMNew.cxx b/Testing/Code/Learning/otbPeriodicSOMNew.cxx
index 19e66c7dc7..534c0f1c7b 100644
--- a/Testing/Code/Learning/otbPeriodicSOMNew.cxx
+++ b/Testing/Code/Learning/otbPeriodicSOMNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSOMMap.h"
#include "otbPeriodicSOM.h"
#include "itkRGBPixel.h"
diff --git a/Testing/Code/Learning/otbSEMClassifierNew.cxx b/Testing/Code/Learning/otbSEMClassifierNew.cxx
index f36c4e1088..de47099548 100644
--- a/Testing/Code/Learning/otbSEMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSEMClassifierNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "itkListSample.h"
#include "itkSampleClassifier.h"
diff --git a/Testing/Code/Learning/otbSOM.cxx b/Testing/Code/Learning/otbSOM.cxx
index 12952e3117..d83033ca18 100644
--- a/Testing/Code/Learning/otbSOM.cxx
+++ b/Testing/Code/Learning/otbSOM.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbSOMMap.h"
#include "otbSOM.h"
diff --git a/Testing/Code/Learning/otbSOMActivationBuilder.cxx b/Testing/Code/Learning/otbSOMActivationBuilder.cxx
index 34bd32651b..fdf7caa7a5 100644
--- a/Testing/Code/Learning/otbSOMActivationBuilder.cxx
+++ b/Testing/Code/Learning/otbSOMActivationBuilder.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbSOMMap.h"
#include "otbSOMActivationBuilder.h"
diff --git a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx b/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
index 7070bd6cfd..b7d485a95d 100644
--- a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
+++ b/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSOMMap.h"
#include "otbSOM.h"
#include "otbSOMActivationBuilder.h"
diff --git a/Testing/Code/Learning/otbSOMMap.cxx b/Testing/Code/Learning/otbSOMMap.cxx
index 11dec3ec6f..c57876c3ca 100644
--- a/Testing/Code/Learning/otbSOMMap.cxx
+++ b/Testing/Code/Learning/otbSOMMap.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSOMMap.h"
#include "itkRGBPixel.h"
#include "itkEuclideanDistance.h"
diff --git a/Testing/Code/Learning/otbSOMMapNew.cxx b/Testing/Code/Learning/otbSOMMapNew.cxx
index 0018329fe5..893630fbd6 100644
--- a/Testing/Code/Learning/otbSOMMapNew.cxx
+++ b/Testing/Code/Learning/otbSOMMapNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSOMMap.h"
#include "itkRGBPixel.h"
#include "itkEuclideanDistance.h"
diff --git a/Testing/Code/Learning/otbSOMNew.cxx b/Testing/Code/Learning/otbSOMNew.cxx
index 1a9b7cd91b..483b034646 100644
--- a/Testing/Code/Learning/otbSOMNew.cxx
+++ b/Testing/Code/Learning/otbSOMNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSOMMap.h"
#include "otbSOM.h"
#include "itkRGBPixel.h"
diff --git a/Testing/Code/Learning/otbSOMWithMissingValue.cxx b/Testing/Code/Learning/otbSOMWithMissingValue.cxx
index 07ac541a9f..bea304ae48 100644
--- a/Testing/Code/Learning/otbSOMWithMissingValue.cxx
+++ b/Testing/Code/Learning/otbSOMWithMissingValue.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbSOMMap.h"
#include "itkRGBPixel.h"
diff --git a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx b/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
index 99e621491e..663d900d06 100644
--- a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
+++ b/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx
index 59b63199c7..5737b352a7 100644
--- a/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx
+++ b/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx
@@ -22,7 +22,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
index dc5b48d3f6..02188fa4f3 100644
--- a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
+++ b/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
index 20fe4936bf..6f564e0730 100644
--- a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
+++ b/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx
index 0b97f213ba..c780db0c58 100644
--- a/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx
+++ b/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx
index 24df306e21..2b7048b584 100644
--- a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx
+++ b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx
@@ -20,7 +20,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx
index db688c3253..3b567b8029 100644
--- a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx
+++ b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx
@@ -20,7 +20,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMModelAccessor.cxx b/Testing/Code/Learning/otbSVMModelAccessor.cxx
index 905edfaee6..978829248a 100644
--- a/Testing/Code/Learning/otbSVMModelAccessor.cxx
+++ b/Testing/Code/Learning/otbSVMModelAccessor.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
#include <fstream>
diff --git a/Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx b/Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx
index 6d19b4da5b..0bed81c8da 100644
--- a/Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx
+++ b/Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbSVMKernels.h"
#include "otbSVMModel.h"
diff --git a/Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx b/Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx
index 64a2837067..e572ed5271 100644
--- a/Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx
+++ b/Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbSVMKernels.h"
#include "otbSVMModel.h"
diff --git a/Testing/Code/Learning/otbSVMModelCopyTest.cxx b/Testing/Code/Learning/otbSVMModelCopyTest.cxx
index f930aad2fe..85d3459ef3 100644
--- a/Testing/Code/Learning/otbSVMModelCopyTest.cxx
+++ b/Testing/Code/Learning/otbSVMModelCopyTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx b/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx
index 3e9104d28f..9b8a7b61d9 100644
--- a/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx
+++ b/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx b/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
index acd99e5580..968cc102bf 100644
--- a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
+++ b/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMModelLoad.cxx b/Testing/Code/Learning/otbSVMModelLoad.cxx
index cbab6787cd..5c26bf6627 100644
--- a/Testing/Code/Learning/otbSVMModelLoad.cxx
+++ b/Testing/Code/Learning/otbSVMModelLoad.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMModelLoadSave.cxx b/Testing/Code/Learning/otbSVMModelLoadSave.cxx
index ac430cad3e..6aac187e6f 100644
--- a/Testing/Code/Learning/otbSVMModelLoadSave.cxx
+++ b/Testing/Code/Learning/otbSVMModelLoadSave.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMModelNew.cxx b/Testing/Code/Learning/otbSVMModelNew.cxx
index a344bc9fad..84964f3f50 100644
--- a/Testing/Code/Learning/otbSVMModelNew.cxx
+++ b/Testing/Code/Learning/otbSVMModelNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx b/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
index 79af9d95d5..a7c6715d88 100644
--- a/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
+++ b/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx b/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
index ca1dc5f011..25c20a8fc8 100644
--- a/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
+++ b/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkPointSet.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx b/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
index 6ecc1bbf04..cd5b3841a8 100644
--- a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
+++ b/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkListSample.h"
#include <iostream>
diff --git a/Testing/Code/Learning/otbSVMValidation.cxx b/Testing/Code/Learning/otbSVMValidation.cxx
index 3ca4661348..f02006a9e8 100644
--- a/Testing/Code/Learning/otbSVMValidation.cxx
+++ b/Testing/Code/Learning/otbSVMValidation.cxx
@@ -18,7 +18,7 @@
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkListSample.h"
#include <iostream>
diff --git a/Testing/Code/Markov/otbMRFSamplerMAPNew.cxx b/Testing/Code/Markov/otbMRFSamplerMAPNew.cxx
index 051d95618a..a723f701d5 100644
--- a/Testing/Code/Markov/otbMRFSamplerMAPNew.cxx
+++ b/Testing/Code/Markov/otbMRFSamplerMAPNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMRFSamplerMAP.h"
#include "otbImage.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
index 1f7a9c1208..c1c3d598fa 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
index ba11e468a6..83a09f472d 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidAnalysisFilter.h"
#include "otbOpeningClosingMorphologicalFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx
index a13a50270f..15d013c3e9 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidAnalysisFilter.h"
#include "otbOpeningClosingMorphologicalFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
index 77adc81885..d29555eb13 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidAnalysisFilter.h"
#include "otbMorphologicalPyramidMRToMSConverter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
index 6f335e8f9b..d3ddfa7527 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidMRToMSConverter.h"
#include "otbImage.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
index 63b64b7bb7..c063d7a608 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidResampler.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
index 0447b06330..78212f464a 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidResampler.h"
#include "otbImage.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
index a234d5c7af..21752ff77b 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidSegmentationFilter.h"
#include "otbOpeningClosingMorphologicalFilter.h"
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
index af92809739..af470af1ee 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidSegmentationFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
index eb481f2718..bc816ed015 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidSegmenter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
index cab207aac4..eda3b5c624 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidSegmenter.h"
#include "otbImage.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
index 8e8f74096f..ac92d22a04 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidAnalysisFilter.h"
#include "otbMorphologicalPyramidSynthesisFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
index f9a2ec5fc9..9de0ac04fb 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMorphologicalPyramidSynthesisFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/OBIA/otbLabelMapSourceNew.cxx b/Testing/Code/OBIA/otbLabelMapSourceNew.cxx
index 4f8be1e29b..cc99ac8a52 100644
--- a/Testing/Code/OBIA/otbLabelMapSourceNew.cxx
+++ b/Testing/Code/OBIA/otbLabelMapSourceNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLabelMapSource.h"
#include "itkLabelMap.h"
diff --git a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx b/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
index ffab1644eb..7a8b93f38b 100644
--- a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
+++ b/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkLabelMapToLabelImageFilter.h"
#include "itkTimeProbe.h"
diff --git a/Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx b/Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx
index 07170146d0..2df4226486 100644
--- a/Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx
+++ b/Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorDataToLabelMapFilter.h"
diff --git a/Testing/Code/Projections/otbCompositeTransform.cxx b/Testing/Code/Projections/otbCompositeTransform.cxx
index 8dc6bd253d..91c18e613f 100644
--- a/Testing/Code/Projections/otbCompositeTransform.cxx
+++ b/Testing/Code/Projections/otbCompositeTransform.cxx
@@ -20,7 +20,7 @@
#include <iostream>
#include <iomanip>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/Projections/otbCompositeTransformNew.cxx b/Testing/Code/Projections/otbCompositeTransformNew.cxx
index 68f46e80f0..a0be091e01 100644
--- a/Testing/Code/Projections/otbCompositeTransformNew.cxx
+++ b/Testing/Code/Projections/otbCompositeTransformNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Projections/otbCreateInverseForwardSensorModel.cxx b/Testing/Code/Projections/otbCreateInverseForwardSensorModel.cxx
index 82623aa9d3..68e44c57af 100644
--- a/Testing/Code/Projections/otbCreateInverseForwardSensorModel.cxx
+++ b/Testing/Code/Projections/otbCreateInverseForwardSensorModel.cxx
@@ -35,7 +35,7 @@
#include "otbImage.h"
#include "otbImageFileReader.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbInverseSensorModel.h"
#include "otbForwardSensorModel.h"
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
index 01b48fc97b..347f4220ea 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
@@ -37,7 +37,7 @@
#include "otbImageFileWriter.h"
#include "otbStreamingImageFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkExtractImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
#include "itkImageRegionIteratorWithIndex.h"
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
index 57107896e1..81a0eff628 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
@@ -37,7 +37,7 @@
#include "otbImageFileWriter.h"
#include "otbStreamingImageFileWriter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkExtractImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
#include "itkImageRegionIteratorWithIndex.h"
diff --git a/Testing/Code/Projections/otbGenericMapProjectionNew.cxx b/Testing/Code/Projections/otbGenericMapProjectionNew.cxx
index d3b72b7dcb..6e8ff4a91f 100644
--- a/Testing/Code/Projections/otbGenericMapProjectionNew.cxx
+++ b/Testing/Code/Projections/otbGenericMapProjectionNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Projections/otbGenericRSTransformNew.cxx b/Testing/Code/Projections/otbGenericRSTransformNew.cxx
index 62817a33d1..15ba4f1629 100644
--- a/Testing/Code/Projections/otbGenericRSTransformNew.cxx
+++ b/Testing/Code/Projections/otbGenericRSTransformNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Projections/otbMapProjectionsNew.cxx b/Testing/Code/Projections/otbMapProjectionsNew.cxx
index e5e0841c15..d8cd983846 100644
--- a/Testing/Code/Projections/otbMapProjectionsNew.cxx
+++ b/Testing/Code/Projections/otbMapProjectionsNew.cxx
@@ -20,7 +20,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include "otbMapProjections.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
index 88cc02f42e..e6d6a0517a 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
@@ -30,7 +30,7 @@
#include "otbInverseSensorModel.h"
#include "otbStreamingResampleImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkExtractImageFilter.h"
#include "itkResampleImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
diff --git a/Testing/Code/Projections/otbProjectionBaseNew.cxx b/Testing/Code/Projections/otbProjectionBaseNew.cxx
index b2943286f5..69f5cc7902 100644
--- a/Testing/Code/Projections/otbProjectionBaseNew.cxx
+++ b/Testing/Code/Projections/otbProjectionBaseNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Projections/otbRegionProjectionResampler.cxx b/Testing/Code/Projections/otbRegionProjectionResampler.cxx
index 6996e15e8b..97524a567a 100644
--- a/Testing/Code/Projections/otbRegionProjectionResampler.cxx
+++ b/Testing/Code/Projections/otbRegionProjectionResampler.cxx
@@ -36,7 +36,7 @@
#include "otbStreamingImageFileWriter.h"
#include "otbStreamingResampleImageFilter.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkExtractImageFilter.h"
#include "itkResampleImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
diff --git a/Testing/Code/Projections/otbSensorModelsNew.cxx b/Testing/Code/Projections/otbSensorModelsNew.cxx
index 4d3d82cc2f..8bf213306a 100644
--- a/Testing/Code/Projections/otbSensorModelsNew.cxx
+++ b/Testing/Code/Projections/otbSensorModelsNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImage.h"
#include <iostream>
diff --git a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
index caade52a3d..21e56ef26d 100644
--- a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
+++ b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbImage.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
index 2c5e113e30..02a6a1138c 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
#include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
index 5f4535fde2..1212ec6cae 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
#include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
index d2a2cb1dab..e24c0f957c 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
#include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
index ee2a6614b7..9c57d190bd 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
#include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
index 633e807e28..30c4a4250a 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
#include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx
index 51f54ab700..ce3276a433 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
diff --git a/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
index d5aa6b49ff..5e22b7e581 100644
--- a/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
index 733c8a6b14..bdf67d63c0 100644
--- a/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndGAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
index a14f36825d..7cf4a95fc7 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbAtmosphericCorrectionParameters.h"
#include <cstdlib>
diff --git a/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx b/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
index 2d006fe5fe..0c6aed485b 100644
--- a/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
@@ -19,7 +19,7 @@
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbAtmosphericRadiativeTerms.h"
#include <cstdlib>
diff --git a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
index 58dbd69325..f2855c7222 100644
--- a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
+++ b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDEMCaracteristicsExtractor.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
index f6cf45e5d2..1e653f9a63 100644
--- a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
+++ b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbDEMCaracteristicsExtractor.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index db547cc0e4..f8f65376bc 100644
--- a/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
index 9a0b8f97f2..1ec7d5e742 100644
--- a/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
index 21c83a9731..d69865b502 100644
--- a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
+++ b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbAtmosphericCorrectionParameters.h"
#include "otbSIXSTraits.h"
#include <fstream>
diff --git a/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
index 4e2f1a43c3..c4224c25c5 100644
--- a/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbGAndRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx
index b81119a3bc..15a1a0df74 100644
--- a/Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbGAndRIndexImageFilter.h"
#include "itkImage.h"
diff --git a/Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx
index 3e930a3469..d749cfce8c 100644
--- a/Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndGAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx
index da92ccfe32..4376c264bf 100644
--- a/Testing/Code/Radiometry/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx
index 42111ab0c3..3b54b59de2 100644
--- a/Testing/Code/Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx
index a821054ced..89a66502da 100644
--- a/Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
index 845ae1fe5b..5f3153225a 100644
--- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToLuminanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
index 34c845295f..5757305a0d 100644
--- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToLuminanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
index 45abffe8ce..bc274373df 100644
--- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToLuminanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx
index 145f516a63..dc4f8cd600 100644
--- a/Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToReflectanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
index 84c8834a38..2a14da8d31 100644
--- a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToReflectanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
index 3623842809..33f183faab 100644
--- a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToReflectanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx b/Testing/Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx
index cb7a9df9c8..4190ff5b6d 100644
--- a/Testing/Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx
+++ b/Testing/Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVegetationIndicesFunctor.h"
int otbLAIFromNDVILogarithmic(int argc, char * argv[])
diff --git a/Testing/Code/Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx b/Testing/Code/Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx
index 746f0f587d..fdfd3dd4bb 100644
--- a/Testing/Code/Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx
+++ b/Testing/Code/Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVegetationIndicesFunctor.h"
int otbLAIFromReflectancesLinear(int argc, char * argv[])
diff --git a/Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx b/Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx
index 9a1cd46ab0..93e17d3e46 100644
--- a/Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLandsatTMIndices.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
index aa093ef3ce..eafc59fe21 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
index 6e8b97b56f..69550c9410 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
index 4be1913075..7fc52a0c94 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
index 650c5a277f..63519a874a 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
index 67088119c9..e4b12ba50a 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
index 90435a95d5..52b8a612b8 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
index 18e9de2ae9..0d1c9201ae 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
index c24fb79bed..9e7b405f90 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
index 2c9d3786a2..d5e8d140b6 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
index 176964cdf2..23ddfcb3fe 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
index f22cfef1bc..a413466f27 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
index 89deae17cf..aad890572c 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
index 50b11464f1..441203efd0 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx b/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
index ae40c7a728..5e3f24ca60 100644
--- a/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
#include <vector>
diff --git a/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx b/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
index aece4ee7e9..7b28f5a217 100644
--- a/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifierTest.cxx b/Testing/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifierTest.cxx
index 2dcecbd340..c8e8825faa 100644
--- a/Testing/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifierTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifierTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLandsatTMSpectralRuleBasedClassifier.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx b/Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx
index 1ad90b50c8..05e1f272bb 100644
--- a/Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLandsatTMIndices.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx b/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
index 9d546d58ba..f8fbad051f 100644
--- a/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx b/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
index 78dff04506..7e7bc215ac 100644
--- a/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFixedArray.h"
#include "otbLandsatTMIndices.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
index 342d0df629..3f8084f156 100644
--- a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLuminanceToReflectanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
index 6904663df0..d9fd967858 100644
--- a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToLuminanceImageFilter.h"
#include "otbLuminanceToReflectanceImageFilter.h"
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx
index ec630340e5..d656a888ca 100644
--- a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbLuminanceToReflectanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx
index c381cbcdb6..58ba9fd9e9 100644
--- a/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelGAndRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx
index f953df64eb..dea8cab37c 100644
--- a/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelGAndRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index bd11e8590d..7fe4d30c26 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
index 7bedc62edb..11c3bf67d3 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
index 0e933fbd48..f1323d6372 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index 096982e883..394d81d49a 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
index 76faf38ff2..87b076cd35 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx b/Testing/Code/Radiometry/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
index 9c57f538fd..997c670edc 100644
--- a/Testing/Code/Radiometry/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkUnaryFunctorImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx b/Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx
index 71345e8bff..d6abcaa44b 100644
--- a/Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkBinaryFunctorImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx b/Testing/Code/Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx
index 078525f220..3471054510 100644
--- a/Testing/Code/Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkUnaryFunctorImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx b/Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx
index 4350c7bdcc..005b3ad73d 100644
--- a/Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkBinaryFunctorImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
index 204a0bee25..3c1a5f050e 100644
--- a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
index cdb47f840e..0ad2e68748 100644
--- a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
index ba66e7789a..0619baaff8 100644
--- a/Testing/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndGAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
index 02bdee7134..9d4e2da8ef 100644
--- a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx b/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx
index be3e124982..77beab9f3c 100644
--- a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndNIRIndexImageFilter.h"
#include "itkImage.h"
diff --git a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
index 0dc0393a4d..7595616c93 100644
--- a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <fstream>
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
index e7fd435ea9..6ac4aca74c 100644
--- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx b/Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx
index 2912bf2697..c230e71a64 100644
--- a/Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx
+++ b/Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarBrightnessFunctor.h"
diff --git a/Testing/Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx b/Testing/Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx
index 6e58d5d82a..e393e07472 100644
--- a/Testing/Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx
+++ b/Testing/Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarBrightnessFunctor.h"
diff --git a/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx b/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
index 3249ed86c5..e31862b48c 100644
--- a/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbFunctionToImageFilter.h"
#include "otbSarParametricMapFunction.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx
index 9330476d44..65af375adc 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarRadiometricCalibrationFunctor.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx
index 7449406b8f..6494cce1f7 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSarRadiometricCalibrationFunctor.h"
diff --git a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index a2a05892f9..e23717485f 100644
--- a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
index 02666b5b89..872610ceb1 100644
--- a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
index 28c5b52259..cb13ff0016 100644
--- a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
+++ b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew.cxx b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew.cxx
index 62df0ea89f..2a2d9acfc6 100644
--- a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index 76ac3a011b..7229d9b8cc 100644
--- a/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
index 229e732340..5feb8be13c 100644
--- a/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndBAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
index 9b5f4f6cf3..f313896c06 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
#include <fstream>
#include <iomanip>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbTerraSarBrightnessFunctor.h"
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
index 2ddd907909..94eb55842e 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbTerraSarBrightnessImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx
index d970a0f9dd..4e7c658beb 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbTerraSarBrightnessImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
index f2c15b0a17..e230f43c9d 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbTerraSarBrightnessImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterNew.cxx b/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterNew.cxx
index 733f02518e..6ef4c953dd 100644
--- a/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbTerraSarCalibrationImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index 1c5f8b34ed..18a41ebed8 100644
--- a/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMultiChannelRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
index c0f13b3307..5a15543ad0 100644
--- a/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRAndNIRIndexImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx b/Testing/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx
index 3fd1b5d490..41dc55d0db 100644
--- a/Testing/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbWaterSqrtSpectralAngleImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbHHnHVPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbHHnHVPolarimetricSynthesisFilter.cxx
index ee31e92bb5..d9541af00f 100644
--- a/Testing/Code/SARPolarimetry/otbHHnHVPolarimetricSynthesisFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbHHnHVPolarimetricSynthesisFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbHHnHVnVVPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbHHnHVnVVPolarimetricSynthesisFilter.cxx
index 65fd79ec32..7f88783fe7 100644
--- a/Testing/Code/SARPolarimetry/otbHHnHVnVVPolarimetricSynthesisFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbHHnHVnVVPolarimetricSynthesisFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbHermitianEigenAnalysisTest.cxx b/Testing/Code/SARPolarimetry/otbHermitianEigenAnalysisTest.cxx
index da3cec98e7..8e205c8275 100644
--- a/Testing/Code/SARPolarimetry/otbHermitianEigenAnalysisTest.cxx
+++ b/Testing/Code/SARPolarimetry/otbHermitianEigenAnalysisTest.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx b/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
index abbdc38b1d..ac9ea60746 100644
--- a/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
index 98e8df954c..8d3db8182d 100644
--- a/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceFunctor.cxx b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceFunctor.cxx
index 5c52fe044d..fa63173b6c 100644
--- a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMuellerToReciprocalCovarianceImageFilter.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
index 85bdee4309..fb90acf4c5 100644
--- a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
index d170959608..58951f291a 100644
--- a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.cxx
index 19b024acf7..0a07275467 100644
--- a/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx b/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
index f685ef5122..a665a9c0fb 100644
--- a/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbPolarimetricData.cxx b/Testing/Code/SARPolarimetry/otbPolarimetricData.cxx
index a857f5e8a1..8f9b5a59d5 100644
--- a/Testing/Code/SARPolarimetry/otbPolarimetricData.cxx
+++ b/Testing/Code/SARPolarimetry/otbPolarimetricData.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbPolarimetricData.h"
diff --git a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.cxx
index 0e49b4f11a..0e647e26d3 100644
--- a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilterNew.cxx b/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilterNew.cxx
index 9a39b9ec5f..e7368e4d1a 100644
--- a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx b/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx
index f2ee9eaca5..edc30eda35 100644
--- a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "vcl_complex.h"
#include "vcl_cmath.h"
#include "otbPolarimetricSynthesisFunctor.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
index cf5329ad28..09715314e1 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
index 690faabae2..69db80cb86 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
index cfc884b1fa..0d05dd332e 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
index bed4c74d6a..2bfac7bf90 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
index ee05bcf8d9..c85c859ce7 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
index 329a9f55d4..c07c203ce2 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx b/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx
index b64493bdba..5b89f72a4c 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx
index c1c7dd2d9b..a311fbfa22 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx b/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
index 7022c13f62..d31491f364 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx b/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
index f8c218b7bd..3eb110be5d 100644
--- a/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
+++ b/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbVectorImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
index 26d88f2a0d..a2e7f44b4d 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <typeinfo>
diff --git a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
index cec44b9966..a467b3134f 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include <typeinfo>
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.cxx
index c99695b9e7..ac9d95fa27 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToCircularCovarianceMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx
index 315e212a47..92a4bee454 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToCoherencyMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx
index 43812f5aa8..705533b64d 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToCovarianceMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx
index a9740a2774..9cb9331083 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToMuellerMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
index f46747aabf..5748fb08c2 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
index a9b03fb4c4..9e6d112438 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToReciprocalCoherencyMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx b/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
index a98a83a457..c64d038f60 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbSinclairToReciprocalCovarianceMatrixFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Code/SARPolarimetry/otbVHnVVPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbVHnVVPolarimetricSynthesisFilter.cxx
index 05a2130eaa..694750ef8c 100644
--- a/Testing/Code/SARPolarimetry/otbVHnVVPolarimetricSynthesisFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbVHnVVPolarimetricSynthesisFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
index 800277d3ab..d851d33590 100644
--- a/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
@@ -17,7 +17,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <iostream>
#include "otbImage.h"
diff --git a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
index b5362231ef..81c04ca738 100644
--- a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbAtmosphericEffects.h"
diff --git a/Testing/Code/Simulation/otbAtmosphericEffects.cxx b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
index 4793657f7d..bed0ed6f3b 100644
--- a/Testing/Code/Simulation/otbAtmosphericEffects.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSpectralResponse.h"
diff --git a/Testing/Code/Simulation/otbProspectReflTest.cxx b/Testing/Code/Simulation/otbProspectReflTest.cxx
index 4d3359d6be..585a4a61ed 100644
--- a/Testing/Code/Simulation/otbProspectReflTest.cxx
+++ b/Testing/Code/Simulation/otbProspectReflTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbProspectModel.h"
diff --git a/Testing/Code/Simulation/otbProspectTransTest.cxx b/Testing/Code/Simulation/otbProspectTransTest.cxx
index 59bfe6139b..ece4cdc7b2 100644
--- a/Testing/Code/Simulation/otbProspectTransTest.cxx
+++ b/Testing/Code/Simulation/otbProspectTransTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbProspectModel.h"
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponse.cxx b/Testing/Code/Simulation/otbReduceSpectralResponse.cxx
index d1629f5290..d8e54b9636 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponse.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponse.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSpectralResponse.h"
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
index e1824787c0..d7e2ab03b0 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSpectralResponse.h"
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
index 4ebe84e003..c007c6cc2a 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSpectralResponse.h"
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
index 290267e62c..22dcc02afa 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSatelliteRSR.h"
diff --git a/Testing/Code/Simulation/otbSailReflHTest.cxx b/Testing/Code/Simulation/otbSailReflHTest.cxx
index 519092f623..983f8c5259 100644
--- a/Testing/Code/Simulation/otbSailReflHTest.cxx
+++ b/Testing/Code/Simulation/otbSailReflHTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbLeafParameters.h"
diff --git a/Testing/Code/Simulation/otbSailReflVTest.cxx b/Testing/Code/Simulation/otbSailReflVTest.cxx
index 80c26d1c7c..6b405cd27e 100644
--- a/Testing/Code/Simulation/otbSailReflVTest.cxx
+++ b/Testing/Code/Simulation/otbSailReflVTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbLeafParameters.h"
diff --git a/Testing/Code/Simulation/otbSatelliteRSR.cxx b/Testing/Code/Simulation/otbSatelliteRSR.cxx
index 1e58b7aef2..d92e8bab8d 100644
--- a/Testing/Code/Simulation/otbSatelliteRSR.cxx
+++ b/Testing/Code/Simulation/otbSatelliteRSR.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSatelliteRSR.h"
diff --git a/Testing/Code/Simulation/otbSatelliteRSRNew.cxx b/Testing/Code/Simulation/otbSatelliteRSRNew.cxx
index 90b0e1d7a2..88e80c4281 100644
--- a/Testing/Code/Simulation/otbSatelliteRSRNew.cxx
+++ b/Testing/Code/Simulation/otbSatelliteRSRNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSatelliteRSR.h"
diff --git a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx b/Testing/Code/Simulation/otbSpatialisationTestNew.cxx
index cb28cbcc81..1a3cec98fa 100644
--- a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx
+++ b/Testing/Code/Simulation/otbSpatialisationTestNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Simulation/otbSpectralResponse.cxx b/Testing/Code/Simulation/otbSpectralResponse.cxx
index 0bdb658fba..aada324b56 100644
--- a/Testing/Code/Simulation/otbSpectralResponse.cxx
+++ b/Testing/Code/Simulation/otbSpectralResponse.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSpectralResponse.h"
diff --git a/Testing/Code/Simulation/otbSpectralResponseNew.cxx b/Testing/Code/Simulation/otbSpectralResponseNew.cxx
index 85c6444435..831941be42 100644
--- a/Testing/Code/Simulation/otbSpectralResponseNew.cxx
+++ b/Testing/Code/Simulation/otbSpectralResponseNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbSpectralResponse.h"
diff --git a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
index 62bab37ee5..369aafa4ad 100644
--- a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
+++ b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
#include "otbVectorImage.h"
#include "itkImageRegionIterator.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
index 75c6569467..28c349de4e 100644
--- a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbImage.h"
#include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
index f640ff2529..a0eb750a29 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbImage.h"
#include "otbImageList.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
index 2803c639d0..7c6581ad18 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbImage.h"
#include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx b/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
index ea09df2e04..c0f8849379 100644
--- a/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToImageRCC8Calculator.h"
#include "otbImage.h"
#include "otbImageList.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx b/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
index b26f436978..dd0793d754 100644
--- a/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToImageRCC8Calculator.h"
#include "otbImage.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
index c5f0e5bb87..1ac3f33b2c 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbPolygon.h"
#include "otbObjectList.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
index 7d9e6ddb15..cd0813a08d 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbPolygon.h"
#include "otbObjectList.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
index d1530975c6..13ed3b34ef 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPolygonToPolygonRCC8Calculator.h"
#include "otbImage.h"
#include "otbObjectList.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx
index 9e91ba8f75..6133c0f72e 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbPolygonToPolygonRCC8Calculator.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Edge.cxx b/Testing/Code/SpatialReasoning/otbRCC8Edge.cxx
index 320c74a9eb..1d1bfa88c2 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8Edge.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8Edge.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Edge.h"
#include <cstdlib>
diff --git a/Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx
index a0a82e2bfd..0261d1fdd2 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Edge.h"
#include <cstdlib>
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
index 4e31fc3c8c..decc72bda7 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexBase.h"
#include "otbRCC8VertexIterator.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
index 641d37706f..75d8678316 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexIterator.h"
#include "otbRCC8EdgeIterator.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
index 555a92d355..170e26ddf1 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexBase.h"
#include "otbRCC8GraphFileReader.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
index 8b0f5d4e47..1c9ad38eef 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexBase.h"
#include "otbRCC8GraphFileWriter.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
index 46046ee5dc..d4c9795e7e 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexBase.h"
#include "otbRCC8GraphFileWriter.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
index 4c8078eb6e..4258d9cdbb 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexBase.h"
#include "otbRCC8GraphFileReader.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx
index aeee9e1a50..0b35e6efb9 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8VertexBase.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx
index 31ba00228a..9e183e1ec1 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8Graph.h"
#include "otbRCC8GraphSource.h"
#include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx b/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
index 440154bf7b..11d01a01a6 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8VertexBase.h"
#include "otbPolygon.h"
#include "otbMacro.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx
index f25f9ac06a..d94a906fee 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8VertexBase.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx b/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
index 700e60a494..321288246c 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8VertexWithCompacity.h"
#include "otbMacro.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx
index bdb974e84e..a56c0ccfc0 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbRCC8VertexWithCompacity.h"
#include "otbPolygon.h"
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx b/Testing/Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx
index 494b2c85d5..7556ff0c8d 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx
@@ -18,7 +18,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTestScientificNotation(int argc, char * argv[])
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests.cxx b/Testing/Code/TestSystem/otbCompareAsciiTests.cxx
index e0d897f080..1f38e4ee42 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTests.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTests.cxx
@@ -18,7 +18,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTests(int argc, char * argv[])
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests2.cxx b/Testing/Code/TestSystem/otbCompareAsciiTests2.cxx
index b298ac9c97..1ae95c21d3 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTests2.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTests2.cxx
@@ -18,7 +18,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTests2(int argc, char * argv[])
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests3.cxx b/Testing/Code/TestSystem/otbCompareAsciiTests3.cxx
index 358be598b6..edeb80795a 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTests3.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTests3.cxx
@@ -18,7 +18,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTests3(int argc, char * argv[])
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests4.cxx b/Testing/Code/TestSystem/otbCompareAsciiTests4.cxx
index 4b27890a3c..9440e292c2 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTests4.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTests4.cxx
@@ -18,7 +18,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTests4(int argc, char * argv[])
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests5.cxx b/Testing/Code/TestSystem/otbCompareAsciiTests5.cxx
index 40b8572c18..79967b9e5f 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTests5.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTests5.cxx
@@ -18,7 +18,7 @@
#include <iostream>
#include <fstream>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTests5(int argc, char * argv[])
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx b/Testing/Code/TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx
index b150717886..87e0935c03 100644
--- a/Testing/Code/TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx
+++ b/Testing/Code/TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx
@@ -19,7 +19,7 @@
#include <fstream>
#include <string>
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbMacro.h"
int otbCompareAsciiTestsEpsilon3_WhiteSpace(int argc, char * argv[])
diff --git a/Testing/Code/Visu/otbDoubleImageViewerWithLink.cxx b/Testing/Code/Visu/otbDoubleImageViewerWithLink.cxx
index fd6d8a5568..ac0d1d7934 100644
--- a/Testing/Code/Visu/otbDoubleImageViewerWithLink.cxx
+++ b/Testing/Code/Visu/otbDoubleImageViewerWithLink.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageViewer.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.cxx b/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.cxx
index 4eee67dabb..6d169a1665 100644
--- a/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.cxx
+++ b/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToGrayscaleAnaglyphImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilterNew.cxx b/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilterNew.cxx
index 12f3a54322..0c0ba09134 100644
--- a/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilterNew.cxx
+++ b/Testing/Code/Visu/otbImageToGrayscaleAnaglyphImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageToGrayscaleAnaglyphImageFilter.h"
#include "otbImage.h"
diff --git a/Testing/Code/Visu/otbImageViewer.cxx b/Testing/Code/Visu/otbImageViewer.cxx
index 79247b1dad..c13f9b3d05 100644
--- a/Testing/Code/Visu/otbImageViewer.cxx
+++ b/Testing/Code/Visu/otbImageViewer.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageViewer.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Visu/otbImageViewerNew.cxx b/Testing/Code/Visu/otbImageViewerNew.cxx
index 0ea49440f1..95d6a24a8b 100644
--- a/Testing/Code/Visu/otbImageViewerNew.cxx
+++ b/Testing/Code/Visu/otbImageViewerNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageViewer.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Visu/otbImageViewerWithMultiBandFilter.cxx b/Testing/Code/Visu/otbImageViewerWithMultiBandFilter.cxx
index c00cd0fe18..61fbf51e81 100644
--- a/Testing/Code/Visu/otbImageViewerWithMultiBandFilter.cxx
+++ b/Testing/Code/Visu/otbImageViewerWithMultiBandFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageViewer.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Visu/otbImageViewerWithOtbImage.cxx b/Testing/Code/Visu/otbImageViewerWithOtbImage.cxx
index 9c570bd368..65f604b158 100644
--- a/Testing/Code/Visu/otbImageViewerWithOtbImage.cxx
+++ b/Testing/Code/Visu/otbImageViewerWithOtbImage.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageViewer.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Visu/otbImageViewerWithOverlay.cxx b/Testing/Code/Visu/otbImageViewerWithOverlay.cxx
index 5236e81e56..46586732c9 100644
--- a/Testing/Code/Visu/otbImageViewerWithOverlay.cxx
+++ b/Testing/Code/Visu/otbImageViewerWithOverlay.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImageFileReader.h"
#include "otbImageViewer.h"
#include "otbMacro.h"
diff --git a/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.cxx b/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.cxx
index cc9bdf533a..6cf54bd56e 100644
--- a/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.cxx
+++ b/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImageToColorAnaglyphVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilterNew.cxx b/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilterNew.cxx
index 5af9117a96..b59771a5d4 100644
--- a/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilterNew.cxx
+++ b/Testing/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilterNew.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImageToColorAnaglyphVectorImageFilter.h"
#include "otbVectorImage.h"
diff --git a/Testing/Code/Visualization/otbAmplitudeFunctorTest.cxx b/Testing/Code/Visualization/otbAmplitudeFunctorTest.cxx
index d066d7916e..dded91db1d 100644
--- a/Testing/Code/Visualization/otbAmplitudeFunctorTest.cxx
+++ b/Testing/Code/Visualization/otbAmplitudeFunctorTest.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbAmplitudeFunctor.h"
#include "itkVariableLengthVector.h"
diff --git a/Testing/Fa/0000169-fftcomplextocomplex.cxx b/Testing/Fa/0000169-fftcomplextocomplex.cxx
index 9f27eb6356..9e89ef469f 100644
--- a/Testing/Fa/0000169-fftcomplextocomplex.cxx
+++ b/Testing/Fa/0000169-fftcomplextocomplex.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkFFTComplexToComplexImageFilter.h"
int main(int argc, char * argv[])
diff --git a/Testing/Fa/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx b/Testing/Fa/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx
index a0828ad22f..061e354aaf 100644
--- a/Testing/Fa/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx
+++ b/Testing/Fa/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx
@@ -15,7 +15,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
diff --git a/Testing/Fa/PolygonsVectorization.cxx b/Testing/Fa/PolygonsVectorization.cxx
index 31787edb90..5dd693c6c5 100644
--- a/Testing/Fa/PolygonsVectorization.cxx
+++ b/Testing/Fa/PolygonsVectorization.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
#include "otbImage.h"
diff --git a/Testing/Utilities/otbSVMComposedKernelFunctorTest.cxx b/Testing/Utilities/otbSVMComposedKernelFunctorTest.cxx
index e4e9ba84ca..b67badbd45 100644
--- a/Testing/Utilities/otbSVMComposedKernelFunctorTest.cxx
+++ b/Testing/Utilities/otbSVMComposedKernelFunctorTest.cxx
@@ -16,7 +16,7 @@
=========================================================================*/
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "otbImage.h"
#include <iostream>
#include <fstream>
--
GitLab