diff --git a/Applications/DisparityMap/otbStereoFramework.cxx b/Applications/DisparityMap/otbStereoFramework.cxx index 7f9877e1becc254815d75f6ed252260cc36ab511..c54eb137e61ec19a9b952f68838a14b16a2df960 100644 --- a/Applications/DisparityMap/otbStereoFramework.cxx +++ b/Applications/DisparityMap/otbStereoFramework.cxx @@ -545,8 +545,6 @@ private: TMetricFunctor>*subPixelFilter, TInputImage * leftImage, TInputImage * rightImage,TInputImage * leftMask,TInputImage * rightMask,TInputImage * finalMask, const bool minimize,double minDisp,double maxDisp) { typedef TMetricFunctor MetricFunctorType; - typedef otb::PixelWiseBlockMatchingImageFilter<TInputImage, TInputImage, TInputImage, TInputImage, - MetricFunctorType> BlockMatchingFilterType; typedef otb::SubPixelDisparityImageFilter<TInputImage, TInputImage, TInputImage, TInputImage, MetricFunctorType> SubPixelFilterType; diff --git a/Applications/Segmentation/otbLSMSVectorization.cxx b/Applications/Segmentation/otbLSMSVectorization.cxx index 0af4d304979247d339d6d5172ab626b28d3e649f..7b22a70db620a2f1a5b344fb736f69f9a49c035d 100644 --- a/Applications/Segmentation/otbLSMSVectorization.cxx +++ b/Applications/Segmentation/otbLSMSVectorization.cxx @@ -260,10 +260,6 @@ private: sqloss.str(""); sqloss<<"SELECT * FROM \""<<layername<<"\" ORDER BY label"; otb::ogr::Layer layerTmp=ogrDS->ExecuteSQL(sqloss.str().c_str(), NULL, NULL); - - bool goesOn = true; - int nbFeatures = layerTmp.ogr().GetFeatureCount(true); - int nb = 0; otb::ogr::Feature firstFeature = layerTmp.ogr().GetNextFeature(); //Geometry fusion @@ -360,5 +356,3 @@ private: } OTB_APPLICATION_EXPORT(otb::Wrapper::LSMSVectorization) - - diff --git a/Applications/Segmentation/otbSegmentation.cxx b/Applications/Segmentation/otbSegmentation.cxx index 8ba85e43c24aed3c604b21f9f21ffe3137b8fd4f..5b07a5c168e53ab6ccd336e1d1958a0c322d4aac 100644 --- a/Applications/Segmentation/otbSegmentation.cxx +++ b/Applications/Segmentation/otbSegmentation.cxx @@ -380,12 +380,6 @@ private: GenericApplySegmentation(otb::StreamingImageToOGRLayerSegmentationFilter<TInputImage, TSegmentationFilter> * streamingVectorizedFilter, TInputImage * inputImage, const otb::ogr::Layer& layer, const unsigned int outputNb) { - typedef TSegmentationFilter SegmentationFilterType; - typedef typename SegmentationFilterType::Pointer SegmentationFilterPointerType; - typedef otb::StreamingImageToOGRLayerSegmentationFilter - <TInputImage, - SegmentationFilterType> StreamingVectorizedSegmentationOGRType; - // Retrieve tile size parameter const unsigned int tileSize = static_cast<unsigned int> (this->GetParameterInt("mode.vector.tilesize")); // Retrieve the 8-connected option diff --git a/Applications/Utils/otbColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx index bae95de5e84814fb2de8838a0f6268782506f833..e6fff315bd8d2c0f5989ed3d8d9bf885361960b1 100644 --- a/Applications/Utils/otbColorMapping.cxx +++ b/Applications/Utils/otbColorMapping.cxx @@ -636,8 +636,6 @@ private: otbAppLogINFO("The map contains :"<<labelToMeanIntensityMap.size()<<" labels."<<std::endl); VectorPixelType color(3); - typedef itk::NumericTraits<FloatVectorImageType::InternalPixelType> NumericTraitsType; - for (mapIt = labelToMeanIntensityMap.begin(); mapIt != labelToMeanIntensityMap.end(); ++mapIt) @@ -827,5 +825,3 @@ private: } OTB_APPLICATION_EXPORT(otb::Wrapper::ColorMapping) - - diff --git a/Code/BasicFilters/otbPointSetExtractROI.txx b/Code/BasicFilters/otbPointSetExtractROI.txx index 2ac82c9e75505672c5904495b4cc2207f1bf6f6d..cca471af42f17b1de1551ab603418ff88224cdd5 100644 --- a/Code/BasicFilters/otbPointSetExtractROI.txx +++ b/Code/BasicFilters/otbPointSetExtractROI.txx @@ -54,11 +54,6 @@ PointSetExtractROI<TInputPointSet, TOutputPointSet> ::GenerateData(void) { typedef typename TInputPointSet::PointsContainer InputPointsContainer; - typedef typename TOutputPointSet::PointsContainer OutputPointsContainer; - - typedef typename TInputPointSet::PointDataContainer InputPointDataContainer; - typedef typename TOutputPointSet::PointDataContainer OutputPointDataContainer; - typedef typename TInputPointSet::PointsContainerPointer InputPointsContainerPointer; typedef typename TOutputPointSet::PointsContainerPointer OutputPointsContainerPointer; diff --git a/Code/DisparityMap/otbAdhesionCorrectionFilter.txx b/Code/DisparityMap/otbAdhesionCorrectionFilter.txx index e000e54b85f61f4952ae3a1a649099764b1f719d..8fd8030db24305299c1cc51d4ebe4504b546519d 100644 --- a/Code/DisparityMap/otbAdhesionCorrectionFilter.txx +++ b/Code/DisparityMap/otbAdhesionCorrectionFilter.txx @@ -571,7 +571,7 @@ AdhesionCorrectionFilter<TImage, TMask> } index_pos = new_disparityIt.GetIndex(); old_disparityIt.SetIndex(index_pos); - double disp = old_disparityIt.Get(); +// double disp = old_disparityIt.Get(); while (new_disparityIt.GetIndex()[0]<static_cast<int>(outputPtr->GetRequestedRegion().GetSize()[0]) + outputPtr->GetRequestedRegion().GetIndex()[0] - 1) { index_pos = new_disparityIt.GetIndex(); @@ -930,7 +930,7 @@ AdhesionCorrectionFilter<TImage, TMask> int Count; int big_win = win + 1; - int half_big_win = (2*big_win +1)*(2*big_win +1) /2; +// int half_big_win = (2*big_win +1)*(2*big_win +1) /2; double Tol2 = m_Tolerance/2; new_disparityIt.GoToBegin(); diff --git a/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.txx index 3a6817ac906131974dcbadd1e0c4642c199b9c9e..5c080f9c277ca804110fcb068664a9c0efa64efc 100644 --- a/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.txx +++ b/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.txx @@ -45,7 +45,6 @@ BSplinesInterpolateDisplacementFieldGenerator<TPointSet, TDisplacementField> typedef itk::Vector<ValueType, 2> VectorType; typedef otb::Image<VectorType, DisplacementFieldType::ImageDimension> ImageType; typedef itk::LandmarkDisplacementFieldSource<ImageType> DisplacementFieldSourceType; - typedef typename DisplacementFieldSourceType::LandmarkContainerPointer LandmarkContainerPointer; typedef typename DisplacementFieldSourceType::LandmarkContainer LandmarkContainerType; typedef typename DisplacementFieldSourceType::LandmarkPointType LandmarkPointType; typedef typename PointSetType::PointsContainer PointsContainer; diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx index 118afce01c4dc7466cdf97b9a8e626a4ea9474d9..3311ed700c8582fd81ae796b1c9bda6721427290 100644 --- a/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx +++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx @@ -62,7 +62,6 @@ BSplinesInterpolateTransformDisplacementFieldGenerator<TPointSet, TDisplacementF typedef otb::ObjectList<BSplinerType> SPlineInterpolatorListType; typedef typename PointSetType::PointsContainer::ConstIterator PointSetIteratorType; - typedef typename PointSetType::PointsContainer PointsContainerType; // Initialization of the splines interpolator typename SPlineInterpolatorListType::Pointer splineIntList = SPlineInterpolatorListType::New(); diff --git a/Code/DisparityMap/otbDisparityMapToDEMFilter.txx b/Code/DisparityMap/otbDisparityMapToDEMFilter.txx index f540dd079edce0dd988ea089e87a04657561c9fc..18cb0bc8de48ba0216d25abc64a0c3c44e86db7d 100644 --- a/Code/DisparityMap/otbDisparityMapToDEMFilter.txx +++ b/Code/DisparityMap/otbDisparityMapToDEMFilter.txx @@ -667,14 +667,11 @@ template <class TDisparityImage, class TInputImage, class TOutputDEMImage, class TEpipolarGridImage, class TMaskImage> void DisparityMapToDEMFilter<TDisparityImage,TInputImage,TOutputDEMImage,TEpipolarGridImage,TMaskImage> -::ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) +::ThreadedGenerateData(const RegionType & itkNotUsed(outputRegionForThread), itk::ThreadIdType threadId) { const TDisparityImage * horizDisp = this->GetHorizontalDisparityMapInput(); const TDisparityImage * vertiDisp = this->GetVerticalDisparityMapInput(); - const TInputImage * leftSensor = this->GetLeftInput(); - const TInputImage * rightSensor = this->GetRightInput(); - const TMaskImage * disparityMask = this->GetDisparityMaskInput(); const TOutputDEMImage * outputDEM = this->GetDEMOutput(); diff --git a/Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.txx b/Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.txx index 31db3079edbd832a5ac7b468a68384b3f5b44d0a..22f088c18e828dd3360d60017f488543af2eb764 100644 --- a/Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.txx +++ b/Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.txx @@ -98,7 +98,7 @@ PointSetToDisplacementFieldGenerator<TPointSet, TDisplacementField> unsigned int j = 0; typedef typename PointSetType::PointsContainer::ConstIterator PointSetIteratorType; - typedef typename PointSetType::PointsContainer PointsContainerType; + PointSetIteratorType it = this->GetPointSet()->GetPoints()->Begin(); for (; it != this->GetPointSet()->GetPoints()->End(); ++it) { diff --git a/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.txx b/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.txx index 77a316cae1a91115c3ef4b48e5ec4c70ca937581..40a3289c2b76c0215993cdd8282a168017127797 100644 --- a/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.txx +++ b/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.txx @@ -316,7 +316,6 @@ StereoSensorModelToElevationFilter<TInputImage, TOutputHeight> { // Retrieve pointers const InputImageType* masterPtr = this->GetMasterInput(); - const InputImageType* slavePtr = this->GetSlaveInput(); OutputImageType* outputPtr = this->GetOutput(); OutputImageType* correlPtr = this->GetCorrelationOutput(); diff --git a/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.txx b/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.txx index 11eebf926017b32f7560b39266920f3959615adc..aa66e6ec4d4efebdfeedc4bb8041aeba2d2a0356 100644 --- a/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.txx +++ b/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.txx @@ -213,7 +213,6 @@ StereorectificationDisplacementFieldSource<TInputImage, TOutputImage> { double a = (leftEpiLineEnd[1] - leftEpiLineStart[1]) / (leftEpiLineEnd[0] - leftEpiLineStart[0]); - double b = leftEpiLineStart[1] - a * leftEpiLineStart[0]; if (leftEpiLineEnd[0] > leftEpiLineStart[0]) { alpha = vcl_atan(a); diff --git a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx b/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx index a88b9d9412e009eee573ea62bdec119acc69e1aa..2c9e23b6af4706199c9ab7047b748d43c89d5ea7 100644 --- a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx +++ b/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx @@ -367,10 +367,6 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor> const TDisparityImage * inHDispPtr = this->GetHorizontalDisparityInput(); const TDisparityImage * inVDispPtr = this->GetVerticalDisparityInput(); - const TOutputMetricImage * outMetricPtr = this->GetMetricOutput(); - const TDisparityImage * outHDispPtr = this->GetHorizontalDisparityOutput(); - const TDisparityImage * outVDispPtr = this->GetVerticalDisparityOutput(); - // Check pointers before using them if(!inLeftPtr || !inRightPtr) { @@ -468,9 +464,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor> TDisparityImage * inHDispPtr = const_cast<TDisparityImage * >(this->GetHorizontalDisparityInput()); TDisparityImage * inVDispPtr = const_cast<TDisparityImage * >(this->GetVerticalDisparityInput()); - TOutputMetricImage * outMetricPtr = this->GetMetricOutput(); TDisparityImage * outHDispPtr = this->GetHorizontalDisparityOutput(); - TDisparityImage * outVDispPtr = this->GetVerticalDisparityOutput(); // Retrieve requested region (TODO: check if we need to handle // region for outHDispPtr) diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx index 462c017ea7bb9e2f2986042afacd14df11f30688..819027fab4f99b048cd04bffde1a2fc268fc983b 100644 --- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx +++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx @@ -892,8 +892,7 @@ void ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet> ::PrintSelf(std::ostream& os, itk::Indent indent) const { - typedef typename TOutputPointSet::PointsContainerConstIterator PointsIteratorType; - typedef typename TOutputPointSet::PointDataContainerIterator PointsDataIteratorType; + typedef itk::ProcessObject ProcessObjectType; const OutputPointSetType* output = dynamic_cast<const OutputPointSetType*>(this->ProcessObjectType::GetOutput(0)); diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx index 52bdf76999751f40a934d7ea83f646f49a5e6068..bdf1796f03843ff141fa4f497df0b62f53cb055b 100644 --- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx +++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx @@ -155,8 +155,6 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off; itk::ImageRegionIterator<OutputImageType> it; itk::ImageRegionIterator<OutputImageType> itdir; - typedef itk::ImageRegionIterator<InputImageType> InputIteratorType; - typedef itk::ImageRegionConstIterator<InputImageType> ConstInputIteratorType; // Allocate output typename OutputImageType::Pointer output = this->GetOutput(); diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx index cae40a20211c7402eca70474866001bddc85ef1c..727fd0240e2b31c42847e1913767395692405296 100644 --- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx +++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx @@ -45,7 +45,6 @@ NeighborhoodScalarProductFilter<TInputImage, TOutputModulus, TOutputDirection> typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType; typedef typename NeighborhoodIteratorType::RadiusType RadiusType; typedef typename NeighborhoodIteratorType::OffsetType OffsetType; - typedef itk::ZeroFluxNeumannBoundaryCondition<InputImageType> BoundaryConditionType; typedef itk::ImageRegionIterator<OutputModulusType> OutputIteratorType; typedef itk::ImageRegionIterator<OutputDirectionType> OutputDirectionIteratorType; typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> BoundaryFacesCalculatorType; diff --git a/Code/Fuzzy/otbMassOfBelief.txx b/Code/Fuzzy/otbMassOfBelief.txx index a4d5ca94dbaa59cfc22842afb53b22d364125262..6a453de2ae9296fbc1700536ebbb5b4f1f45e238 100644 --- a/Code/Fuzzy/otbMassOfBelief.txx +++ b/Code/Fuzzy/otbMassOfBelief.txx @@ -428,7 +428,6 @@ MassOfBelief<TLabel, TMass> const LabelSetOfSetType & labelSet) { // Define an iterator on the label set - typedef std::set<TLabel> LabelSetType; typename LabelSetOfSetType::const_iterator it = labelSet.begin(); // Open the set diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.txx b/Code/MultiScale/otbMorphologicalPyramidResampler.txx index e6b86d06bccc1bba5702903576407ff85345c7f3..be6a8a66d3166fad8445d51d91ac3ce229ad395e 100644 --- a/Code/MultiScale/otbMorphologicalPyramidResampler.txx +++ b/Code/MultiScale/otbMorphologicalPyramidResampler.txx @@ -125,8 +125,6 @@ Resampler<TInputImage, TOutputImage> typedef itk::ResampleImageFilter<InputImageType, OutputImageType> ResampleFilterType; typedef itk::ScalableAffineTransform<double, InputImageType::ImageDimension> TransformType; typedef itk::LinearInterpolateImageFunction<InputImageType, double> InterpolatorType; - typedef itk::ImageRegionConstIterator<OutputImageType> ConstIteratorType; - typedef itk::ImageRegionIterator<OutputImageType> IteratorType; // Resampling filter creation typename ResampleFilterType::Pointer resampler = ResampleFilterType::New(); @@ -145,7 +143,7 @@ Resampler<TInputImage, TOutputImage> translation[0] = 0.5 * inputSpacing[0] * (scales[0] - 1.0); translation[1] = 0.5 * inputSpacing[1] * (scales[1] - 1.0); transform->SetTranslation(translation); - + // Resampling filter set up resampler->SetTransform(transform); diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx b/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx index cc6c1bd11efaf9f4cc3acddffea981933a5176de..ed5d99c92aacc79f078c5d34f35c17d3f24688d5 100644 --- a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx +++ b/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx @@ -159,7 +159,6 @@ Segmenter<TInputImage, TOutputImage> typedef itk::PointSet<InputPixelType, InputImageType::ImageDimension> PointSetType; typedef otb::ThresholdImageToPointSetFilter<InputImageType, PointSetType> PointSetFilterType; typedef typename PointSetType::PointsContainer::Iterator PointSetIteratorType; - typedef typename PointSetType::PointType PointType; // Typedefs for segmentation typedef itk::ConnectedThresholdImageFilter<InputImageType, InputImageType> ConnectedFilterType; @@ -169,7 +168,6 @@ Segmenter<TInputImage, TOutputImage> // Typedefs for statistics computation typedef itk::Statistics::ScalarImageToHistogramGenerator<InputImageType> HistGeneratorType; - typedef typename HistGeneratorType::HistogramType HistogramType; ///////////////////////////////////// //// Details image enhancement ////// diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Code/MultiScale/otbWaveletFilterBank.txx index 0ec3afdc185226e3e215b5dd00baf7474bdb9fbc..8d2cb6def50dd0b855d948866d7040c1ab8f5783 100644 --- a/Code/MultiScale/otbWaveletFilterBank.txx +++ b/Code/MultiScale/otbWaveletFilterBank.txx @@ -960,7 +960,6 @@ WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE> // typedef for the iterations over the input image typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType; typedef itk::NeighborhoodInnerProduct<OutputImageType> InnerProductType; - typedef itk::ImageRegionIterator<OutputImageType> IteratorType; // Faces iterations typename NeighborhoodIteratorType::RadiusType radiusMax; @@ -1137,8 +1136,6 @@ WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE> // typedef for the iterations over the input image typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType; typedef itk::NeighborhoodInnerProduct<OutputImageType> InnerProductType; - typedef itk::ImageRegionIterator<OutputImageType> IteratorType; - // Faces iterations typename NeighborhoodIteratorType::RadiusType radiusMax; for (unsigned int i = 0; i < InputImageDimension; ++i) diff --git a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx index 3ffe5aa92b3448a40a1093b0b19f40a5eac0eb71..1b79e75a56c8206efa9c5388032f7966f7a95e18 100644 --- a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx +++ b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx @@ -141,7 +141,7 @@ void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap> //m_VectorDataProperties->SetBoundingRegion(region); //Compute the global bounding box of the vectordata m_VectorDataProperties->ComputeBoundingRegion(); - + // Compute origin and size SizeType size; SpacingType spacing = this->GetInput()->GetSpacing(); @@ -156,7 +156,7 @@ void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap> size[i] = static_cast<unsigned long>(vcl_ceil(vcl_abs( m_VectorDataProperties->GetBoundingRegion().GetSize(i)/spacing[i]))); } - + outputLargestPossibleRegion.SetSize(size); outputLargestPossibleRegion.SetIndex(m_StartIndex); @@ -334,9 +334,8 @@ VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap> typedef typename PolygonType::RegionType RSRegionType; typedef typename PolygonType::VertexType VertexType; typedef typename IndexType::IndexValueType IndexValueType; - typedef typename VertexType::ValueType VertexValueType; RSRegionType polygonExtRingBoundReg = correctPolygonExtRing->GetBoundingRegion(); - + IndexType startIdx,endIdx,tmpIdx; OriginType physCorners[4]; physCorners[0][0] = polygonExtRingBoundReg.GetOrigin(0); @@ -344,12 +343,12 @@ VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap> physCorners[1] = physCorners[0]; physCorners[2] = physCorners[0]; physCorners[3] = physCorners[0]; - + physCorners[1][1] += polygonExtRingBoundReg.GetSize(1); physCorners[2][1] += polygonExtRingBoundReg.GetSize(1); physCorners[2][0] += polygonExtRingBoundReg.GetSize(0); physCorners[3][0] += polygonExtRingBoundReg.GetSize(0); - + for (unsigned int k=0; k<4; ++k) { this->GetOutput()->TransformPhysicalPointToIndex(physCorners[k],tmpIdx); @@ -382,7 +381,7 @@ VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap> // No intersection break; } - + OriginType tmpPoint; VertexType vertex; for (IndexValueType j=startIdx[1]; j<=endIdx[1]; ++j) diff --git a/Code/Projections/otbVectorDataIntoImageProjectionFilter.txx b/Code/Projections/otbVectorDataIntoImageProjectionFilter.txx index cc0c0eef0a58a77a4ebc32799a4a92d193d52678..0f88a55677485da06466ecaee73f8fefe7659815 100644 --- a/Code/Projections/otbVectorDataIntoImageProjectionFilter.txx +++ b/Code/Projections/otbVectorDataIntoImageProjectionFilter.txx @@ -117,7 +117,6 @@ VectorDataIntoImageProjectionFilter<TInputVectorData, TInputImage> { m_VdExtractFilter->SetInput(this->GetInput()); - typedef typename ImageType::IndexType IndexType; typedef typename ImageType::PointType PointType; typedef typename ImageType::SizeType SizeType; diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx index 27aaaae2198d61faca63042d62118b2197aacf7d..fd25930bc7b48d87af48f9913e7db57eeeb563c8 100644 --- a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx +++ b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx @@ -149,7 +149,7 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph> typedef PolygonToPolygonRCC8Calculator<PathType> RCC8CalculatorType; typedef RCC8VertexIterator<OutputGraphType> VertexIteratorType; typedef RCC8InEdgeIterator<OutputGraphType> InEdgeIteratorType; - typedef RCC8OutEdgeIterator<OutputGraphType> OutEdgeIteratorType; + // Vector of label std::vector<PixelType> maxLabelVector; diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx index d2e11134d9c9b2499695ffd9fd60182e72946d24..3b05447069235b45b52f4ae8f3fcc16e3959e492 100644 --- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx +++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx @@ -337,7 +337,7 @@ ImageToImageRCC8Calculator<TInputImage> { /// Definition of the filters used typedef itk::AndImageFilter<BoolImageType, BoolImageType, BoolImageType> AndFilterType; - typedef itk::MinimumMaximumImageCalculator<BoolImageType> MinMaxCalculatorType; + /// Declaration and instantiation typename AndFilterType::Pointer andFilter = AndFilterType::New(); /// The exterior is the inverted input image diff --git a/Code/Testing/otbTestHelper.cxx b/Code/Testing/otbTestHelper.cxx index d57828156bf18f75aa8b4d46feb6a7f3016d4f4d..963c53d49da702c55f7326062ddf35a935834a7b 100644 --- a/Code/Testing/otbTestHelper.cxx +++ b/Code/Testing/otbTestHelper.cxx @@ -594,8 +594,6 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons // Use the factory mechanism to read the test and baseline files and convert them to double typedef otb::VectorImage<double, 2> ImageType; - typedef otb::VectorImage<unsigned char, 2> OutputType; - typedef otb::VectorImage<unsigned char, 2> DiffOutputType; typedef otb::ImageFileReader<ImageType> ReaderType; // Read the baseline file @@ -662,7 +660,6 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons if (status.GetSquaredNorm() > 0 && m_ReportErrors) { typedef otb::PrintableImageFilter<ImageType> RescaleType; - typedef RescaleType::OutputImageType OutputType; typedef otb::ImageFileWriter<RescaleType::OutputImageType> WriterType; RescaleType::Pointer rescale = RescaleType::New(); diff --git a/Code/Testing/otbTestMain.h b/Code/Testing/otbTestMain.h index 5757dafd13f8d80e3986a8ba3b8ddb4a1cf5afcf..4293417b99234660ae6a96f45469593122e6fc98 100644 --- a/Code/Testing/otbTestMain.h +++ b/Code/Testing/otbTestMain.h @@ -72,8 +72,6 @@ int main(int ac, char* av[]) double epsilonBoundary(0.0); typedef otb::TestHelper::StringList StringList; - typedef otb::TestHelper::StringListIt StringListIt; - StringList baselineFilenamesBinary; StringList testFilenamesBinary; StringList baselineFilenamesMetaData; diff --git a/Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx index aebd3a6a2f8a5ab67892162f80835be4211daf78..6e2124fa08f66cbc5747aa20218b615bba7ef350 100644 --- a/Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx +++ b/Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx @@ -24,7 +24,6 @@ int otbWrapperApplicationNew(int argc, char* argv[]) { typedef otb::Wrapper::Application ApplicationType; - //ApplicationType::Pointer application = ApplicationType::New(); - +// ApplicationType application = ApplicationType::New(); return EXIT_SUCCESS; } diff --git a/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx b/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx index 79054be34c8b8b13df0b4b0d26be215a6f436814..9146583e631c7adbf3066d66af2af432447327e6 100644 --- a/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx +++ b/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx @@ -34,8 +34,6 @@ int otbChangeLabelImageFilter(int itkNotUsed(argc), char * argv[]) typedef otb::VectorImage<PixelType, ImageDimension> OutputImageType; typedef InputImageType::PixelType InputPixelType; typedef OutputImageType::PixelType OutputPixelType; - typedef itk::ImageRegionIteratorWithIndex<InputImageType> InputIteratorType; - typedef itk::ImageRegionIteratorWithIndex<OutputImageType> OutputIteratorType; typedef otb::ChangeLabelImageFilter<InputImageType, OutputImageType> FilterType; typedef otb::ImageFileWriter<OutputImageType> WriterType; typedef otb::ImageFileReader<InputImageType> ReaderType; diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx b/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx index 83f3b8a19f4c295a65756bee3b014daf8b2a0d1b..4c93bbaf2e0cbf978314ccf2edea2365e90853b6 100644 --- a/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx +++ b/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx @@ -41,7 +41,6 @@ int otbEdgeDensityImageFilter(int itkNotUsed(argc), char* argv[]) typedef float PixelType; typedef otb::Image<PixelType, Dimension> ImageType; - typedef ImageType::IndexType IndexType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx index e1001c5772a6b6807475538d50cbe14c0453feae..33f20c3887d853b792ee664499b847a1660efe85 100644 --- a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx @@ -27,8 +27,6 @@ int otbEdgeDensityImageFilterNew(int, char*[]) typedef float PixelType; typedef otb::Image<PixelType, Dimension> ImageType; - typedef ImageType::IndexType IndexType; - typedef otb::BinaryImageDensityFunction<ImageType> CountFunctionType; typedef itk::CannyEdgeDetectionImageFilter<ImageType, ImageType> CannyDetectorType; diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx index 34b736c6d0a677095748f319abbfcc0089adf730..adad37ba1db27e0d0ba53ba4e2bf2307b50d804d 100644 --- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx @@ -60,9 +60,6 @@ int otbFunctionWithNeighborhoodToImageFilterNew(int itkNotUsed(argc), char ** it const unsigned int Dimension = 2; typedef double PixelType; typedef otb::Image<PixelType, Dimension> ImageType; - typedef itk::VariableLengthVector<double> VectorType; - typedef itk::ConstNeighborhoodIterator<ImageType> IteratorType; - typedef TextureFunctorTest<PixelType, PixelType> FunctorType; typedef otb::TextureImageFunction<ImageType, FunctorType> FunctionType; typedef otb::FunctionWithNeighborhoodToImageFilter<ImageType, ImageType, FunctionType> FilterType; diff --git a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx index 2397392e1f8fdf418077b420fd679f0c035e677a..1fbffe8540af496ee213476f390a12d24a34fcbd 100644 --- a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx +++ b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx @@ -77,11 +77,6 @@ int otbImagePCAShapeModelEstimatorTest(int itkNotUsed(argc), char* argv[]) //------------------------------------------------------ typedef otb::Image<double, NDIMENSION> InputImageType; typedef otb::Image<double, NDIMENSION> OutputImageType; - typedef - itk::ImageRegionIterator<InputImageType> InputImageIterator; - - typedef - itk::ImageRegionIterator<OutputImageType> OutputImageIterator; typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; diff --git a/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx b/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx index 10a5d1bd62ec78c338460d7dcd56a8f506d6463f..6a8154e4dfa8c0400bb5f85eb25aef64396da1ac 100644 --- a/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx +++ b/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx @@ -30,7 +30,6 @@ int otbImageToPointSetFilterTest(int itkNotUsed(argc), char **itkNotUsed(argv)) typedef otb::Image<PixelType, Dimension> ImageType; typedef itk::PointSet<PixelType, Dimension> PointSetType; - typedef otb::ImageToPointSetFilter<ImageType, PointSetType> FunctionType; //FunctionType::Pointer function = FunctionType::New(); diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx index 9a5902f892a1055f3d770db4f4c9cf6a21e9c67e..b0954d855b88fab150b5cb7f2ebddbcd78c2d049 100644 --- a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx @@ -31,7 +31,6 @@ int otbKeyPointDensityImageFilterNew(int, char*[]) typedef float PixelType; typedef otb::Image<PixelType, Dimension> ImageType; - typedef ImageType::IndexType IndexType; typedef itk::VariableLengthVector<PixelType> RealVectorType; typedef itk::PointSet<RealVectorType, Dimension> PointSetType; typedef otb::ImageToSIFTKeyPointSetFilter<ImageType, PointSetType> DetectorType; diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx index 0dbcc1f9055eded6f779cc3476c0f02af125429d..0ce486789c7b696a7a317f4ae2d8ac91d28e2856 100644 --- a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx +++ b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx @@ -39,7 +39,6 @@ int otbKeyPointDensityImageFilterTest(int itkNotUsed(argc), char* argv[]) typedef float PixelType; typedef otb::Image<PixelType, Dimension> ImageType; - typedef ImageType::IndexType IndexType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; typedef itk::VariableLengthVector<PixelType> RealVectorType; diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx b/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx index 884a7f4216a07804fb11d8a3545349080cfe5a08..b9fb53075216d44d48196863acd211be30cce722 100644 --- a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx +++ b/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx @@ -46,7 +46,6 @@ int otbLabelImageRegionMergingFilter(int argc, char * argv[]) const unsigned int Dimension = 2; typedef float PixelType; - typedef double KernelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx b/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx index d0500617504773373285e60dd43798423b372fc8..d4f9af0dced1f7a26a406f2f6535e987951f40d9 100644 --- a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx +++ b/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx @@ -48,7 +48,6 @@ int otbLabelImageRegionPruningFilter(int argc, char * argv[]) const unsigned int Dimension = 2; typedef float PixelType; - typedef double KernelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; diff --git a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx b/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx index 2ea212113f11e96fa366bf160ef35b6507e3ed66..395ec2310f866c9fef420dc028f56e8bd8fa3b73 100644 --- a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx +++ b/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx @@ -45,7 +45,6 @@ int otbLabelObjectOpeningMuParserFilterTest(int itkNotUsed(argc), char * argv[]) typedef unsigned int LabelType; typedef otb::Image<LabelType, Dimension> LabelImageType; typedef otb::VectorImage<InputPixelType, Dimension> InputVectorImageType; - typedef otb::ImageFileReader<InputVectorImageType> ReaderType; typedef otb::ImageFileReader<InputVectorImageType> ImageReaderType; typedef otb::ImageFileReader<LabelImageType> LabelImageReaderType; diff --git a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx b/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx index 6ac3b184557e5475656c133a1dbec93d18a96d84..69e80f1601120fe94f88b3e17bdde8f8005c4b83 100644 --- a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx +++ b/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx @@ -26,7 +26,6 @@ int otbListSampleToHistogramListGenerator(int itkNotUsed(argc), char * argv[]) typedef double PixelType; typedef otb::VectorImage<PixelType> VectorImageType; typedef VectorImageType::PixelType VectorPixelType; - typedef VectorImageType::SizeType SizeType; typedef itk::Statistics::ListSample<VectorPixelType> ListSampleType; typedef otb::ListSampleToHistogramListGenerator <ListSampleType, PixelType> HistogramGeneratorType; diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx index e9fc2b741a12f32a6ff6e032d02546587fba4c10..0b069bab8682a7772f8fcbbde6454c4b6ae15f03 100644 --- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx +++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx @@ -32,7 +32,6 @@ int otbMatrixTransposeMatrixImageFilter(int itkNotUsed(argc), char * argv[]) //typedef double InputPixelType; //typedef double OutputPixelType; typedef unsigned char InputPixelType; - typedef unsigned char OutputPixelType; typedef otb::VectorImage<InputPixelType, Dimension> InputImage1Type; typedef otb::VectorImage<InputPixelType, Dimension> InputImage2Type; diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx index 5fe6c799f13a9d838dcfe848acd4645c8229d8d0..6ee3aba0405bf451695f6fd87d63ab8e32ac8fb5 100644 --- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx +++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx @@ -25,7 +25,6 @@ int otbMatrixTransposeMatrixImageFilterNew(int itkNotUsed(argc), char ** itkNotU { const unsigned int Dimension = 2; typedef unsigned char InputPixelType; - typedef unsigned char OutputPixelType; typedef otb::VectorImage<InputPixelType, Dimension> InputImage1Type; typedef otb::VectorImage<InputPixelType, Dimension> InputImage2Type; diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx index 6870c1c3b0dbba560fafefbfbcb18f8fd856f351..b6b07016be2a0a9dea70f3f7bfa5c3cd8a3325fe 100644 --- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx +++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx @@ -51,7 +51,6 @@ int otbMeanShiftSmoothingImageFilter(int argc, char * argv[]) const unsigned int Dimension = 2; typedef float PixelType; - typedef double KernelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx index b6bb2888ea8d6a70a9aceda8f59d35d927f8e5e7..e9514f3225d2e7268aee03fe03f81e62fe0bd0e1 100644 --- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx +++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx @@ -53,14 +53,11 @@ int otbMeanShiftSmoothingImageFilterSpatialStability(int argc, char * argv[]) const unsigned int Dimension = 2; typedef float PixelType; - typedef double KernelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::MeanShiftSmoothingImageFilter<ImageType, ImageType> FilterType; - typedef FilterType::OutputIterationImageType IterationImageType; typedef FilterType::OutputSpatialImageType SpatialImageType; typedef SpatialImageType::InternalPixelType SpatialPixelType; - typedef FilterType::OutputLabelImageType LabelImageType; typedef otb::MultiChannelExtractROI<PixelType,PixelType> ExtractROIFilterType; typedef otb::MultiChannelExtractROI<SpatialPixelType,SpatialPixelType> SpatialExtractROIFilterType; diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx index 5e987019e2cdba13e4defb84e31664644d9cd240..0fa0c32604c5e7ff32f8356e620dbe86aa5e5b96 100644 --- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx +++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx @@ -41,7 +41,6 @@ int otbMeanShiftSmoothingImageFilterThreading(int argc, char * argv[]) const unsigned int Dimension = 2; typedef float PixelType; - typedef double KernelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; diff --git a/Testing/Code/BasicFilters/otbPointSetExtractROITest.cxx b/Testing/Code/BasicFilters/otbPointSetExtractROITest.cxx index 9e0fb03a89e807fe42cc51b59851abb9a5fc232e..8f93b4ced600869107fc4cf5216e2faae6d662e4 100644 --- a/Testing/Code/BasicFilters/otbPointSetExtractROITest.cxx +++ b/Testing/Code/BasicFilters/otbPointSetExtractROITest.cxx @@ -26,7 +26,6 @@ int otbPointSetExtractROITest(int, char*[]) typedef float PixelType; typedef itk::PointSet<PixelType, 2> PointSetType; typedef PointSetType::PointsContainer PointsContainerType; - typedef PointSetType::PointsContainerPointer PointsContainerPointer; typedef PointSetType::PointType PointType; typedef otb::RandomPointSetSource<PointSetType> PointSetSource; diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx index 017a24edc73cf5dfd408a87db3cad9012ca37ce7..f8165cd59b479e46bebaffe03f9ad35377910805 100644 --- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx +++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx @@ -46,9 +46,6 @@ int otbStreamingResampleImageFilterWithAffineTransform(int argc, char* argv[]) const char * outfname = argv[3]; unsigned int isize = atoi(argv[2]); - typedef itk::Transform< - InternalPixelType, Dimension, Dimension> TransformType; - typedef itk::AffineTransform< InternalPixelType, Dimension> AffineTransformType; typedef otb::ImageFileReader<ImageType> ReaderType; diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Testing/Code/Common/otbConfigurationTest.cxx index 53ad760dd36d9db6fad198ea87c17a551677ab0f..c406c310a87c78a2926af1140b0fd530632bb508 100644 --- a/Testing/Code/Common/otbConfigurationTest.cxx +++ b/Testing/Code/Common/otbConfigurationTest.cxx @@ -53,7 +53,6 @@ int otbConfigurationTest(int itkNotUsed(argc), char ** itkNotUsed(argv)) int otbConfigurationTestDEM(int argc, char *argv[]) { - typedef otb::ConfigurationFile ConfigurationType; std::string demDir = otb::ConfigurationFile::GetInstance()->GetDEMDirectory(); if (argc > 1) diff --git a/Testing/Code/Common/otbLabelImageToOGRDataSourceFilter.cxx b/Testing/Code/Common/otbLabelImageToOGRDataSourceFilter.cxx index a9b7ed466e941c6cb0bb8b50f46e87c7fdaba977..d16cca105e2e25544831ab0771f174383a843e59 100644 --- a/Testing/Code/Common/otbLabelImageToOGRDataSourceFilter.cxx +++ b/Testing/Code/Common/otbLabelImageToOGRDataSourceFilter.cxx @@ -46,7 +46,6 @@ int otbLabelImageToOGRDataSourceFilter(int argc, char * argv[]) return EXIT_FAILURE; } const char * infname = argv[1]; - const char * outfname = argv[2]; const unsigned int Dimension = 2; typedef unsigned short LabelType; diff --git a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx index 13261cbd8507b008aa25a3320959824c6604b603..eab97a3165ad13891809e19b19241a4f4200b831 100644 --- a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx +++ b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx @@ -32,7 +32,6 @@ int otbPathListToHistogramGenerator(int itkNotUsed(argc), char * argv[]) const unsigned int Dimension = 2; typedef itk::PolyLineParametricPath<Dimension> PathType; typedef PathType::Pointer PathPointer; - typedef PathType::ConstPointer PathConstPointerType; typedef otb::ObjectList<PathType> PathListType; typedef otb::OrientationPathFunction<PathType> FunctionType; diff --git a/Testing/Code/Common/otbPolyLineImageConstIterator.cxx b/Testing/Code/Common/otbPolyLineImageConstIterator.cxx index 1f16f44eb3d3cd4d0c1be36459b320d607ac1684..815f59a80ddcacc1d7c9da5ab9e25779988a7bd9 100644 --- a/Testing/Code/Common/otbPolyLineImageConstIterator.cxx +++ b/Testing/Code/Common/otbPolyLineImageConstIterator.cxx @@ -39,8 +39,6 @@ int otbPolyLineImageConstIterator(int argc, char * argv[]) typedef otb::Image<PixelType, Dimension> ImageType; typedef itk::PolyLineParametricPath<Dimension> PathType; typedef PathType::VertexType VertexType; - typedef otb::PolyLineImageIterator<ImageType, PathType> IteratorType; - typedef otb::PolyLineImageConstIterator<ImageType, PathType> ConstIteratorType; ImageType::SizeType size; diff --git a/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx b/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx index 41c0aced8c0df8de3f6955205b136a7c7c827352..df5f69d20b08302e6b6cb9b2f1b753d739fbce99 100644 --- a/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx +++ b/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx @@ -37,7 +37,6 @@ int otbPolygonizationRasterizationTest(int itkNotUsed(argc), char * argv[]) typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::VectorData<> VectorDataType; - typedef otb::VectorDataFileReader<VectorDataType> VDReaderType; typedef otb::LabelImageToVectorDataFilter<ImageType> LabelImageToVDFilterType; typedef otb::VectorDataToLabelImageFilter<VectorDataType, diff --git a/Testing/Code/Common/otbRectangle.cxx b/Testing/Code/Common/otbRectangle.cxx index 79c52cdff8772a2dee54acb532272b3f95c92189..0c6b821d1c9fd2ed50ed52aa57259ea2f8d804ee 100644 --- a/Testing/Code/Common/otbRectangle.cxx +++ b/Testing/Code/Common/otbRectangle.cxx @@ -26,8 +26,6 @@ int otbRectangle(int itkNotUsed(argc), char * argv[]) typedef otb::Rectangle<> RectangleType; typedef RectangleType::ContinuousIndexType ContinuousIndexType; - typedef RectangleType::VertexListType VertexListType; - typedef VertexListType::ConstIterator IteratorType; // Instantiating object RectangleType::Pointer rectangle1 = RectangleType::New(); diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx index bff07bc368ab0c3d80975aae5f6cbe0c031398e0..816e01e43e077c5d08a532506e4866aa722ea690 100644 --- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx +++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx @@ -72,10 +72,8 @@ int otbUnaryFunctorNeighborhoodWithOffsetImageFilter(int itkNotUsed(argc), char const int Dimension = 2; typedef otb::VectorImage<InputPixelType, Dimension> ImageType; typedef ImageType::OffsetType OffsetType; - typedef ImageType::PixelType PixelType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; - typedef itk::ConstNeighborhoodIterator<ImageType> IterType; typedef Functor::UnaryFunctorNeighborhoodWithOffseImageFilterTest<InputPixelType, InputPixelType> FunctorType; typedef otb::UnaryFunctorNeighborhoodWithOffsetImageFilter<ImageType, ImageType, FunctorType> UnaryFunctorNeighborhoodImageFilterType; diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx index e4b4b3ce96c04507fc8fbca8a0cc4eb7bd1e4e45..698ef144b180d4be27ce004de37d876c8e3901d7 100644 --- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx +++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx @@ -69,9 +69,6 @@ int otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew(int itkNotUsed(argc), ch const int Dimension = 2; typedef otb::VectorImage<InputPixelType, Dimension> ImageType; - typedef ImageType::PixelType - PixelType; - typedef itk::ConstNeighborhoodIterator<ImageType> IterType; typedef Functor::UnaryFunctorNeighborhoodWithOffsetImageFilterFunctorNewTest<InputPixelType, InputPixelType> FunctorType; typedef otb::UnaryFunctorNeighborhoodWithOffsetImageFilter<ImageType, ImageType, diff --git a/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx b/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx index 24ba0cf38b46aaabd23ecc29a3616a7909c68206..63ad8b61f1e527e462e0817340e90f2ea9feacb5 100644 --- a/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx +++ b/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx @@ -76,9 +76,6 @@ int otbVectorDataRasterizeFilter(int itkNotUsed(argc), char * argv[]) outputcolor[3] = 0.; rasterization->AddColor(outputcolor); - otb::StandardOneLineFilterWatcher * watch = new otb::StandardOneLineFilterWatcher(rasterization.GetPointer(), - "rasterization"); - WriterType::Pointer writer = WriterType::New(); writer->SetFileName(argv[3]); writer->SetInput(rasterization->GetOutput()); diff --git a/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx b/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx index 5bead3b3b057b6c53f8f089f5464d1666c9b11d6..05f6fa4e248d8a8faa410f146b2606f53d3e9a33 100644 --- a/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx +++ b/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx @@ -67,9 +67,6 @@ int otbVectorDataToLabelImageFilter(int itkNotUsed(argc), char * argv[]) rasterization->SetOutputParametersFromImage(reader->GetOutput()); rasterization->SetBurnAttribute("DN"); - otb::StandardOneLineFilterWatcher * watch = new otb::StandardOneLineFilterWatcher(rasterization.GetPointer(), - "rasterization"); - WriterType::Pointer writer = WriterType::New(); writer->SetFileName(argv[3]); writer->SetInput(rasterization->GetOutput()); diff --git a/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx b/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx index 381094617e73d9f2d50b3ba11fa04072d6f53454..fb09695a6157fdbef7621714eec984e7a81c1447 100644 --- a/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx +++ b/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx @@ -42,7 +42,6 @@ int otbBijectionCoherencyFilterNew(int argc, char* argv[]) int otbBijectionCoherencyFilter(int argc, char* argv[]) { - typedef otb::ImageFileReader<FloatImageType> ReaderType; typedef otb::ImageFileReader <FloatVectorImageType> ReaderVectorType; diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx index 856869a29961472dd39c26228b23ecf2e4474d58..ae5f8b3038e287766ff1766cc3ae616553fb7c60 100644 --- a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx +++ b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx @@ -48,9 +48,7 @@ int otbDisparityMapEstimationMethod(int argc, char* argv[]) typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ThresholdImageToPointSetFilter<ImageType, PointSetType> PointSetSourceType; typedef PointSetType::PointsContainer::Iterator PointSetIteratorType; - typedef PointSetType::PointsContainer PointsContainerType; typedef PointSetType::PointDataContainer::Iterator PointDataIteratorType; - typedef PointSetType::PointDataContainer PointDataContainerType; //Input images reading ReaderType::Pointer fixedReader = ReaderType::New(); diff --git a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx b/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx index f1933dd5efc93fc365dbcaa7a2d7a2fcec62bb7b..181b973919fbffe427da1d640b322a5f07c38123 100644 --- a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx +++ b/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx @@ -52,17 +52,8 @@ int otbMulti3DMapToDEMFilterEPSG(int argc, char* argv[]) typedef otb::ImageFileReader <VectorImageType> ReaderVectorType; - - typedef otb::ImageFileWriter <ImageType> WriterType; - - typedef otb::ImageList<ImageType> ImageListType; - - typedef otb::VectorImageToImageListFilter - <VectorImageType, - ImageListType> VectorToListFilterType; - typedef otb::ObjectList<ReaderType> MaskReaderListType; typedef otb::ObjectList<ReaderVectorType> MapReaderListType; @@ -319,12 +310,6 @@ typedef otb::ImageFileReader typedef otb::ImageFileWriter <ImageType> WriterType; -typedef otb::ImageList<ImageType> ImageListType; - -typedef otb::VectorImageToImageListFilter - <VectorImageType, - ImageListType> VectorToListFilterType; - typedef otb::ObjectList<ReaderType> MaskReaderListType; typedef otb::ObjectList<ReaderVectorType> MapReaderListType; @@ -499,21 +484,11 @@ int otbMulti3DMapToDEMFilter(int argc, char* argv[]) typedef otb::ImageFileReader <VectorImageType> ReaderVectorType; - - typedef otb::ImageFileWriter <ImageType> WriterType; - - typedef otb::ImageList<ImageType> ImageListType; - - typedef otb::VectorImageToImageListFilter - <VectorImageType, - ImageListType> VectorToListFilterType; - typedef otb::ObjectList<ReaderType> MaskReaderListType; typedef otb::ObjectList<ReaderVectorType> MapReaderListType; - if ((argc-6)%2 !=0) { std::cout << "Usage: "<<argv[0]<<" 3DMapImage1 .mask1... 3DMapImageN maskN DEMoutput DEMGridStep FusionMode ThreadNb StreamNb" << std::endl; diff --git a/Testing/Code/DisparityMap/otbNCCRegistrationFilter.cxx b/Testing/Code/DisparityMap/otbNCCRegistrationFilter.cxx index e34af9dbf88203b691ed4bb7135584be740c307d..4b3f44ab8f04cfc1554141f8f38c3a7c6303b539 100644 --- a/Testing/Code/DisparityMap/otbNCCRegistrationFilter.cxx +++ b/Testing/Code/DisparityMap/otbNCCRegistrationFilter.cxx @@ -38,9 +38,6 @@ int otbNCCRegistrationFilter(int argc, char* argv[]) typedef double PixelType; typedef itk::Vector<double, ImageDimension> DisplacementPixelType; - typedef double CoordinateRepresentationType; - typedef double OutputPixelType; - typedef otb::Image<OutputPixelType, ImageDimension> OutputImageType; typedef otb::Image<PixelType, ImageDimension> MovingImageType; typedef otb::Image<PixelType, ImageDimension> FixedImageType; typedef otb::Image<DisplacementPixelType, diff --git a/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx b/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx index aa722312ff837ce89aaeb15bb44594142b9c1c18..1761fde1e119d5470e518801ea2dc632c5fb53e6 100644 --- a/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx +++ b/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx @@ -25,8 +25,6 @@ int otbNCCRegistrationFilterNew(int argc, char* argv[]) typedef double PixelType; typedef itk::Vector<double, ImageDimension> DisplacementPixelType; - typedef double CoordinateRepresentationType; - //Allocate Images typedef otb::Image<PixelType, ImageDimension> MovingImageType; typedef otb::Image<PixelType, ImageDimension> FixedImageType; diff --git a/Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGeneratorNew.cxx b/Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGeneratorNew.cxx index 316c10212d0f770e2b38335f1988effe9d4269f8..6ef49086d038c71c39eb71591a0997a0a2a179cf 100644 --- a/Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGeneratorNew.cxx +++ b/Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGeneratorNew.cxx @@ -25,7 +25,6 @@ int otbNearestPointDisplacementFieldGeneratorNew(int argc, char * argv[]) const unsigned int Dimension = 2; typedef double PixelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; - typedef ImageType::PointType PointType; typedef itk::FixedArray<double,3> PointDataType; typedef itk::PointSet<PointDataType, Dimension> PointSetType; typedef otb::NearestPointDisplacementFieldGenerator diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx index 741aeb7e1cd3bd47b3d2bdb307d977bb3f6467f3..e77221f92cd53f47e94264a769d009d40bcc830b 100644 --- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx +++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx @@ -45,20 +45,16 @@ int otbAlignImageToPath(int itkNotUsed(argc), char * argv[]) typedef double InputPixelType; typedef double OutputPixelType; - typedef double RealPixelType; const unsigned int Dimension = 2; typedef otb::Image<InputPixelType, Dimension> InputImageType; - typedef otb::Image<RealPixelType, Dimension> RealImageType; typedef itk::PolyLineParametricPath<Dimension> PathType; - typedef PathType::Pointer PathTypePointer; PathType::Pointer ltoto = PathType::New(); typedef otb::Image<OutputPixelType, Dimension> OutputImageType; - typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageToPathListAlignFilter<InputImageType, PathType> ListAlignFilterType; diff --git a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx index 2687514dbebdaf096e8325a6187c53ab76266cce..70ed79f0f19489158ce25ed447b9da2e55321072 100644 --- a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx +++ b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx @@ -41,7 +41,6 @@ int otbDrawPathAlign(int itkNotUsed(argc), char * argv[]) typedef otb::Image<OutputPixelType, Dimension> OutputImageType; typedef itk::PolyLineParametricPath<Dimension> PathType; - typedef PathType::Pointer PathPointerType; typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx index 20121ca3630441628008be7287cc4faf0e534d36..9e270d799e44615a7edcd784366b940046c6a3cd 100644 --- a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx +++ b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx @@ -35,7 +35,6 @@ int otbFourierMellinImageFilter(int itkNotUsed(argc), char* argv[]) const char * outputRealFilename = argv[2]; const char * outputImaginaryFilename = argv[3]; typedef double InputPixelType; - typedef std::complex<double> OutputPixelType; const unsigned int Dimension = 2; typedef otb::Image<InputPixelType, Dimension> InputImageType; diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx index b86810de6f8b9956183f11e6edea74fb4bc91fe1..f45ec06db6c1bea21ea922ba30b1c31d0266ee50 100644 --- a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx +++ b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx @@ -29,7 +29,6 @@ int otbFourierMellinImageFilterNew(int itkNotUsed(argc), char* argv[]) const unsigned int Dimension = 2; typedef otb::Image<PixelType, Dimension> InputImageType; - typedef otb::Image<PixelType, Dimension> OutputImageType; typedef itk::LinearInterpolateImageFunction<InputImageType, double> InterpolatorType; typedef otb::ForwardFourierMellinTransformImageFilter<PixelType, diff --git a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx b/Testing/Code/FeatureExtraction/otbHuPathNew.cxx index ad72786513d34aadadf17c154916371f8864ee8b..0c40963701634df2bc8cae4b05ed7e8f36ce50d8 100644 --- a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx +++ b/Testing/Code/FeatureExtraction/otbHuPathNew.cxx @@ -27,7 +27,6 @@ int otbHuPathNew(int itkNotUsed(argc), char ** itkNotUsed(argv)) const unsigned int Dimension = 2; typedef itk::PolyLineParametricPath<Dimension> PathType; typedef otb::HuPathFunction<PathType> FunctionType; - typedef FunctionType::RealType RealType; FunctionType::Pointer function = FunctionType::New(); diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx index 05943f4d75d975992e633905452bcd83fdea34b1..c938f3302c7d1ded9e7d38c355ff3299ad320218 100644 --- a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx +++ b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx @@ -57,7 +57,6 @@ int otbImageToEdgePathFilter(int itkNotUsed(argc), char * argv[]) typedef PathType::VertexType VertexType; typedef PathType::VertexListType VertexListType; - typedef PathType::VertexListType::ConstIterator VertexListConstIterator; typedef VertexListType::ConstPointer VertexListTypePointer; VertexListTypePointer vertexList; diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx index d1ed1bbdf4c4385124c662227d5144d9d537b38e..71ba2d504c75fe5ba2e6b64a4fd6aea0e9c49b44 100644 --- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx +++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx @@ -68,8 +68,6 @@ int otbImageToSIFTKeyPointSetFilterOutputImage(int itkNotUsed(argc), char * argv ImageType::OffsetType r = {{-1, 0}}; typedef unsigned char PixelType; - typedef otb::Image<PixelType, 2> UCharImageType; - typedef itk::RGBPixel<PixelType> RGBPixelType; typedef otb::Image<RGBPixelType, 2> OutputImageType; diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx index ae2054e482aae1269900835e582076ce0506b911..43ebcbcc1f8425282b6557d2931595f6e4cb439d 100644 --- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx +++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx @@ -49,8 +49,6 @@ int otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii(int itkNotUsed(argc) typedef PointSetType::PointsContainer PointsContainerType; typedef PointsContainerType::Iterator PointsIteratorType; - typedef PointSetType::PointDataContainer PointDataContainerType; - typedef PointDataContainerType::Iterator PointDataIteratorType; // Instantiating object ReaderType::Pointer reader = ReaderType::New(); diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx index fde28620bc138f8b8ca5a5fdfa20b63cee8beb03..1c1ac29166995229df222ee2c34daf55a8c8782d 100644 --- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx +++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx @@ -56,8 +56,6 @@ int otbImageToSURFKeyPointSetFilterOutputInterestPointAscii(int argc, char * arg typedef otb::ImageToSURFKeyPointSetFilter<ImageType, PointSetType> ImageToSURFKeyPointSetFilterType; typedef PointSetType::PointsContainer PointsContainerType; typedef PointsContainerType::Iterator PointsIteratorType; - typedef PointSetType::PointDataContainer PointDataContainerType; - typedef PointDataContainerType::Iterator PointDataIteratorType; // Instantiating object ReaderType::Pointer reader = ReaderType::New(); diff --git a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx index 3aed786052170480624ca534fcab4d65be643c9d..de8bc8392e2f58d083d028764b0e20facadc302b 100644 --- a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx +++ b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx @@ -110,13 +110,11 @@ int otbLineSegmentDetector_8b_16b_compare(int itkNotUsed(argc), char * argv[]) typedef otb::Image<PixelType8> ImageType8; typedef otb::ImageFileReader<ImageType8> ReaderType8; typedef otb::LineSegmentDetector<ImageType8, double> LSDFilterType8; - typedef otb::ImageFileWriter<ImageType8> WriterType8; typedef unsigned short PixelType16; typedef otb::Image<PixelType16> ImageType16; typedef otb::ImageFileReader<ImageType16> ReaderType16; typedef otb::LineSegmentDetector<ImageType16, double> LSDFilterType16; - typedef otb::ImageFileWriter<ImageType16> WriterType16; typedef LSDFilterType8::VectorDataType VectorDataType; typedef otb::VectorDataFileWriter<VectorDataType> VectorDataWriterType; diff --git a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx index 310a398a4a2e062e2cecd82eb08e046b44d41604..ac20f1206ae88b8c16f3e9cc08f542d23ae0ecbf 100644 --- a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx +++ b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx @@ -39,7 +39,6 @@ int otbNeighborhoodScalarProductFilter(int itkNotUsed(argc), char * argv[]) typedef otb::NeighborhoodScalarProductFilter<VectorImageType, ImageType, ImageType> FilterType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; - typedef otb::ImageFileWriter<VectorImageType> TempWriter; typedef itk::GradientRecursiveGaussianImageFilter<ImageType, VectorImageType> GradientFilterType; // Instantiating object diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx index ee358704b36dbb7c96a04ebb53c139b382c221a7..8c34b1ea6b7160c895f51edc0f8b85dc168cc0bf 100644 --- a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx +++ b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx @@ -35,10 +35,6 @@ int otbPixelSuppressionByDirectionNew(int itkNotUsed(argc), char ** itkNotUsed(a typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::Image<OutputPixelType, Dimension> OutputImageType; - typedef otb::ImageFileReader<InputImageType> ReaderType1; - typedef otb::ImageFileReader<InputImageType> ReaderType2; - typedef otb::ImageFileWriter<OutputImageType> WriterType; - typedef otb::PixelSuppressionByDirectionImageFilter<InputImageType, OutputImageType> FilterType; FilterType::Pointer filter = FilterType::New(); diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx b/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx index 7670e2b9da7a33c9c1057fd4470214c0c1159a11..34bde2590527c00bd9ca302ac12b32b923c2ec94 100644 --- a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx +++ b/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx @@ -37,7 +37,6 @@ int otbRoadExtractionFilter(int itkNotUsed(argc), char * argv[]) typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; typedef otb::RoadExtractionFilter<InputImageType, PathType> RoadExtractionFilterType; - typedef RoadExtractionFilterType::OutputPathListType OutputPathListType; typedef RoadExtractionFilterType::InputPixelType InputPixelType; typedef otb::DrawPathListFilter<OutputImageType, PathType, OutputImageType> DrawPathFilterType; diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx index a56973ca73272d422f636212e293e783c9a0a7bf..4152848aa0b0357dbf5adfb0e2c19900223c8a71 100644 --- a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx +++ b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx @@ -26,8 +26,6 @@ int otbSFSTexturesImageFilterNew(int itkNotUsed(argc), char ** itkNotUsed(argv)) const unsigned int Dimension = 2; typedef double PixelType; typedef otb::Image<PixelType, Dimension> ImageType; - typedef otb::VectorImage<PixelType, Dimension> VectorImageType; - //typedef otb::ImageFileWriter<VectorImageType> WriterType; typedef otb::SFSTexturesImageFilter<ImageType, ImageType> FilterType; FilterType::Pointer filter = FilterType::New(); diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx index 0d910930db779ede78ead7d0e323f2f696b30282..7fff68bc534bdcf46349e0a77e67a5bde94e3c39 100644 --- a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx +++ b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx @@ -40,7 +40,6 @@ int otbSFSTexturesImageFilterTest(int argc, char * argv[]) double alpha = atof(argv[11]); typedef otb::Image<PixelType, Dimension> ImageType; - typedef ImageType::PixelType InputPixelType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; typedef otb::SFSTexturesImageFilter<ImageType, ImageType> FilterType; diff --git a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx index e9eceb600e600ad9f67fced1527d19f116f133e3..b552b495504348897407ae253e28ad72888169f9 100644 --- a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx +++ b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx @@ -28,7 +28,6 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[]) typedef float RealType; typedef otb::Image<RealType, Dimension> ImageType; - typedef ImageType::PointType PointType; typedef itk::VariableLengthVector<RealType> RealVectorType; typedef itk::PointSet<RealVectorType, Dimension> PointSetType; diff --git a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx b/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx index f2cb97439cae367ac00c1f75e8a947ff1c1f79a8..02bef75f956ce54a2272625e32d4ef971e7ebf6f 100644 --- a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx +++ b/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx @@ -29,8 +29,6 @@ int otbUrbanAreaDetectionImageFilter(int itkNotUsed(argc), char * argv[]) typedef otb::VectorImage<PixelType, Dimension> InputVectorImageType; typedef otb::Image<unsigned char, Dimension> OutputImageType; - typedef otb::Image<double, Dimension> SingleImageType; - typedef otb::ImageFileReader<InputVectorImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; diff --git a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx b/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx index c7bfdd53e02e4c086803f15d6f92f732b001e8e6..7fccdd1d72d6c1d722cb6692ca347bd86237b038 100644 --- a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx +++ b/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx @@ -35,10 +35,6 @@ int otbBayesianFusionFilterNew(int argc, char * argv[]) typedef otb::Image<PixelType, Dimension> PanchroImageType; - typedef otb::ImageFileReader<VectorImageType> - VectorReaderType; - typedef otb::ImageFileReader<PanchroImageType> - ImageReaderType; typedef otb::BayesianFusionFilter<VectorImageType, VectorImageType, PanchroImageType, VectorImageType> FilterType; FilterType::Pointer filter = FilterType::New(); diff --git a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx b/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx index aa8044919ff1b921e8ccac9343795aa5b40a16a3..d31b5145de1ce671c1d6d2232d87dd8491344c6f 100644 --- a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx +++ b/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx @@ -31,8 +31,6 @@ int otbLmvmPanSharpeningFusionImageFilterNew(int argc, char * argv[]) typedef otb::VectorImage<PixelType, Dimension> VectorImageType; typedef otb::Image<PixelType, Dimension> PanchroImageType; - typedef otb::ImageFileReader<VectorImageType> VectorReaderType; - typedef otb::ImageFileReader<PanchroImageType> ImageReaderType; typedef otb::LmvmPanSharpeningFusionImageFilter <PanchroImageType, VectorImageType, VectorImageType> FilterType; diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx index 7fc47dbcbc8f1341323ae4b3b7ef0b882371fb14..8361846ecbb97ad17717fa10a71451303baa7f0e 100644 --- a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx +++ b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx @@ -31,8 +31,6 @@ int otbSimpleRcsPanSharpeningFusionImageFilterNew(int argc, char * argv[]) typedef otb::VectorImage<PixelType, Dimension> VectorImageType; typedef otb::Image<PixelType, Dimension> PanchroImageType; - typedef otb::ImageFileReader<VectorImageType> VectorReaderType; - typedef otb::ImageFileReader<PanchroImageType> ImageReaderType; typedef otb::SimpleRcsPanSharpeningFusionImageFilter <PanchroImageType, VectorImageType, VectorImageType> FilterType; diff --git a/Testing/Code/Fuzzy/otbDempsterShaferFusionTests.cxx b/Testing/Code/Fuzzy/otbDempsterShaferFusionTests.cxx index a3963ca175418beca08a9dd6a2525ad3aea39dc1..34aadb9b5329a669a021485a7f736185f0e8d5d3 100644 --- a/Testing/Code/Fuzzy/otbDempsterShaferFusionTests.cxx +++ b/Testing/Code/Fuzzy/otbDempsterShaferFusionTests.cxx @@ -1360,7 +1360,7 @@ int otbDempsterShaferFusionTest(int argc, char * argv[]) vectorAllLabels.push_back(argv[it]); } - unsigned int nbClasses = vectorAllLabels.size(); +// unsigned int nbClasses = vectorAllLabels.size(); MassOfBeliefFunctionType::LabelSetType universe, labelSet; typedef std::map<LabelPixelType, MassOfBeliefFunctionType::LabelSetType> LabelSetMapType; @@ -1947,7 +1947,7 @@ int otbDempsterShaferFusionConfMatFileTest(int argc, char * argv[]) unsigned int nbParameters = 1; unsigned int nbClassifiers = (argc - 1 - nbParameters); - IntLabelPixelType undefinedValue = 0; +// IntLabelPixelType undefinedValue = 0; std::string massOfBeliefDefMethodStr = argv[argc - 4]; MassOfBeliefDefinitionMethod massOfBeliefDefMethod; @@ -2067,7 +2067,7 @@ int otbDempsterShaferFusionConfMatFileTest(int argc, char * argv[]) } // Number of classes in the universe - unsigned int nbClasses = universe.size(); +// unsigned int nbClasses = universe.size(); IntMassOfBeliefFunctionType::LabelSetType universeSet, labelSet; diff --git a/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx b/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx index 9b3775e3ef0746c7e5a542791475b5b9fd0da7a6..eb45cb2d006817af2a33628b5aaf625065bb5246 100644 --- a/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx +++ b/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx @@ -39,7 +39,6 @@ int otbMDMDNMFImageFilterTest(int argc, char * argv[]) typedef otb::MDMDNMFImageFilter<ImageType, ImageType> MDMDNMFImageFilterType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileWriter<ImageType> WriterType; - typedef otb::VectorImageToMatrixImageFilter<ImageType> VectorImageToMatrixImageFilterType; const char * inputImage = argv[1]; const char * outputImage = argv[2]; diff --git a/Testing/Code/IO/otbComplexImageManipulationTest.cxx b/Testing/Code/IO/otbComplexImageManipulationTest.cxx index 6e4ff41e73b5ccec64ec53e13a9f8bb52f11741c..16153677528c6c0db6c24f80f0262f3d452045b5 100644 --- a/Testing/Code/IO/otbComplexImageManipulationTest.cxx +++ b/Testing/Code/IO/otbComplexImageManipulationTest.cxx @@ -289,7 +289,6 @@ template<class InternalType> int otbMonobandComplexToVectorImageScalarGeneric(int itkNotUsed(argc), char * argv[]) { typedef InternalType RealType; - typedef std::complex<RealType> ComplexType; typedef otb::VectorImage<RealType, 2> ImageType; typedef typename ImageType::PixelType PixelType; @@ -524,8 +523,6 @@ template<class InternalType> int otbMultibandComplexToVectorImageScalarGeneric(int itkNotUsed(argc), char * argv[]) { typedef InternalType RealType; - typedef std::complex<RealType> ComplexType; - typedef otb::VectorImage<RealType, 2> ImageType; typedef typename ImageType::PixelType PixelType; diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx index 607f8cf0ed5586df1e21d2f176a7f3fcc963f14f..a91ef1caa39fd2928db1270b3c41fe8f7b996620 100644 --- a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx +++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx @@ -41,7 +41,6 @@ int otbImageFileReaderRADComplexFloatExtract(int itkNotUsed(argc), char* argv[]) typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::Image<OutputPixelType, Dimension> OutputCplxImageType; - typedef otb::Image<float, Dimension> OutputScalarImageType; typedef otb::VectorImage<float, Dimension> OutputImageType; typedef otb::ImageFileReader<InputImageType> ReaderType; diff --git a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx index 8a2db6bf7dc206fda91d945c22f3d6c482d55d8a..140862814f731e2282cd8e24235d9e98853827a2 100644 --- a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx +++ b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx @@ -90,7 +90,6 @@ int otbVectorImageFileReaderWithComplexPixelTest(int argc, char* argv[]) typedef std::complex<float> PixelType; const unsigned int Dimension = 2; - typedef otb::Image<PixelType, Dimension> ImageType; typedef otb::VectorImage<PixelType, Dimension> CplVectorImageType; typedef otb::ImageFileReader<CplVectorImageType> ReaderType; diff --git a/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx b/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx index b60cd24a4f189a0e35599dd17c3c2cd03f156f9d..947ec6fa856a2191abd150873bccc18b515e34f2 100644 --- a/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx +++ b/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx @@ -41,7 +41,6 @@ int otbImageScalarFileWriterTestWithoutInputGeneric(int itkNotUsed(argc), char* typedef InternalType PixelType; typedef otb::Image<PixelType, 2> ImageType; - typedef typename ImageType::PixelType ImagePixelType; typedef typename ImageType::RegionType RegionType; typedef typename ImageType::SizeType SizeType; typedef typename ImageType::IndexType IndexType; @@ -120,7 +119,6 @@ int otbImageComplexFileWriterTestWithoutInputGeneric(int itkNotUsed(argc), char* typedef std::complex<InternalType> PixelType; typedef otb::Image<PixelType, 2> ImageType; - typedef typename ImageType::PixelType ImagePixelType; typedef typename ImageType::RegionType RegionType; typedef typename ImageType::SizeType SizeType; typedef typename ImageType::IndexType IndexType; diff --git a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx b/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx index b43799e1c2b0bc9ad96e94c9d6ec920b262765cc..68e3bf7354dfdc036906573ad0b1c6297baf72ac 100644 --- a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx +++ b/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx @@ -39,19 +39,13 @@ int otbImageFileWriterWithExtendedOptionBox(int itkNotUsed(argc), char* argv[]) const std::string separator = ":"; typedef float InputPixelType; - typedef float OutputPixelType; - typedef otb::VectorImage<InputPixelType, 2> InputImageType; - - typedef InputImageType::PixelType PixelType; - typedef otb::MultiChannelExtractROI<InputImageType::InternalPixelType, InputImageType::InternalPixelType> ExtractROIFilterType; typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileWriter<InputImageType> WriterType; - typedef itk::ImageRegionIterator< InputImageType > IteratorType; typedef itk::ImageRegionConstIterator< InputImageType > ConstIteratorType; ReaderType::Pointer reader = ReaderType::New(); diff --git a/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx b/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx index 8e169e98b1980aba40f74cacf358d21f5224f1b9..126bdd531e21af6a9e39657c892b468f3435282e 100644 --- a/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx +++ b/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx @@ -42,7 +42,6 @@ int otbImageScalarStreamingFileWriterTestWithoutInputGeneric(int itkNotUsed(argc typedef InternalType PixelType; typedef otb::Image<PixelType, 2> ImageType; - typedef typename ImageType::PixelType ImagePixelType; typedef typename ImageType::RegionType RegionType; typedef typename ImageType::SizeType SizeType; typedef typename ImageType::IndexType IndexType; @@ -122,7 +121,6 @@ int otbImageComplexStreamingFileWriterTestWithoutInputGeneric(int argc, char* ar typedef std::complex<InternalType> PixelType; typedef otb::Image<PixelType, 2> ImageType; - typedef typename ImageType::PixelType ImagePixelType; typedef typename ImageType::RegionType RegionType; typedef typename ImageType::SizeType SizeType; typedef typename ImageType::IndexType IndexType; diff --git a/Testing/Code/IO/otbTileMapWriter.cxx b/Testing/Code/IO/otbTileMapWriter.cxx index 99b48d3909a7901a8dca3eb52aacb8f64d8a8546..e06b64eab50b912e3b3f65e06a1ce1beac1e2cf8 100644 --- a/Testing/Code/IO/otbTileMapWriter.cxx +++ b/Testing/Code/IO/otbTileMapWriter.cxx @@ -45,16 +45,12 @@ int otbTileMapWriter(int argc, char *argv[]) int depth = 14; typedef otb::Image<unsigned int, 2> ImageType; - typedef otb::Image<unsigned char, 2> CharImageType; typedef otb::Image<double, 2> DoubleImageType; typedef otb::VectorImage<unsigned int, 2> VectorImageType; typedef otb::VectorImage<unsigned char, 2> CharVectorImageType; typedef otb::VectorImage<double, 2> DoubleVectorImageType; - typedef itk::RGBPixel<unsigned char> RGBPixelType; - typedef otb::Image<RGBPixelType, 2> RGBImageType; - typedef otb::ImageFileReader<VectorImageType> VectorReaderType; VectorReaderType::Pointer readerXS = VectorReaderType::New(); readerXS->SetFileName(argv[1]); diff --git a/Testing/Code/IO/otbVectorDataFileReader.cxx b/Testing/Code/IO/otbVectorDataFileReader.cxx index 06a7f835943990da3d0654646c4dc4123084137c..75aaeefd24c771324cf7f0001fddbed695593278 100644 --- a/Testing/Code/IO/otbVectorDataFileReader.cxx +++ b/Testing/Code/IO/otbVectorDataFileReader.cxx @@ -34,7 +34,6 @@ int otbVectorDataFileReader(int itkNotUsed(argc), char * argv[]) typedef DataNodeType::Pointer DataNodePointerType; typedef itk::TreeContainer<DataNodePointerType> DataTreeType; - typedef itk::DataObject dataobjectType; itk::Indent indent; reader->SetFileName(argv[1]); diff --git a/Testing/Code/IO/otbVectorDataFileWriter.cxx b/Testing/Code/IO/otbVectorDataFileWriter.cxx index 4766b2c483565adba2e54240bc7378e2ad979fb0..100a738e33e177af930afc885d558dd5a469d085 100644 --- a/Testing/Code/IO/otbVectorDataFileWriter.cxx +++ b/Testing/Code/IO/otbVectorDataFileWriter.cxx @@ -27,9 +27,7 @@ int otbVectorDataFileWriter(int itkNotUsed(argc), char * argv[]) typedef otb::VectorData<double, 2> VectorDataType; typedef VectorDataType::DataNodeType DataNodeType; typedef otb::VectorDataFileWriter<VectorDataType> WriterType; - typedef DataNodeType::PointType PointType; typedef DataNodeType::LineType LineType; - typedef DataNodeType::PolygonType PolygonType; typedef LineType::VertexType VertexType; //Instantiation diff --git a/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx b/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx index 0832018318cd5af5acb2f19ac9fd09119f84362e..02b3d32eeccd5f10aebdb85eedb302610764d20c 100644 --- a/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx +++ b/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx @@ -27,10 +27,8 @@ int otbVectorDataFileWriterMultiPolygons(int itkNotUsed(argc), char * argv[]) typedef otb::VectorData<double, 2> VectorDataType; typedef VectorDataType::DataNodeType DataNodeType; typedef otb::VectorDataFileWriter<VectorDataType> WriterType; - typedef DataNodeType::PointType PointType; typedef DataNodeType::LineType LineType; typedef DataNodeType::PolygonType PolygonType; - typedef DataNodeType::PolygonListType PolygonListType; typedef LineType::VertexType VertexType; //Instantiation diff --git a/Testing/Code/IO/otbVectorDataFileWriterNew.cxx b/Testing/Code/IO/otbVectorDataFileWriterNew.cxx index 243164f1dc0eb76ced2306ac13cacc4322488a9f..2ab97dc57e74912ad24e37537998c37ba0e51ccd 100644 --- a/Testing/Code/IO/otbVectorDataFileWriterNew.cxx +++ b/Testing/Code/IO/otbVectorDataFileWriterNew.cxx @@ -22,7 +22,6 @@ int otbVectorDataFileWriterNew(int itkNotUsed(argc), char ** itkNotUsed(argv)) { typedef otb::VectorData<double, 2> VectorDataType; - typedef VectorDataType::DataNodeType DataNodeType; typedef otb::VectorDataFileWriter<VectorDataType> WriterType; //Instantiation diff --git a/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx b/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx index af0c14cd1bc77ff0ddfd05e628bf6f26ac9482cf..4a53bac6acceefd8ed75c9370731eab211f788ef 100644 --- a/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx +++ b/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx @@ -27,7 +27,6 @@ int otbVectorDataFileWriterPolygons(int itkNotUsed(argc), char * argv[]) typedef otb::VectorData<double, 2> VectorDataType; typedef VectorDataType::DataNodeType DataNodeType; typedef otb::VectorDataFileWriter<VectorDataType> WriterType; - typedef DataNodeType::PointType PointType; typedef DataNodeType::LineType LineType; typedef DataNodeType::PolygonType PolygonType; typedef LineType::VertexType VertexType; diff --git a/Testing/Code/IO/otbVectorDataKeywordlistTest.cxx b/Testing/Code/IO/otbVectorDataKeywordlistTest.cxx index ecf9e06aa024be6e8b7632eb4fcdc3aced6d5850..f6f3e3f9bb7f4d18a8c4ed154ee40388fd777e18 100644 --- a/Testing/Code/IO/otbVectorDataKeywordlistTest.cxx +++ b/Testing/Code/IO/otbVectorDataKeywordlistTest.cxx @@ -41,7 +41,6 @@ int otbVectorDataKeywordlist(int itkNotUsed(argc), char * argv[]) typedef DataNodeType::Pointer DataNodePointerType; typedef itk::TreeContainer<DataNodePointerType> DataTreeType; - typedef itk::DataObject dataobjectType; itk::Indent indent; reader->SetFileName(argv[1]); diff --git a/Testing/Code/Learning/otbListSampleGeneratorTest.cxx b/Testing/Code/Learning/otbListSampleGeneratorTest.cxx index 75ea81b8f18330ce342027c613c39866f21a7832..8c972d2eaae37ecfa0a8ba5a06a6a634b0ac7929 100644 --- a/Testing/Code/Learning/otbListSampleGeneratorTest.cxx +++ b/Testing/Code/Learning/otbListSampleGeneratorTest.cxx @@ -58,7 +58,6 @@ int otbListSampleGenerator(int argc, char* argv[]) std::string classKey = "Class"; typedef double PixelType; - typedef int LabeledPixelType; typedef otb::VectorImage<PixelType, 2> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; diff --git a/Testing/Code/Learning/otbROIdataConversion.cxx b/Testing/Code/Learning/otbROIdataConversion.cxx index 712e110174dd4448b4b7164465640437fe730cfb..edbdb61716e7cd74c629fd97c12c07bc59f0b6b1 100644 --- a/Testing/Code/Learning/otbROIdataConversion.cxx +++ b/Testing/Code/Learning/otbROIdataConversion.cxx @@ -34,7 +34,6 @@ int otbROIdataConversion(int argc, char* argv[]) typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileReader<ROIImageType> ROIReaderType; - typedef otb::ImageFileWriter<OutputImageType> WriterType; ConvertorType::Pointer convertor = ConvertorType::New(); ReaderType::Pointer readerIm = ReaderType::New(); diff --git a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx b/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx index 999526c36225e009d30f8fd689e3b7dff739c63e..699b466f54a4a214fe98e52f841b3a6555d40abb 100644 --- a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx +++ b/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx @@ -34,7 +34,7 @@ int otbSOMActivationBuilderNew(int argc, char* argv[]) typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType; typedef otb::SOMMap<PixelType, DistanceType, Dimension> MapType; - typedef otb::VectorImage<ComponentType, Dimension> InputImageType; + typedef itk::Statistics::ListSample<PixelType> ListSampleType; typedef otb::Image<OutputPixelType, Dimension> OutputImageType; typedef otb::SOMActivationBuilder<ListSampleType, MapType, OutputImageType> SOMActivationBuilderType; diff --git a/Testing/Code/Learning/otbSOMClassifierNew.cxx b/Testing/Code/Learning/otbSOMClassifierNew.cxx index 180d5c1efa5b02bc0dddb62b7d0c9e6954e9a16e..8c5281106cafb6c494fa050be756baa91332b882 100644 --- a/Testing/Code/Learning/otbSOMClassifierNew.cxx +++ b/Testing/Code/Learning/otbSOMClassifierNew.cxx @@ -33,7 +33,6 @@ int otbSOMClassifierNew(int argc, char* argv[]) typedef itk::VariableLengthVector<InputPixelType> PixelType; typedef itk::Statistics::EuclideanDistanceMetric<PixelType> DistanceType; typedef otb::SOMMap<PixelType, DistanceType, Dimension> SOMMapType; - typedef otb::VectorImage<InputPixelType, Dimension> InputImageType; typedef itk::Statistics::ListSample<PixelType> SampleType; typedef otb::SOMClassifier<SampleType, SOMMapType, LabelPixelType> ClassifierType; diff --git a/Testing/Code/Learning/otbSVMClassifierImage.cxx b/Testing/Code/Learning/otbSVMClassifierImage.cxx index 3e0f2360062c11c9f269a7088a7d17f7bfe9100b..cf874cf79ab7b99e6d18541c69d556ffd54be37c 100644 --- a/Testing/Code/Learning/otbSVMClassifierImage.cxx +++ b/Testing/Code/Learning/otbSVMClassifierImage.cxx @@ -85,7 +85,6 @@ int otbSVMClassifierImage(int argc, char* argv[]) /** Read the input image and build the sample */ typedef double InputPixelType; - typedef std::vector<InputPixelType> InputVectorType; typedef int LabelPixelType; const unsigned int Dimension = 2; diff --git a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx b/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx index 663d900d06f56adbe5bebf4f033fb645085e6494..c7f87d9f3abedacd7d3a43003d205a3003c9fb6b 100644 --- a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx +++ b/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx @@ -29,9 +29,7 @@ int otbSVMCrossValidationCostFunctionNew(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; typedef otb::SVMCrossValidationCostFunction<ModelType> FunctionType; diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx index ad40d0944184bae2621cef9ca86cd18a6019c63f..534d84d9000f914a2b34bbfd3d4f27cd45d5de60 100644 --- a/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx +++ b/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx @@ -68,7 +68,6 @@ int otbSVMImageModelEstimatorModelAccessor(int argc, char* argv[]) svmEstimator->Update(); typedef EstimatorType::SVMModelPointer SVMModelPointer; - typedef EstimatorType::SVMModelType SVMModelType; SVMModelPointer ptrModel = svmEstimator->GetModel(); std::ofstream f; diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx index 02188fa4f30c325c067ea3be04c077fa3383d6ff..6d5cac53ae4bdc2c80f56bd1cba797b466f14fa4 100644 --- a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx +++ b/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx @@ -34,8 +34,6 @@ int otbSVMImageModelEstimatorNew(int argc, char* argv[]) typedef otb::Image<InputPixelType, Dimension> TrainingImageType; - typedef std::vector<double> VectorType; - typedef otb::SVMImageModelEstimator<InputImageType, TrainingImageType> EstimatorType; diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx index 6f564e07308d82a07d107d53532a58aa9bdb41f7..b19d82b091609f58fb69b2522ae9694fe6696296 100644 --- a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx +++ b/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx @@ -43,7 +43,6 @@ int otbSVMImageModelEstimatorTrain(int argc, char* argv[]) const unsigned int Dimension = 2; typedef otb::VectorImage<InputPixelType, Dimension> InputImageType; typedef otb::Image<int, Dimension> TrainingImageType; - typedef std::vector<double> VectorType; typedef otb::SVMImageModelEstimator<InputImageType, TrainingImageType> EstimatorType; typedef otb::ImageFileReader<InputImageType> InputReaderType; diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx index c780db0c5812992a9999e020ea95d96ac0dbcd5d..d11b3d8d11c3489a905707f6978818ce95139f49 100644 --- a/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx +++ b/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx @@ -37,7 +37,6 @@ int otbSVMImageModelEstimatorTrainOneClass(int argc, char* argv[]) const unsigned int Dimension = 2; typedef otb::VectorImage<InputPixelType, Dimension> InputImageType; typedef otb::Image<int, Dimension> TrainingImageType; - typedef std::vector<double> VectorType; typedef otb::SVMImageModelEstimator<InputImageType, TrainingImageType> EstimatorType; typedef otb::ImageFileReader<InputImageType> InputReaderType; diff --git a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx index 2b7048b584dfde4d536ec027c3dbc4f9bbef131e..195cb560ee190e5fcfe3b1811ed73bf573fddff1 100644 --- a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx +++ b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx @@ -47,7 +47,6 @@ int otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest(int argc, const unsigned int Dimension = 2; typedef otb::VectorImage<InputPixelType, Dimension> InputImageType; typedef otb::Image<int, Dimension> TrainingImageType; - typedef std::vector<double> VectorType; typedef otb::SVMImageModelEstimator<InputImageType, TrainingImageType> EstimatorType; typedef otb::ImageFileReader<InputImageType> InputReaderType; diff --git a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx index 3b567b8029a99fb4ad99dd71f293e56378e4d322..a83d7edc7ae6105656d21dbf0fa4b4c4b49607a8 100644 --- a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx +++ b/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx @@ -46,7 +46,6 @@ int otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest(int argc, const unsigned int Dimension = 2; typedef otb::VectorImage<InputPixelType, Dimension> InputImageType; typedef otb::Image<int, Dimension> TrainingImageType; - typedef std::vector<double> VectorType; typedef otb::SVMImageModelEstimator<InputImageType, TrainingImageType> EstimatorType; typedef otb::ImageFileReader<InputImageType> InputReaderType; diff --git a/Testing/Code/Learning/otbSVMModelAccessor.cxx b/Testing/Code/Learning/otbSVMModelAccessor.cxx index 85953bbfc0bb2c0ad266db4d4737bc1f4bfd2bb4..d1392a801ced050beddf9cf75b0c9e91ec955708 100644 --- a/Testing/Code/Learning/otbSVMModelAccessor.cxx +++ b/Testing/Code/Learning/otbSVMModelAccessor.cxx @@ -29,9 +29,6 @@ int otbSVMModelAccessor(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - - typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; diff --git a/Testing/Code/Learning/otbSVMModelCopyTest.cxx b/Testing/Code/Learning/otbSVMModelCopyTest.cxx index 85d3459ef32bdd53b05a33bf2e16401d2341803e..922a23d2e958c9ab227451fe0e6c18fd4987b5c2 100644 --- a/Testing/Code/Learning/otbSVMModelCopyTest.cxx +++ b/Testing/Code/Learning/otbSVMModelCopyTest.cxx @@ -28,9 +28,7 @@ int otbSVMModelCopyTest(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; ModelType::Pointer svmModel = ModelType::New(); diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx b/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx index 9b8a7b61d9c4c423c2dd908a68ae789efff1f2ae..4acf9de136caf37d8afd816eec72f19c6e7a5466 100644 --- a/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx +++ b/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx @@ -67,9 +67,6 @@ int otbSVMModelGenericKernelLoadSave(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - - typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx b/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx index cad93a012c33feda428f510a4d2c5b70e6900a9c..2f6a3f404f1a1303ff8ce19c10602649bfe47e3a 100644 --- a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx +++ b/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx @@ -251,7 +251,6 @@ int otbSVMKernelsTest_generic(int argc, char* argv[]) std::string classKey = "Class"; typedef double PixelType; - typedef int LabeledPixelType; typedef otb::VectorImage<PixelType, 2> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; diff --git a/Testing/Code/Learning/otbSVMModelLoad.cxx b/Testing/Code/Learning/otbSVMModelLoad.cxx index 5c26bf66273268d06b42acbff9e71500270ec6f0..f24aa3af9816da2efa218e45a3087b86db7a0a6c 100644 --- a/Testing/Code/Learning/otbSVMModelLoad.cxx +++ b/Testing/Code/Learning/otbSVMModelLoad.cxx @@ -28,10 +28,6 @@ int otbSVMModelLoad(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - - typedef otb::Image<InputPixelType, Dimension> InputImageType; - typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; ModelType::Pointer svmModel = ModelType::New(); diff --git a/Testing/Code/Learning/otbSVMModelLoadSave.cxx b/Testing/Code/Learning/otbSVMModelLoadSave.cxx index 6aac187e6f8ca4a370121ecf83ed7e4561ca5794..37584c26412c876c6277ef15512ba80959bd6adc 100644 --- a/Testing/Code/Learning/otbSVMModelLoadSave.cxx +++ b/Testing/Code/Learning/otbSVMModelLoadSave.cxx @@ -28,9 +28,6 @@ int otbSVMModelLoadSave(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - - typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; diff --git a/Testing/Code/Learning/otbSVMModelNew.cxx b/Testing/Code/Learning/otbSVMModelNew.cxx index 84964f3f5063b5f59b04dbab34854406fe24ebfa..28fd756dd0b4580cde6bffb11ea4b88e7eb32820 100644 --- a/Testing/Code/Learning/otbSVMModelNew.cxx +++ b/Testing/Code/Learning/otbSVMModelNew.cxx @@ -28,9 +28,7 @@ int otbSVMModelNew(int argc, char* argv[]) { typedef unsigned char InputPixelType; typedef unsigned char LabelPixelType; - const unsigned int Dimension = 2; - typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::SVMModel<InputPixelType, LabelPixelType> ModelType; ModelType::Pointer svmModel = ModelType::New(); diff --git a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx b/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx index 8749a440337fe744dcf08ae1d245edb991a7bdb6..d473c3f1aabbfe3f05c1f39fff3abcc8893dc4b5 100644 --- a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx +++ b/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx @@ -72,7 +72,6 @@ int otbSVMSampleListModelEstimatorTest(int argc, char* argv[]) std::string classKey = "Class"; typedef double PixelType; - typedef int LabeledPixelType; typedef otb::VectorImage<PixelType, 2> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; diff --git a/Testing/Code/Markov/otbMRFEnergyEdgeFidelityNew.cxx b/Testing/Code/Markov/otbMRFEnergyEdgeFidelityNew.cxx index 8357d5a6df335f71e74bc620bd8e675f7b48dfc9..6881f6eb7e79f50d7a818b841c4ed50d7db6807e 100644 --- a/Testing/Code/Markov/otbMRFEnergyEdgeFidelityNew.cxx +++ b/Testing/Code/Markov/otbMRFEnergyEdgeFidelityNew.cxx @@ -26,7 +26,6 @@ int otbMRFEnergyEdgeFidelityNew(int argc, char * argv[]) typedef int PixelType2; typedef otb::Image<PixelType, 2> ImageType; - typedef otb::Image<PixelType2, 2> ImageType2; typedef otb::MRFEnergyEdgeFidelity<ImageType, ImageType> MRFEnergyType; MRFEnergyType::Pointer object = MRFEnergyType::New(); diff --git a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx index e66e94367f192567c6a9e6b1346c00c3bc725b43..d8b624180ac87cc1715787f1164e12b24bbaaa91 100644 --- a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx +++ b/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx @@ -25,11 +25,8 @@ int otbMorphologicalClosingProfileFilterNew(int argc, char * argv[]) { const unsigned int Dimension = 2; typedef double InputPixelType; - typedef double OutputPixelType; typedef otb::Image<InputPixelType, Dimension> InputImageType; - typedef otb::Image<OutputPixelType, Dimension> OutputImageType; - typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType; typedef otb::MorphologicalClosingProfileFilter<InputImageType, InputImageType, StructuringElementType> ClosingProfileFilterType; diff --git a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx index 9515c4457174763063fe0d7b40109d58e8c94d35..b3fd55c7ca8f46f5a1213b07d8c2802c78d22c2e 100644 --- a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx +++ b/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx @@ -25,10 +25,8 @@ int otbMorphologicalOpeningProfileFilterNew(int argc, char * argv[]) { const unsigned int Dimension = 2; typedef double InputPixelType; - typedef double OutputPixelType; typedef otb::Image<InputPixelType, Dimension> InputImageType; - typedef otb::Image<OutputPixelType, Dimension> OutputImageType; typedef itk::BinaryBallStructuringElement<InputPixelType, Dimension> StructuringElementType; typedef otb::MorphologicalOpeningProfileFilter<InputImageType, InputImageType, StructuringElementType> diff --git a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx b/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx index a47fd92f8ec6771f4cad491e31112c439d95f02b..7a7d657ea07d7e91573adc3dd11e1247585b32c0 100644 --- a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx +++ b/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx @@ -24,11 +24,9 @@ int otbMultiScaleConvexOrConcaveClassificationFilterNew(int argc, char * argv[]) { const unsigned int Dimension = 2; typedef double InputPixelType; - typedef double OutputPixelType; typedef unsigned short LabeledPixelType; typedef otb::Image<InputPixelType, Dimension> InputImageType; - typedef otb::Image<OutputPixelType, Dimension> OutputImageType; typedef otb::Image<LabeledPixelType, 2> LabeledImageType; typedef otb::MultiScaleConvexOrConcaveClassificationFilter<InputImageType, diff --git a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx index 901d150ea102609ebae91a949d6eee5ea8666b2f..5f942e40ee2090f17fadef4747fa4f6132201766 100644 --- a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx +++ b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx @@ -31,10 +31,7 @@ int otbImageToLabelMapWithAttributesFilter(int argc, char* argv[]) // Convenient typedefs typedef otb::VectorImage<double, 2> ImageType; - typedef ImageType::IndexType IndexType; - typedef otb::Image<unsigned int, 2> LabeledImageType; - typedef otb::AttributesMapLabelObjectWithClassLabel<double, 2, double, double> LabelObjectType; typedef otb::ImageToLabelMapWithAttributesFilter<ImageType, diff --git a/Testing/Code/OBIA/otbLabelMapToVectorDataFilter.cxx b/Testing/Code/OBIA/otbLabelMapToVectorDataFilter.cxx index 0510c32e455d3b175972893d2ad53d434965dba1..7d03ea551ce7ffe2857be1f98a06e317c1db9f79 100644 --- a/Testing/Code/OBIA/otbLabelMapToVectorDataFilter.cxx +++ b/Testing/Code/OBIA/otbLabelMapToVectorDataFilter.cxx @@ -51,10 +51,7 @@ int otbLabelMapToVectorDataFilter(int argc, char * argv[]) typedef otb::AttributesMapLabelObject<LabelType, Dimension, double> LabelObjectType; typedef itk::LabelMap<LabelObjectType> LabelMapType; typedef itk::LabelImageToLabelMapFilter<LabeledImageType, LabelMapType> LabelMapFilterType; - typedef otb::Polygon<double> PolygonType; - typedef otb::Functor::LabelObjectToPolygonFunctor<LabelObjectType, PolygonType> FunctorType; typedef otb::VectorData<double, 2> VectorDataType; - typedef VectorDataType::DataNodeType DataNodeType; typedef otb::VectorDataFileWriter<VectorDataType> WriterType; typedef otb::VectorDataProjectionFilter<VectorDataType, VectorDataType> VectorDataFilterType; diff --git a/Testing/Code/OBIA/otbLabelMapToVectorDataFilterNew.cxx b/Testing/Code/OBIA/otbLabelMapToVectorDataFilterNew.cxx index b8af494516564730deee7b712bc3fd0cc49fcc3a..f7f6f0e064073b9a39a60293a5d26192dabc616d 100644 --- a/Testing/Code/OBIA/otbLabelMapToVectorDataFilterNew.cxx +++ b/Testing/Code/OBIA/otbLabelMapToVectorDataFilterNew.cxx @@ -23,8 +23,6 @@ int otbLabelMapToVectorDataFilterNew(int argc, char * argv[]) { const int dim = 2; - typedef unsigned char PType; - typedef otb::VectorData<> VectorDataType; typedef itk::AttributeLabelObject<unsigned long, dim, double> LabelObjectType; diff --git a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx b/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx index 7a8b93f38b6794dc5af1e4fe630054229e44075a..7101a715e2f67e5c98bf26993018cf644b287124 100644 --- a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx +++ b/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx @@ -79,9 +79,6 @@ int otbVectorDataToLabelMapFilter(int argc, char * argv[]) p->SetVectorDataObject(reader->GetOutput()); typedef VectorDataType::DataNodeType::PolygonType::RegionType RegionType; RegionType region; - typedef RegionType::IndexType index; - typedef RegionType::SizeType size; - p->SetBoundingRegion(region); //Compute the global bounding box of the vectordata diff --git a/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx b/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx index 3f7c4fa46db95bc4c68c3a721b28d31387fb68dd..9de09c220ec6b5efc0f612344782ea05b02b2344 100644 --- a/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx +++ b/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx @@ -67,16 +67,9 @@ int otbStandardMetaImageFunctionBuilder(int argc, char* argv[]) typedef otb::RadiometricMomentsImageFunction<ImageType, CoordRepType> RadiometricMomentsIF; typedef otb::ImageFunctionAdaptor<RadiometricMomentsIF, PrecisionType> AdaptedRadiometricMomentsIF; - typedef otb::FourierMellinDescriptorsImageFunction<ImageType, CoordRepType> FourierMellinDescriptorsIF; typedef otb::ImageFunctionAdaptor<FourierMellinDescriptorsIF, PrecisionType> AdaptedFourierMellinDescriptorsIF; - typedef otb::FlusserMomentsImageFunction<ImageType, CoordRepType> LocalHistogramIF; - typedef otb::ImageFunctionAdaptor<LocalHistogramIF, PrecisionType> AdaptedLocalHistogramIF; - - typedef otb::HaralickTexturesImageFunction<ImageType, CoordRepType> HaralickTexturesIF; - typedef otb::ImageFunctionAdaptor<HaralickTexturesIF, PrecisionType> AdaptedHaralickTexturesIF; - p1.push_back(7); p1.push_back(128); p1.push_back(0); diff --git a/Testing/Code/Projections/otbOssimElevManagerTest.cxx b/Testing/Code/Projections/otbOssimElevManagerTest.cxx index caaf8ccffc071997c4d2b23b90f35999816d2904..4ca7f020003c8aa8f0a5c9db6eb3c78b398f5dc3 100644 --- a/Testing/Code/Projections/otbOssimElevManagerTest.cxx +++ b/Testing/Code/Projections/otbOssimElevManagerTest.cxx @@ -41,7 +41,6 @@ int otbOssimElevManagerTest(int argc, char* argv[]) typedef otb::ImageFileWriter<ImageType> WriterType; typedef itk::ImageRegionIteratorWithIndex<ImageType> IteratorType; - typedef ImageType::PointType PoinType; typedef ImageType::RegionType RegionType; typedef ImageType::SpacingType SpacingType; typedef RegionType::IndexType IndexType; diff --git a/Testing/Code/Projections/otbOssimElevManagerTest2.cxx b/Testing/Code/Projections/otbOssimElevManagerTest2.cxx index 93a0baa4689e97201fca7d839a3b0e59c2440266..131d07c181bbd741da2c281a2f0c40333319fade 100644 --- a/Testing/Code/Projections/otbOssimElevManagerTest2.cxx +++ b/Testing/Code/Projections/otbOssimElevManagerTest2.cxx @@ -37,8 +37,6 @@ int otbOssimElevManagerTest2(int argc, char* argv[]) const ossimFilename srtmDir(argv[1]); const char * outfname = argv[2]; - typedef double PixelType; - typedef itk::Point<double, 2> PointType; PointType origin; double spacing; diff --git a/Testing/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.cxx b/Testing/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.cxx index faff72be5d834ab8dc0cba16eb7f968f598cd0c2..29068e0840ffff6683e1012f4af89b6184d38626 100644 --- a/Testing/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.cxx +++ b/Testing/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.cxx @@ -28,7 +28,6 @@ int otbPhysicalToRPCSensorModelImageFilter(int argc, char* argv[]) typedef double PixelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::PhysicalToRPCSensorModelImageFilter<ImageType> PhysicalToSensorModelType; - typedef PhysicalToSensorModelType::SizeType SizeType; // Object instanciation PhysicalToSensorModelType::Pointer estimator = PhysicalToSensorModelType::New(); diff --git a/Testing/Code/Projections/otbRationalTransformToDisplacementFieldSource.cxx b/Testing/Code/Projections/otbRationalTransformToDisplacementFieldSource.cxx index 8b8fe603b5b6dbc78514a4ab69a11c8a0db7fd7d..0d59043a9248daa0de67ea1917f35e270e015ae3 100644 --- a/Testing/Code/Projections/otbRationalTransformToDisplacementFieldSource.cxx +++ b/Testing/Code/Projections/otbRationalTransformToDisplacementFieldSource.cxx @@ -27,7 +27,6 @@ int otbRationalTransformToDisplacementFieldSourceTest(int argc, char* argv[]) { - typedef otb::RationalTransform<> RationalTransformType; /** Check command line arguments. */ if( argc < 2 ) @@ -42,7 +41,6 @@ int otbRationalTransformToDisplacementFieldSourceTest(int argc, char* argv[]) const unsigned int Dimension = 2; typedef float ScalarPixelType; typedef double CoordRepresentationType; - const unsigned int SplineOrder = 3; typedef itk::Vector<ScalarPixelType, Dimension > VectorPixelType; typedef otb::Image<VectorPixelType, Dimension > DisplacementFieldImageType; @@ -58,7 +56,6 @@ int otbRationalTransformToDisplacementFieldSourceTest(int argc, char* argv[]) typedef DisplacementFieldGeneratorType::SpacingType SpacingType; typedef DisplacementFieldGeneratorType::OriginType OriginType; typedef DisplacementFieldGeneratorType::IndexType IndexType; - typedef DisplacementFieldGeneratorType::RegionType RegionType; typedef otb::ImageFileWriter<DisplacementFieldImageType > WriterType; /** Create output information. */ diff --git a/Testing/Code/Projections/otbRegionProjectionResampler.cxx b/Testing/Code/Projections/otbRegionProjectionResampler.cxx index 404acc01bff84facc4ebc50fdac871ed4713cf35..5b5f66a76736dc8b6fe50b3e1f2c2631a683f594 100644 --- a/Testing/Code/Projections/otbRegionProjectionResampler.cxx +++ b/Testing/Code/Projections/otbRegionProjectionResampler.cxx @@ -66,8 +66,6 @@ int otbRegionProjectionResampler(int argc, char* argv[]) typedef itk::LinearInterpolateImageFunction<ImageType, double> InterpolatorType; typedef itk::RescaleIntensityImageFilter<ImageType, CharImageType> RescalerType; typedef otb::StreamingResampleImageFilter<ImageType, ImageType> ResamplerType; - typedef itk::TranslationTransform<double, 2> TransformType; - typedef otb::CompositeTransform<ModelType, TransformType> CompositeType; ImageType::IndexType start; ImageType::SizeType size; diff --git a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx index 652b521077fbc07fc127996f418a54e128ec1c40..b8c7fc12f8d9e3231615ef6de6460d72d7af02be 100644 --- a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx +++ b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx @@ -120,8 +120,6 @@ int otbVectorDataIntoImageProjectionFilterCompareImplTest(int argc, char * argv[ typedef otb::VectorDataExtractROI<VectorDataType> VectorDataExtractROIType; typedef VectorDataExtractROIType::RegionType RemoteSensingRegionType; - typedef itk::PreOrderTreeIterator<VectorDataType::DataTreeType> TreeIteratorType; - std::string imageInputFilename = argv[1]; std::string vectorDataInputFilename = argv[2]; std::string demDirectory = argv[3]; diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx index 5757305a0d17037dab6320f7cac59a3f3c28adaa..9751226bdff6b76f5db0bbe1d70dad9979b0adf0 100644 --- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx +++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx @@ -37,7 +37,6 @@ int otbImageToLuminanceImageFilterAuto(int argc, char * argv[]) typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; typedef otb::ImageToLuminanceImageFilter<InputImageType, OutputImageType> ImageToLuminanceImageFilterType; - typedef ImageToLuminanceImageFilterType::VectorType VectorType; typedef otb::MultiChannelExtractROI<PixelType, PixelType> RoiFilterType; ReaderType::Pointer reader = ReaderType::New(); diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx index d5e71d89a2f5117498267af550abcc05a3014fba..e46ee7766a86986122c61786a0a749a2fac94e4f 100644 --- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx +++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx @@ -44,7 +44,6 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int argc, char * typedef otb::ReflectanceToSurfaceReflectanceImageFilter<InputImageType, OutputImageType> ReflectanceToSurfaceReflectanceImageFilterType; - typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType; typedef otb::AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms CorrectionParametersTo6SRadiativeTermsType; typedef otb::AtmosphericCorrectionParameters CorrectionParametersType; diff --git a/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx b/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx index 542e540eaea0d01a1f9039545c7631979d4f1e76..e1a105063bead1cb80b595203b461897ee29f149 100644 --- a/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx +++ b/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx @@ -37,7 +37,6 @@ int otbSarParametricMapFunctionTest(int argc, char* argv[]) typedef InputImageType::PixelType InputPixelType; typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::SarParametricMapFunction<InputImageType> FunctionType; - typedef FunctionType::PointType PointType; typedef FunctionType::PointSetType PointSetType; /**Instantiation ofa Smart Pointer*/ @@ -106,4 +105,3 @@ int otbSarParametricMapFunctionTest(int argc, char* argv[]) return EXIT_SUCCESS; } - diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx index a65d8b39ada70f178460df0e3c7a5f6c00f631f7..75d0af97311f4badd4c026bb8ae0e698d668fad9 100644 --- a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx +++ b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx @@ -44,11 +44,6 @@ int otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter(int argc, char * argv[]) typedef otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter<InputImageType, OutputImageType> SurfaceAdjacencyEffect6SCorrectionSchemeFilterType; - typedef SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::WeightingMatrixType WeightingMatrixType; - typedef SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::WeightingValuesContainerType - WeightingValuesContainerType; - - typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType; typedef otb::AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms CorrectionParametersTo6SRadiativeTermsType; typedef otb::AtmosphericCorrectionParameters CorrectionParametersType; typedef otb::AtmosphericRadiativeTerms RadiativeTermsType; diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx index 7c5f3b181d06d3a183b1dc70d2406410f5847a7a..e20ada69e828bd6d0235379de14bd24e38e3b05c 100644 --- a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx +++ b/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx @@ -32,10 +32,7 @@ int otbReciprocalCovarianceToReciprocalCoherencyImageFilter(int argc, char * arg typedef double PixelType; typedef std::complex<PixelType> InputPixelType; - - typedef otb::VectorImage<PixelType> RealImageType; typedef otb::VectorImage<InputPixelType> ImageType; - typedef otb::ReciprocalCovarianceToReciprocalCoherencyImageFilter<ImageType, ImageType> FilterType; typedef otb::ImageFileReader<ImageType> ReaderType; diff --git a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx index fe21cc0adb40103df927bfddf5bc1b8d8be803e1..f336556c0e4f86881c14dfe1a57f6852bd2c0b17 100644 --- a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx +++ b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx @@ -98,11 +98,9 @@ int otbSinclairReciprocalImageFilter(int argc, char * argv[]) const unsigned int Dimension = 2; typedef std::complex <double> InputPixelType; typedef std::complex <double> OutputPixelType; - typedef double OutputRealPixelType; typedef otb::Image<InputPixelType, Dimension> InputImageType; typedef otb::VectorImage<OutputPixelType, Dimension> OutputImageType; - typedef otb::VectorImage<OutputRealPixelType, Dimension> OutputRealImageType; std::string strArgv(argv[1]); argc--; diff --git a/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx b/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx index d851d3359060c7c50cbeded0c597a7051ead63a1..b966e782e2371fe37f14d721a2f404aec0df5640 100644 --- a/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx +++ b/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx @@ -43,7 +43,6 @@ int otbVectorMultiChannelsPolarimetricSynthesisFilter(int argc, char * argv[]) typedef otb::Image<OutputPixelType, Dimension> OutputImageType; typedef otb::ImageFileReader<InputImageType> ReaderType; typedef otb::ImageFileWriter<OutputImageType> WriterType; - typedef itk::FixedArray<int, 4> IndexArrayType; typedef otb::MultiChannelsPolarimetricSynthesisFilter<InputImageType, OutputImageType> FilterType; FilterType::Pointer polarimetricSynthesis = FilterType::New(); diff --git a/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx b/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx index 59491565e22a2f6aa7135e221f815f858dbb1950..a2c48ef58720b00392bc1261660bd116f834a51a 100644 --- a/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx +++ b/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx @@ -48,7 +48,6 @@ int otbMeanShiftSegmentationFilter(int argc, char * argv[]) const unsigned int Dimension = 2; typedef float PixelType; - typedef double KernelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; typedef otb::Image<unsigned int, Dimension> LabelImageType; typedef otb::ImageFileReader<ImageType> ReaderType; diff --git a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx b/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx index 7f60aff4ebea8c4cd6f2adb78b567790d1fac592..4374c1c93c7c5a5da9131db9a8527dbe0b979640 100644 --- a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx +++ b/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx @@ -57,8 +57,6 @@ int otbImageSimulationMethodKMeansClassif(int argc, char * argv[]) typedef otb::VectorData<double, Dimension> VectorDataType; typedef otb::AttributesMapLabelObject<LabelType, Dimension, std::string> LabelObjectType; typedef itk::LabelMap<LabelObjectType> LabelMapType; - typedef otb::VectorDataFileReader<VectorDataType> VectorDataFileReaderType; - typedef otb::SpatialisationFilter<LabelMapType> SpatialisationFilterType; typedef otb::ProspectModel SimulationStep1Type; typedef otb::SailModel SimulationStep2Type; @@ -73,8 +71,6 @@ int otbImageSimulationMethodKMeansClassif(int argc, char * argv[]) typedef itk::Statistics::KdTreeBasedKmeansEstimator<TreeType> EstimatorType; typedef otb::KMeansImageClassificationFilter<OutputImageType, LabelImageType, nbClasses> ClassificationFilterType; - typedef ClassificationFilterType::KMeansParametersType KMeansParametersType; - typedef itk::ImageRegionIterator<OutputImageType> ImageRegionIteratorType; @@ -198,5 +194,3 @@ int otbImageSimulationMethodKMeansClassif(int argc, char * argv[]) return EXIT_SUCCESS; } - - diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx index da67d66d5f6307a5aba1f3f4b8668876f5747558..4e29be444d7ec4fddf736c78a2e7a62ae8589c34 100644 --- a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx +++ b/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx @@ -39,10 +39,8 @@ int otbReduceSpectralResponseClassifierRAndNIR(int argc, char * argv[]) typedef otb::SpectralResponse< double, double> ResponseType; - typedef ResponseType::Pointer ResponsePointerType; typedef otb::SatelliteRSR< double, double> SatRSRType; - typedef SatRSRType::Pointer SatRSRPointerType; typedef otb::ReduceSpectralResponse < ResponseType, SatRSRType> ReduceResponseType; typedef ReduceResponseType::Pointer ReduceResponseTypePointerType; diff --git a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx b/Testing/Code/Simulation/otbSpatialisationTestNew.cxx index 36d9f4848b2ee3ebd523a16050088b38dc7e020c..a4641099aa35396f0ad0d2d4330217845514bc64 100644 --- a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx +++ b/Testing/Code/Simulation/otbSpatialisationTestNew.cxx @@ -27,7 +27,6 @@ int otbSpatialisationTestNew(int argc, char * argv[]) { typedef unsigned short LabelType; const unsigned int Dimension = 2; - typedef otb::Image<LabelType, Dimension> ImageType; typedef otb::AttributesMapLabelObject<LabelType, Dimension, std::string> LabelObjectType; typedef itk::LabelMap<LabelObjectType> LabelMapType; typedef otb::SpatialisationFilter<LabelMapType> FilterType; diff --git a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx index 9aaaf5b42e3ff5c21e1712a0abc4608d37c3cc0c..9df06cb807126d1ed8796cae5f6598eb99c1d3b8 100644 --- a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx +++ b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx @@ -51,7 +51,7 @@ int otbSurfaceReflectanceToReflectanceFilterTest(int argc, char * argv[]) typedef double PixelType; typedef otb::VectorImage<PixelType, Dimension> ImageType; - typedef itk::ImageRegionIterator< ImageType > IteratorType; +// typedef itk::ImageRegionIterator< ImageType > IteratorType; //typedef ResponseType::PairType PairType; //typedef otb::ObjectList< PairType > PairListType; // PairListType::Pointer pairList = PairListType::New(); diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx index 1a7d7280d1863aa832292b6dbc021e8ea9086d66..22f9894384b226dc22c2fde23d7222f27341a9a4 100644 --- a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx +++ b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx @@ -44,8 +44,6 @@ PolygonType::VertexType Vertex(double i,double j) int otbPolygonListToRCC8GraphFilter(int argc, char* argv[]) { - const unsigned int Dimension = 2; - char * outfile = argv[1]; PolygonListType::Pointer regions = PolygonListType::New(); diff --git a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx index decc72bda79ec27e8808e18f685e01ad70e7e2ef..e7f613d58ba6779c508a637154afab6286539348 100644 --- a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx +++ b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx @@ -32,11 +32,8 @@ int otbRCC8Graph(int argc, char* argv[]) typedef PathType::VertexType PointType; typedef otb::RCC8VertexBase<PathType> VertexType; typedef otb::RCC8Graph<VertexType> RCC8GraphType; - typedef RCC8GraphType::EdgeType EdgeType; typedef otb::RCC8VertexIterator<RCC8GraphType> VertexIteratorType; typedef otb::RCC8EdgeIterator<RCC8GraphType> EdgeIteratorType; - typedef otb::RCC8InEdgeIterator<RCC8GraphType> InEdgeIteratorType; - typedef otb::RCC8OutEdgeIterator<RCC8GraphType> OutEdgeIteratorType; // Instantiation RCC8GraphType::Pointer rcc8Graph = RCC8GraphType::New(); diff --git a/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx b/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx index 60492c0a2c9a86354faded0828785bfd8f1fba90..c9b05b2df5534e0e07c74b4ad6ac7bf7e7f0645d 100644 --- a/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx +++ b/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx @@ -603,7 +603,7 @@ BOOST_AUTO_TEST_CASE(OGRDataSource_sqlite_overwrite) ogr::Layer l = ds -> CreateLayer(layer1, 0, wkbPoint); BOOST_CHECK_EQUAL(l.GetFeatureCount(true), 0); - OGRFeatureDefn & defn = l.GetLayerDefn(); +// OGRFeatureDefn & defn = l.GetLayerDefn(); l.CreateField(k_f0); l.CreateField(k_f1); diff --git a/Testing/Fa/0000094-PolygonsVectorization.cxx b/Testing/Fa/0000094-PolygonsVectorization.cxx index 184cb20d4beca9563d61f771aeecd6bc65e97f4f..b837433c1e8f69c546edf727de290b3edef8befc 100644 --- a/Testing/Fa/0000094-PolygonsVectorization.cxx +++ b/Testing/Fa/0000094-PolygonsVectorization.cxx @@ -50,25 +50,19 @@ int main(int argc, char * argv[]) { - typedef unsigned char PixelType; typedef unsigned long LabelPixelType; typedef unsigned char PixelTypeOutput; - typedef otb::Image<PixelType, 2> SingleImageType; typedef otb::Image<LabelPixelType, 2> LabeledImageType; typedef otb::Image<PixelTypeOutput, 2> OutputImageType; - typedef itk::ImageRegionIterator<LabeledImageType> IteratorType; - typedef otb::Polygon<double> PolygonType; - typedef PolygonType::Pointer PolygonPointerType; - typedef PolygonType::ContinuousIndexType PolygonIndexType; typedef otb::ObjectList<PolygonType> PolygonListType; typedef PolygonListType::Pointer PolygonListPointerType; typedef itk::ImageRegion<2> ImageRegionType; typedef otb::PersistentVectorizationImageFilter<LabeledImageType, PolygonType> PersistentVectorizationFilterType; - typedef itk::RelabelComponentImageFilter<LabeledImageType, LabeledImageType> RelabelFilterType; + typedef itk::ConnectedComponentImageFilter<LabeledImageType, LabeledImageType> ConnectedFilterType; typedef itk::RescaleIntensityImageFilter<LabeledImageType, OutputImageType> RescalerType; /* diff --git a/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx b/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx index b2f7411626a23b1f158f8a2f94d952a4b338ca8d..3088a28940c97994ff4c0d1adb57627d9082dd3c 100644 --- a/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx +++ b/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx @@ -45,14 +45,10 @@ int main(int argc, char *argv[]) typedef otb::Image<PixelType8> ImageType8; typedef otb::ImageFileReader<ImageType8> ReaderType8; typedef otb::LineSegmentDetector<ImageType8, double> LSDFilterType8; - typedef otb::ImageFileWriter<ImageType8> WriterType8; - typedef unsigned short PixelType16; typedef otb::Image<PixelType16> ImageType16; typedef otb::ImageFileReader<ImageType16> ReaderType16; typedef otb::LineSegmentDetector<ImageType16, double> LSDFilterType16; - typedef otb::ImageFileWriter<ImageType16> WriterType16; - typedef LSDFilterType8::VectorDataType VectorDataType; typedef otb::VectorDataFileWriter<VectorDataType> VectorDataWriterType; diff --git a/Testing/Fa/StreamingStat.cxx b/Testing/Fa/StreamingStat.cxx index 68c8a5b7eaa8ce182cfd3b505b2765f8a971e9a0..cff8fe83f522481e779b8a02ddbf3a54af9ac1a4 100644 --- a/Testing/Fa/StreamingStat.cxx +++ b/Testing/Fa/StreamingStat.cxx @@ -6,8 +6,6 @@ int main(int argc, char ** argv) { - - typedef otb::Image<double, 2> ImageType; typedef otb::Image<double, 3> Image3DType; typedef otb::VectorImage<double, 2> VectorImageType; typedef otb::ImageFileReader<VectorImageType> ReaderType; diff --git a/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx b/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx index cce6b7272bcb7b9d6a065c2e2536d709d5872905..d3fcb3a1e6c81ce884ae51bfa8b7171e15981f7c 100644 --- a/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx +++ b/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx @@ -144,14 +144,10 @@ int main(int argc, char* argv[]) spacing[0]=1; spacing[1]=1; - rasterization->SetOutputSize(size); rasterization->SetOutputOrigin(origin); rasterization->SetOutputSpacing(spacing); - otb::StandardOneLineFilterWatcher * watch = new otb::StandardOneLineFilterWatcher(rasterization.GetPointer(), - "rasterization"); - WriterType::Pointer writer = WriterType::New(); writer->SetFileName(argv[1]); writer->SetInput(rasterization->GetOutput()); diff --git a/Testing/Utilities/tinyXMLlibTest.cxx b/Testing/Utilities/tinyXMLlibTest.cxx index 55125fbabaf9089efd4cccbead3a0f2c0b690742..5c7e8d421040d12c4e6db98ac0a8549c946312b3 100644 --- a/Testing/Utilities/tinyXMLlibTest.cxx +++ b/Testing/Utilities/tinyXMLlibTest.cxx @@ -910,8 +910,8 @@ int tinyXMLlibTest(int argc, char *argv[] ) // Long filenames crashing STL version { TiXmlDocument doc( "midsummerNightsDreamWithAVeryLongFilenameToConfuseTheStringHandlingRoutines.xml" ); - bool loadOkay = doc.LoadFile(); - loadOkay = true; // get rid of compiler warning. +// bool loadOkay = doc.LoadFile(); +// loadOkay = true; // get rid of compiler warning. // Won't pass on non-dev systems. Just a "no crash" check. //XmlTest(file, "Long filename. ", true, loadOkay ); } @@ -1316,5 +1316,3 @@ int tinyXMLlibTest(int argc, char *argv[] ) if( gFail == 0 ) return EXIT_SUCCESS; else return EXIT_FAILURE; } - -