Commit 7b70de90 authored by Julien Malik's avatar Julien Malik

COMP: missing includes to allow compilation of single files

parent d67dad49
......@@ -18,6 +18,7 @@
#ifndef __otbWrapperTags_h
#define __otbWrapperTags_h
#include <string>
namespace otb
{
......
......@@ -21,7 +21,8 @@
#include <vnl/vnl_math.h>
#include <itkImageRegionIterator.h>
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
namespace otb {
......
......@@ -18,9 +18,10 @@
#ifndef __otbAngularProjectionImageFilter_h
#define __otbAngularProjectionImageFilter_h
#include "itkImageRegionConstIterator.h"
#include "itkProgressReporter.h"
#include "itkImageToImageFilter.h"
namespace otb {
/** \class AngularProjectionImageFilter
* \brief Performs spherical transformation in ND space
......
......@@ -18,6 +18,7 @@
#ifndef __otbBinarySpectralAngleFunctor_h
#define __otbBinarySpectralAngleFunctor_h
#include <algorithm>
#include "otbMath.h"
namespace otb
......
......@@ -18,6 +18,7 @@
#ifndef __otbHillShadingFunctor_h
#define __otbHillShadingFunctor_h
#include "itkNumericTraits.h"
#include "otbMath.h"
namespace otb
......
......@@ -19,6 +19,9 @@
#ifndef __otbImageListToSingleImageFilter_txx
#define __otbImageListToSingleImageFilter_txx
#include "itkImageRegionConstIteratorWithIndex.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkProgressReporter.h"
#include "otbImageListToSingleImageFilter.h"
namespace otb
......
......@@ -21,11 +21,11 @@
#ifndef __otbListSampleToHistogramListGenerator_h
#define __otbListSampleToHistogramListGenerator_h
#include "itkObject.h"
#include "itkNumericTraits.h"
#include "itkProcessObject.h"
#include "itkHistogram.h"
#include "otbObjectList.h"
#include "itkStatisticsAlgorithm.h"
#include "itkNumericTraits.h"
#include "otbObjectList.h"
namespace otb {
......
......@@ -21,8 +21,8 @@
#ifndef __otbListSampleToHistogramListGenerator_txx
#define __otbListSampleToHistogramListGenerator_txx
#include "otbMacro.h"
#include "itkArray.h"
#include "otbMacro.h"
namespace otb
{
......
......@@ -24,16 +24,12 @@
#include "otbParser.h"
#include "otbMacro.h"
#include "otbBinarySpectralAngleFunctor.h"
#include "muParserCallback.h"
namespace otb
{
/** \class MaskMuParserFunctor
* \brief functor used to create binary mask for input of connected component segmentation module.
* \brief Functor used to create binary mask for input of connected component segmentation module.
*
* This functor is based on the mathematical parser library muParser.
* The built in functions and operators list is available at:
......
......@@ -18,6 +18,7 @@
#ifndef __otbPathMeanDistanceFunctor_h
#define __otbPathMeanDistanceFunctor_h
#include "otbMacro.h"
#include "otbMath.h"
namespace otb
......
......@@ -18,6 +18,10 @@
#ifndef __otbUniformAlphaBlendingFunctor_h
#define __otbUniformAlphaBlendingFunctor_h
#include "itkMacro.h"
#include "itkNumericTraits.h"
#include "otbMath.h"
namespace otb
{
namespace Functor
......
......@@ -18,12 +18,14 @@
#ifndef __otbVectorDataToLabelImageFilter_txx
#define __otbVectorDataToLabelImageFilter_txx
#include "gdal_alg.h"
#include "ogr_srs_api.h"
#include "otbVectorDataToLabelImageFilter.h"
#include "otbOGRIOHelper.h"
#include "otbGdalDataTypeBridge.h"
#include "gdal_alg.h"
#include "ogr_srs_api.h"
#include "otbImageMetadataInterfaceBase.h"
#include "otbImageMetadataInterfaceFactory.h"
namespace otb
{
......
......@@ -19,6 +19,7 @@
#define __otbCBAMI_h
#include <vector>
#include "itkMath.h"
namespace otb
{
......
......@@ -18,6 +18,8 @@
#ifndef __otbCrossCorrelation_h
#define __otbCrossCorrelation_h
#include "itkMath.h"
namespace otb
{
......
......@@ -19,6 +19,7 @@
#ifndef __otbGdalDataTypeBridge_h
#define __otbGdalDataTypeBridge_h
#include <typeinfo>
#include "gdal.h"
namespace otb
......
......@@ -19,6 +19,7 @@
#ifndef __otbHistogramStatisticsFunction_txx
#define __otbHistogramStatisticsFunction_txx
#include "itkNumericTraits.h"
#include "otbHistogramStatisticsFunction.h"
namespace otb
......
......@@ -30,13 +30,15 @@ namespace otb
*/
template <class TPointSet, class TValue, class TCoordRep = double>
class ITK_EXPORT PointSetAndValuesFunction
: public itk::FunctionBase<itk::Point<TCoordRep, ::itk::GetPointSetDimension<TPointSet>::PointDimension>, TValue>
: public itk::FunctionBase<itk::Point<TCoordRep, TPointSet::PointDimension>, TValue>
{
public:
/** Standard typedefs */
typedef PointSetAndValuesFunction Self;
typedef itk::FunctionBase<itk::Point<TCoordRep,
::itk::GetPointSetDimension<TPointSet>::PointDimension>, TValue> Superclass;
typedef itk::FunctionBase<
itk::Point<TCoordRep, TPointSet::PointDimension>,
TValue
> Superclass;
typedef itk::SmartPointer<Self>
Pointer;
typedef itk::SmartPointer<const Self>
......
......@@ -18,6 +18,7 @@
#ifndef __otbRAMDrivenStrippedStreamingManager_h
#define __otbRAMDrivenStrippedStreamingManager_h
#include "itkImageRegionSplitter.h"
#include "otbStreamingManager.h"
namespace otb
......
......@@ -35,12 +35,12 @@ namespace otb
* \ingroup VectorDataFilter
*/
template <class TInputVectorData, class TOutputVectorData>
class ITK_EXPORT VectorDataToVectorDataFilter : public otb::VectorDataSource<TOutputVectorData>
class ITK_EXPORT VectorDataToVectorDataFilter : public VectorDataSource<TOutputVectorData>
{
public:
/** Standard class typedefs. */
typedef VectorDataToVectorDataFilter Self;
typedef otb::VectorDataSource<TOutputVectorData> Superclass;
typedef VectorDataSource<TOutputVectorData> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......
......@@ -21,10 +21,11 @@
#ifndef __otbNCCRegistrationFunction_txx
#define __otbNCCRegistrationFunction_txx
#include "otbNCCRegistrationFunction.h"
#include "vnl/vnl_math.h"
#include "itkNeighborhoodIterator.h"
#include "otbMacro.h"
#include "vnl/vnl_math.h"
#include "otbNCCRegistrationFunction.h"
namespace otb
{
......
......@@ -39,12 +39,12 @@ namespace otb
template <class TVectorData>
class ITK_EXPORT VectorDataToSpecificDescriptionFilterBase :
public otb::VectorDataToVectorDataFilter<TVectorData, TVectorData>
public VectorDataToVectorDataFilter<TVectorData, TVectorData>
{
public:
/** Standard class typedefs. */
typedef VectorDataToSpecificDescriptionFilterBase Self;
typedef otb::VectorDataToVectorDataFilter<TVectorData,
typedef VectorDataToVectorDataFilter<TVectorData,
TVectorData> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......
......@@ -25,6 +25,7 @@
#include "itkImageRegionIterator.h"
#include "itkListSample.h"
#include "itkCovarianceSampleFilter.h"
#include "itkProgressReporter.h"
namespace otb
{
......
......@@ -18,16 +18,17 @@
#ifndef __otbSparseUnmixingImageFilter_h
#define __otbSparseUnmixingImageFilter_h
#include "itkListSample.h"
#include "itkHistogram.h"
#include "otbMacro.h"
#include "otbImage.h"
#include "otbWaveletOperator.h"
#include "otbWaveletFilterBank.h"
#include "otbWaveletTransform.h"
#include "otbSparseWvltToAngleMapperListFilter.h"
#include "otbAngularProjectionSetImageFilter.h"
#include "itkListSample.h"
#include "itkHistogram.h"
namespace otb {
/** \class SparseUnmixingImageFilter
......
......@@ -17,6 +17,7 @@
#ifndef __otbConvertPixelBuffer_h
#define __otbConvertPixelBuffer_h
#include <complex>
#include "itkObject.h"
namespace otb
......
......@@ -18,6 +18,7 @@
#define __otbConvertPixelBuffer_txx
#include "otbConvertPixelBuffer.h"
#include <cstddef> // ptrdiff_t
#include "itkRGBPixel.h"
namespace otb
......
......@@ -19,8 +19,10 @@
#define __otbWorldFile_h
#include <iomanip>
#include <fstream>
#include "itkObject.h"
#include "itkObjectFactory.h"
namespace otb {
......
......@@ -22,6 +22,7 @@
#define __otbCzihoSOMLearningBehaviorFunctor_h
#include "itkSize.h"
#include "otbMath.h"
namespace otb
{
......
......@@ -21,6 +21,9 @@
#ifndef __otbCzihoSOMNeighborhoodBehaviorFunctor_h
#define __otbCzihoSOMNeighborhoodBehaviorFunctor_h
#include "itkSize.h"
#include "itkMath.h"
namespace otb
{
......
......@@ -44,8 +44,8 @@ class SOMLearningBehaviorFunctor
{
public:
/** Empty constructor / descructor */
CzihoSOMLearningBehaviorFunctor () {}
virtual ~CzihoSOMLearningBehaviorFunctor() {}
SOMLearningBehaviorFunctor () {}
virtual ~SOMLearningBehaviorFunctor() {}
/** Functor */
virtual double operator ()(unsigned int currentIteration,
......
......@@ -28,6 +28,8 @@
#include "itkNeighborhoodAlgorithm.h"
#include "itkNeighborhoodInnerProduct.h"
#include "otbWaveletOperatorBase.h"
namespace otb {
/** \class WaveletFilterBank
......
......@@ -23,6 +23,7 @@
#include "itkObject.h"
#include "itkMacro.h"
#include "itkObjectFactory.h"
namespace otb {
......
......@@ -21,10 +21,12 @@
#ifndef __otbWaveletPacketTransform_h
#define __otbWaveletPacketTransform_h
#include "otbImageToImageListFilter.h"
#include "otbImageListToImageFilter.h"
#include "itkProgressAccumulator.h"
#include "otbImageToImageListFilter.h"
#include "otbImageListToImageFilter.h"
#include "otbWaveletGenerator.h"
#include "otbWaveletOperatorBase.h"
#include "otbWaveletPacketDecompositionCosts.h"
namespace otb {
......
......@@ -24,6 +24,8 @@
#include "otbImageToImageListFilter.h"
#include "otbImageListToImageFilter.h"
#include "otbObjectList.h"
#include "otbWaveletGenerator.h"
#include "otbWaveletOperatorBase.h"
namespace otb {
......
......@@ -18,6 +18,7 @@ PURPOSE. See the above copyright notices for more information.
#ifndef __otbMergeLabelObjectFunctor_h
#define __otbMergeLabelObjectFunctor_h
#include <algorithm>
namespace otb
{
......
......@@ -22,13 +22,12 @@
#include "itkVariableLengthVector.h"
#include "itkImageRegion.h"
#include "otbListSampleSource.h"
#include "itkFunctionBase.h"
#include "itkListSample.h"
#include "otbVectorData.h"
#include "itkSimpleDataObjectDecorator.h"
#include "otbListSampleSource.h"
#include "otbVectorData.h"
#include "otbPersistentImageFilter.h"
#include "otbPersistentFilterStreamingDecorator.h"
......
......@@ -20,18 +20,19 @@
#include <vector>
#include "itkFixedArray.h"
#include "itkImageRegion.h"
#include "otbVectorData.h"
#include "itkFixedArray.h"
#include "itkVariableLengthVector.h"
#include "itkListSample.h"
#include "itkDataObjectDecorator.h"
#include "itkSimpleDataObjectDecorator.h"
#include "itkFunctionBase.h"
#include "otbVectorData.h"
#include "otbSVMModel.h"
#include "otbPersistentImageFilter.h"
#include "otbPersistentFilterStreamingDecorator.h"
#include "otbSVMModel.h"
namespace otb
{
......
......@@ -20,6 +20,7 @@
#define __otbEckert4MapProjection_txx
#include "otbEckert4MapProjection.h"
#include "otbUtils.h"
namespace otb
{
......
......@@ -22,9 +22,9 @@
#ifndef __otbGroundSpacingImageFunction_txx
#define __otbGroundSpacingImageFunction_txx
#include "otbGroundSpacingImageFunction.h"
#include "otbMath.h"
#include "itkConstNeighborhoodIterator.h"
#include "otbGroundSpacingImageFunction.h"
namespace otb
{
......
......@@ -20,6 +20,7 @@
#define __otbLambertConformalConicMapProjection_txx
#include "otbLambertConformalConicMapProjection.h"
#include "otbUtils.h"
namespace otb
{
......
......@@ -18,12 +18,13 @@
#ifndef __otbLeastSquareAffineTransformEstimator_txx
#define __otbLeastSquareAffineTransformEstimator_txx
#include "otbLeastSquareAffineTransformEstimator.h"
#include <vnl/algo/vnl_lsqr.h>
#include <vnl/vnl_sparse_matrix_linear_system.h>
#include <vnl/vnl_least_squares_function.h>
#include "otbMacro.h"
#include "otbLeastSquareAffineTransformEstimator.h"
namespace otb {
template <class TPoint>
......
......@@ -20,6 +20,7 @@
#define __otbMollweidMapProjection_txx
#include "otbMollweidMapProjection.h"
#include "otbUtils.h"
namespace otb
{
......
......@@ -20,6 +20,7 @@
#define __otbSinusoidalMapProjection_txx
#include "otbSinusoidalMapProjection.h"
#include "otbUtils.h"
namespace otb
{
......
......@@ -19,6 +19,7 @@
#define __otbTransMercatorMapProjection_txx
#include "otbTransMercatorMapProjection.h"
#include "otbUtils.h"
namespace otb
{
......
......@@ -19,6 +19,8 @@
#define __otbMultiChannelRadiometricImageFilter_h
#include "itkUnaryFunctorImageFilter.h"
#include "otbMacro.h"
#include "otbBandName.h"
namespace otb
......
......@@ -19,6 +19,7 @@
#define __otbSinclairToReciprocalCoherencyMatrixFunctor_h
#include "vcl_complex.h"
#include "itkMacro.h"
namespace otb
{
......@@ -60,6 +61,9 @@ public:
/** Some typedefs. */
typedef typename std::complex <double> ComplexType;
typedef typename TOutput::ValueType OutputValueType;
itkStaticConstMacro(NumberOfComponentsPerPixel, unsigned int, 6);
inline TOutput operator ()(const TInput1& Shh, const TInput2& Shv, const TInput3& Svv)
{
TOutput result;
......@@ -99,9 +103,8 @@ public:
protected:
private:
itkStaticConstMacro(NumberOfComponentsPerPixel, unsigned int, 6);
};
} // namespace Functor
......
......@@ -20,6 +20,7 @@
#include "itkNumericTraits.h"
#include "otbMacro.h"
#include "otbLabelToProSailParameters.h"
namespace otb
......
......@@ -18,9 +18,9 @@
#ifndef __otbReduceSpectralResponse_txx
#define __otbReduceSpectralResponse_txx
#include "otbReduceSpectralResponse.h"
#include <algorithm>
#include "itkNumericTraits.h"
#include "otbReduceSpectralResponse.h"
namespace otb
{
......
......@@ -19,9 +19,8 @@
#ifndef __otbSimulationStep2Base_h
#define __otbSimulationStep2Base_h
#include "itkProcessObject.h"
#include "otbSpectralResponse.h"
namespace otb
{
......
......@@ -19,6 +19,7 @@
#define __otbImageListToRCC8GraphFilter_h
#include "otbRCC8GraphSource.h"
#include "otbImageList.h"
namespace otb
{
......
......@@ -31,6 +31,7 @@
#ifndef __itkFFTComplexToComplexImageFilter_hxx
#define __itkFFTComplexToComplexImageFilter_hxx
#include "itkFFTComplexToComplexImageFilter.h"
#if defined( ITK_USE_FFTWD ) || defined( ITK_USE_FFTWF )
#include "itkFFTWComplexToComplexImageFilter.h"
......@@ -40,7 +41,7 @@ namespace itk
{
#if defined( ITK_USE_FFTWD ) || defined( ITK_USE_FFTWF )
template< class TImage >
class FFTWComplexToComplexImageFilter;
class ::itk::FFTWComplexToComplexImageFilter;
#endif
template< class TImage >
......
......@@ -20,6 +20,7 @@
#include <boost/mpl/assert.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/remove_const.hpp>
#include "ogr_geometry.h"
......
......@@ -21,7 +21,8 @@
#include "otbBoostMachineLearningModel.h"
#include "otbOpenCVUtils.h"
// #include <opencv2/opencv.hpp>
#include <fstream>
#include "itkMacro.h"
namespace otb
{
......
......@@ -21,7 +21,8 @@
#include "otbDecisionTreeMachineLearningModel.h"
#include "otbOpenCVUtils.h"
// #include <opencv2/opencv.hpp>
#include <fstream>
#include "itkMacro.h"
namespace otb
{
......
......@@ -21,7 +21,8 @@
#include "otbGradientBoostedTreeMachineLearningModel.h"
#include "otbOpenCVUtils.h"
// #include <opencv2/opencv.hpp>
#include <fstream>
#include "itkMacro.h"
namespace otb
{
......
......@@ -18,12 +18,12 @@
#ifndef __otbNeuralNetworkMachineLearningModel_h
#define __otbNeuralNetworkMachineLearningModel_h
#include <opencv2/opencv.hpp>
#include "itkLightObject.h"
#include "itkFixedArray.h"
#include "otbMachineLearningModel.h"
class CvANN_MLP;
namespace otb
{
template <class TInputValue, class TTargetValue>
......
......@@ -18,10 +18,10 @@
#ifndef __otbNeuralNetworkMachineLearningModel_txx
#define __otbNeuralNetworkMachineLearningModel_txx
#include <fstream>
#include "otbNeuralNetworkMachineLearningModel.h"
#include "otbOpenCVUtils.h"
#include "itkMacro.h" // itkExceptionMacro
// #include <opencv2/opencv.hpp>
namespace otb
{
......
......@@ -18,11 +18,11 @@
#ifndef __otbNormalBayesMachineLearningModel_txx
#define __otbNormalBayesMachineLearningModel_txx
#include <fstream>
#include "itkMacro.h"
#include "otbNormalBayesMachineLearningModel.h"
#include "otbOpenCVUtils.h"
// #include <opencv2/opencv.hpp>
namespace otb
{
......
......@@ -18,10 +18,10 @@
#ifndef __otbOpenCVUtils_h
#define __otbOpenCVUtils_h
//#include <opencv2/opencv.hpp>
#include <opencv2/core/core_c.h>
#include <opencv2/core/core.hpp>
#include <opencv2/ml/ml.hpp>
#include "itkListSample.h"
namespace otb
{
......
......@@ -19,10 +19,9 @@
#define __otbRandomForestsMachineLearningModel_txx
#include <fstream>
#include "itkMacro.h"
#include "otbRandomForestsMachineLearningModel.h"
#include "otbOpenCVUtils.h"
// #include <opencv2/opencv.hpp> // opencv general include file