[otb] 04/06: Merge tag 'upstream/5.2.1+dfsg'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Feb 11 22:15:55 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository otb.

commit f9fb8237c39399e65f259d2df083162b2196b654
Merge: 3c7f165 7e4fb68
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 11 21:20:18 2016 +0100

    Merge tag 'upstream/5.2.1+dfsg'
    
    Upstream version 5.2.1+dfsg

 CMake/FindOssim.cmake                              |  38 +++---
 CMake/MinGWPackage.cmake                           |  68 ++++++-----
 CMakeLists.txt                                     |   2 +-
 Copyright/ITKCopyright.txt                         |   2 +-
 Examples/BasicFilters/BandMathFilterExample.cxx    |   2 +-
 .../ChangeDetectionFrameworkExample.cxx            |   2 +-
 .../MultivariateAlterationDetector.cxx             |   4 +-
 .../DataRepresentation/Image/ImageListExample.cxx  |   4 +-
 Examples/DataRepresentation/Image/VectorImage.cxx  |   4 +-
 .../Mesh/PointSetWithVectors.cxx                   |   2 +-
 Examples/FeatureExtraction/AlignmentsExample.cxx   |   2 +-
 .../AssymmetricFusionOfLineDetectorExample.cxx     |   2 +-
 .../CorrelationLineDetectorExample.cxx             |   2 +-
 .../ExtractSegmentsByStepsExample.cxx              |   2 +-
 .../FeatureExtraction/ExtractSegmentsExample.cxx   |   2 +-
 .../FeatureExtraction/RatioLineDetectorExample.cxx |   2 +-
 Examples/Filtering/RasterizationExample.cxx        |   2 +-
 Examples/IO/DEMHandlerExample.cxx                  |   4 +-
 Examples/IO/HDFReaderExample.cxx                   |   6 +-
 Examples/IO/ImageReadRegionOfInterestWrite.cxx     |   4 +-
 Examples/IO/ImageToKmzAndMapFileProductExample.cxx |   4 +-
 .../TrainMachineLearningModelFromImagesExample.cxx |   2 +-
 Examples/OBIA/HooverMetricsEstimation.cxx          |   2 +-
 .../Projections/GeometriesProjectionExample.cxx    |   2 +-
 .../AtmosphericCorrectionSequencement.cxx          |   6 +-
 .../Segmentation/VectorConfidenceConnected.cxx     |   2 +-
 Examples/Simulation/ProsailModel.cxx               |   2 +-
 Examples/Tutorials/Multispectral.cxx               |   2 +-
 .../GdalAdapters/include/otbOGRLayerWrapper.h      |   2 +-
 .../Adapters/OSSIMAdapters/include/otbDEMHandler.h |  10 +-
 .../OSSIMAdapters/include/otbImageKeywordlist.h    |   2 +-
 .../OSSIMAdapters/src/otbDEMConvertAdapter.cxx     |   2 +-
 .../Adapters/OSSIMAdapters/src/otbDEMHandler.cxx   |   8 +-
 .../app/otbMultivariateAlterationDetector.cxx      |   4 +-
 .../app/otbClassificationMapRegularization.cxx     |   4 +-
 .../app/otbComputePolylineFeatureFromImage.cxx     |   4 +-
 .../app/otbDSFuzzyModelEstimation.cxx              |   2 +-
 .../app/otbFusionOfClassifications.cxx             |   4 +-
 .../AppClassification/app/otbImageClassifier.cxx   |   2 +-
 .../AppClassification/app/otbPredictRegression.cxx |   2 +-
 .../AppClassification/app/otbSOMClassification.cxx |   7 +-
 .../app/otbTrainImagesClassifier.cxx               |  18 +--
 .../AppClassification/app/otbTrainRegression.cxx   |  32 ++---
 .../AppClassification/include/otbTrainBoost.txx    |   2 +-
 .../include/otbTrainDecisionTree.txx               |   4 +-
 .../include/otbTrainGradientBoostedTree.txx        |   4 +-
 .../AppClassification/include/otbTrainKNN.txx      |   2 +-
 .../AppClassification/include/otbTrainLibSVM.txx   |   2 +-
 .../include/otbTrainNeuralNetwork.txx              |   2 +-
 .../include/otbTrainRandomForests.txx              |   4 +-
 .../AppClassification/include/otbTrainSVM.txx      |   2 +-
 .../app/otbHomologousPointsExtraction.cxx          |  20 +--
 .../app/otbDimensionalityReduction.cxx             |   2 +-
 .../AppEdge/app/otbLineSegmentDetection.cxx        |   2 +-
 .../AppFusion/app/otbBundleToPerfectSensor.cxx     |   2 +-
 .../app/otbHyperspectralUnmixing.cxx               |   4 +-
 .../AppImageUtils/app/otbColorMapping.cxx          |  12 +-
 .../AppImageUtils/app/otbDownloadSRTMTiles.cxx     |   4 +-
 .../AppImageUtils/app/otbManageNoData.cxx          |   4 +-
 .../app/otbMultiResolutionPyramid.cxx              |   2 +-
 .../AppImageUtils/app/otbPixelValue.cxx            |   2 +-
 .../AppImageUtils/app/otbReadImageInfo.cxx         |  12 +-
 .../AppMathParserX/app/otbBandMathX.cxx            |   6 +-
 .../app/otbOpticalCalibration.cxx                  |  40 +++---
 .../app/otbGenerateRPCSensorModel.cxx              |   2 +-
 .../app/otbGridBasedImageResampling.cxx            |  10 +-
 .../AppProjection/app/otbOrthoRectification.cxx    |  18 +--
 .../AppProjection/app/otbRefineSensorModel.cxx     |   2 +-
 .../app/otbRigidTransformResample.cxx              |   8 +-
 .../AppProjection/app/otbSuperimpose.cxx           |   4 +-
 .../app/otbVectorDataReprojection.cxx              |   4 +-
 .../app/otbSarRadiometricCalibration.cxx           |   2 +-
 .../app/otbSARDecompositions.cxx                   |   2 +-
 .../app/otbConnectedComponentSegmentation.cxx      |   2 +-
 .../AppSegmentation/app/otbLSMSSegmentation.cxx    |   4 +-
 .../AppSegmentation/app/otbSegmentation.cxx        |  14 +--
 .../AppStereo/app/otbBlockMatching.cxx             |  20 +--
 .../app/otbDisparityMapToElevationMap.cxx          |   2 +-
 .../AppStereo/app/otbStereoFramework.cxx           |  14 +--
 .../app/otbStereoRectificationGridGenerator.cxx    |  12 +-
 .../app/otbHaralickTextureExtraction.cxx           |   2 +-
 .../AppTextures/app/otbSFSTextureExtraction.cxx    |   2 +-
 .../app/otbRasterization.cxx                       |   2 +-
 .../AppVectorUtils/app/otbOSMDownloader.cxx        |   2 +-
 .../Core/Common/include/otbModelComponentBase.txx  |   2 +-
 .../otbSubsampledImageRegionConstIterator.h        |   2 +-
 Modules/Core/ImageBase/include/otbImage.h          |   2 +-
 .../Core/ImageBase/include/otbMetaImageFunction.h  |   2 +-
 .../ImageBase/include/otbMultiChannelExtractROI.h  |   2 +-
 .../include/otbMultiToMonoChannelExtractROI.h      |   2 +-
 .../ImageBase/include/otbRemoteSensingRegion.h     |   2 +-
 Modules/Core/ImageBase/include/otbVectorImage.h    |   2 +-
 .../LabelMap/include/otbAttributesMapLabelObject.h |   8 +-
 .../otbAttributesMapOpeningLabelMapFilter.h        |   2 +-
 .../otbBandsStatisticsAttributesLabelMapFilter.h   |   4 +-
 .../include/otbLabelMapToSampleListFilter.h        |   2 +-
 ...belMapWithClassLabelToLabeledSampleListFilter.h |   2 +-
 .../include/otbShapeAttributesLabelMapFilter.h     |   2 +-
 .../otbStatisticsAttributesLabelMapFilter.h        |   2 +-
 .../src/otbPleiadesImageMetadataInterface.cxx      |   2 +-
 Modules/Core/ObjectList/include/otbImageList.h     |   2 +-
 .../include/otbImageListToVectorImageFilter.h      |   2 +-
 .../include/otbPipelineMemoryPrintCalculator.h     |  10 +-
 .../include/otbStreamingImageVirtualWriter.h       |   2 +-
 .../Transform/include/otbGenericRSTransform.txx    |   2 +-
 .../include/otbImageToGenericRSOutputParameters.h  |   2 +-
 .../Core/Transform/include/otbSensorModelBase.h    |   2 +-
 .../include/otbVectorDataProperties.h              |   2 +-
 .../include/otbStandardMetaImageFunctionBuilder.h  |   2 +-
 .../include/otbRemoveWrongDirectionFilter.h        |   2 +-
 .../otbPersistentVectorizationImageFilter.h        |   8 +-
 .../otbPixelSuppressionByDirectionImageFilter.h    |   2 +-
 .../otbMultivariateAlterationDetectorImageFilter.h |   4 +-
 .../Convolution/include/otbGaborFilterGenerator.h  |   2 +-
 .../DEM/include/otbDEMToImageGenerator.txx         |   1 +
 .../otbEstimateInnerProductPCAImageFilter.h        |   2 +-
 .../otbMaximumAutocorrelationFactorImageFilter.h   |   4 +-
 .../DimensionalityReduction/otb-module.cmake       |   2 +-
 .../include/otbChangeInformationImageFilter.h      |   4 +-
 .../include/otbChangeLabelImageFilter.txx          |   1 +
 .../include/otbChangeNoDataValueFilter.h           |   2 +-
 .../include/otbPrintableImageFilter.h              |   2 +-
 .../otbSpectralAngleDistanceImageFilter.txx        |   2 +-
 .../otbStreamingInnerProductVectorImageFilter.h    |   2 +-
 .../otbStreamingMatrixTransposeMatrixImageFilter.h |   2 +-
 .../include/otbStreamingResampleImageFilter.h      |   6 +-
 .../include/otbStreamingShrinkImageFilter.txx      |   1 +
 .../ImageManipulation/include/otbTileImageFilter.h |   4 +-
 .../otbUnaryImageFunctorWithVectorImageFilter.txx  |   2 +-
 .../Path/include/otbImageToEdgePathFilter.txx      |   2 +-
 .../Polarimetry/include/otbPolarimetricData.h      |   2 +-
 .../include/otbGCPsToRPCSensorModelImageFilter.h   |   2 +-
 .../include/otbGenericRSResampleImageFilter.h      |   2 +-
 .../otbLeastSquareAffineTransformEstimator.h       |   2 +-
 .../otbPhysicalToRPCSensorModelImageFilter.h       |   2 +-
 .../include/otbVectorDataProjectionFilter.txx      |   2 +-
 .../test/otbGenericRSResampleImageFilter.cxx       |   2 +-
 .../include/otbMeanShiftSmoothingImageFilter.h     |   4 +-
 .../include/otbMeanShiftSmoothingImageFilter.txx   |   3 +-
 .../include/otbStreamingCompareImageFilter.h       |   4 +-
 .../otbStreamingHistogramVectorImageFilter.h       |   2 +-
 .../include/otbStreamingMinMaxImageFilter.h        |   2 +-
 .../include/otbStreamingMinMaxVectorImageFilter.h  |   2 +-
 .../include/otbStreamingStatisticsImageFilter.h    |   2 +-
 ...otbStreamingStatisticsMapFromLabelImageFilter.h |   2 +-
 .../otbStreamingStatisticsVectorImageFilter.h      |   2 +-
 .../include/otbVectorImageToMatrixImageFilter.h    |   2 +-
 .../Wavelet/include/otbWaveletFilterBank.h         |   4 +-
 .../Wavelet/include/otbWaveletPacketTransform.h    |   2 +-
 .../Wavelet/include/otbWaveletTransform.h          |   2 +-
 Modules/IO/Carto/include/otbMapFileProductWriter.h |   2 +-
 Modules/IO/Carto/include/otbWorldFile.h            |   2 +-
 .../Carto/src/otbOSMDataToVectorDataGenerator.cxx  |   2 +-
 .../include/otbExtendedFilenameToReaderOptions.h   |   4 +-
 Modules/IO/IOBSQ/include/otbBSQImageIO.h           |   2 +-
 Modules/IO/IOBSQ/src/otbBSQImageIO.cxx             |  12 +-
 Modules/IO/IOGDAL/src/otbGDALImageIO.cxx           |  13 +-
 .../test/otbGDALImageIOTestWriteMetadata.cxx       |   4 +-
 Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx   |   4 +-
 .../IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx  |   2 +-
 Modules/IO/IOLUM/include/otbLUMImageIO.h           |   2 +-
 Modules/IO/IOLUM/src/otbLUMImageIO.cxx             |   8 +-
 Modules/IO/IOMW/include/otbMWImageIO.h             |   2 +-
 Modules/IO/IOMW/src/otbMWImageIO.cxx               |   6 +-
 Modules/IO/IORAD/include/otbRADImageIO.h           |   2 +-
 Modules/IO/IORAD/src/otbRADImageIO.cxx             |   8 +-
 Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx     |   2 +-
 Modules/IO/ImageIO/include/otbImageFileReader.h    |   2 +-
 Modules/IO/ImageIO/include/otbImageFileWriter.h    |   2 +-
 Modules/IO/ImageIO/include/otbImageFileWriter.txx  |   2 +-
 .../IO/ImageIO/include/otbImageSeriesFileReader.h  |   8 +-
 .../ImageIO/include/otbImageSeriesFileReaderBase.h |   2 +-
 .../ImageIO/test/otbMultiResolutionReadingInfo.cxx |   2 +-
 Modules/IO/KMZWriter/include/otbKmzProductWriter.h |   2 +-
 .../IO/KMZWriter/include/otbKmzProductWriter.txx   |   2 +-
 .../otbDSFusionOfClassifiersImageFilter.txx        |   2 +-
 .../DempsterShafer/include/otbMassOfBelief.h       |  14 +--
 .../otbVectorDataToDSValidatedVectorDataFilter.txx |   2 +
 .../LearningBase/include/otbDecisionTree.h         |   2 +-
 Modules/Learning/SOM/include/otbPeriodicSOM.h      |   2 +-
 Modules/Learning/SOM/include/otbPeriodicSOM.txx    |   2 +-
 Modules/Learning/SOM/include/otbSOM.h              |   2 +-
 Modules/Learning/SOM/include/otbSOMMap.h           |   2 +-
 .../Learning/SOM/include/otbSOMWithMissingValue.h  |   2 +-
 .../SOM/include/otbSOMWithMissingValue.txx         |   2 +-
 .../include/otbSVMCrossValidationCostFunction.h    |   2 +-
 .../otbSVMImageClassificationWithRuleFilter.h      |   2 +-
 .../include/otbConfusionMatrixCalculator.txx       |   6 +-
 .../include/otbDecisionTreeMachineLearningModel.h  |   2 +-
 .../otbGradientBoostedTreeMachineLearningModel.h   |   2 +-
 Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h |   6 +-
 .../OBIA/RCC8/include/otbRCC8GraphFileReader.txx   |   4 +-
 .../include/otbAeronetFileReader.h                 |   2 +-
 .../include/otbAtmosphericCorrectionParameters.h   |   2 +-
 ...bSurfaceAdjacencyEffectCorrectionSchemeFilter.h |   2 +-
 .../src/otbAeronetFileReader.cxx                   |   2 +-
 .../Simulation/include/otbSpectralResponse.txx     |   2 +-
 .../include/otbDisparityMapTo3DFilter.h            |   2 +-
 .../include/otbDisparityMapToDEMFilter.h           |   2 +-
 .../include/otbFineRegistrationImageFilter.h       |   4 +-
 .../include/otbMultiDisparityMapTo3DFilter.h       |   2 +-
 .../include/otbPixelWiseBlockMatchingImageFilter.h |   2 +-
 .../test/otbDisparityMapToDEMFilter.cxx            |   2 +-
 .../Stereo/include/otbMulti3DMapToDEMFilter.h      |   2 +-
 .../otbStereoSensorModelToElevationMapFilter.h     |  14 +--
 ...otbStereorectificationDisplacementFieldSource.h |  12 +-
 Modules/Remote/SertitObject.remote.cmake           |   9 +-
 Modules/Remote/otbGRM.remote.cmake                 |   2 +-
 .../include/otbLabelImageRegionMergingFilter.txx   |   3 +-
 .../include/otbLabelImageRegionPruningFilter.txx   |   1 +
 .../include/otbOGRDataSourceToLabelImageFilter.h   |   2 +-
 .../include/otbVectorDataToLabelImageFilter.h      |   2 +-
 .../include/otbMorphologicalClosingProfileFilter.h |   2 +-
 .../include/otbMorphologicalOpeningProfileFilter.h |   2 +-
 .../otbMorphologicalProfilesSegmentationFilter.h   |   8 +-
 .../otbMorphologicalProfilesSegmentationFilter.txx |  13 +-
 ...leDerivativeToMultiScaleCharacteristicsFilter.h |   2 +-
 .../include/otbOGRLayerStreamStitchingFilter.h     |   4 +-
 .../include/otbWatershedSegmentationFilter.h       |   2 +-
 Modules/ThirdParty/GDAL/otb-module-init.cmake      |  56 ++++-----
 Modules/ThirdParty/ITK/CMakeLists.txt              |   2 +-
 .../src/otbWrapperComplexInputImageParameter.cxx   |   2 +-
 .../src/otbWrapperDocExampleStructure.cxx          |   2 +-
 .../src/otbWrapperElevationParametersHandler.cxx   |   6 +-
 .../src/otbWrapperInputImageListParameter.cxx      |   2 +-
 .../src/otbWrapperInputImageParameter.cxx          |   2 +-
 .../src/otbWrapperInputVectorDataListParameter.cxx |   2 +-
 .../src/otbWrapperInputVectorDataParameter.cxx     |   2 +-
 .../otbWrapperMapProjectionParametersHandler.cxx   |   4 +-
 Modules/Wrappers/CommandLine/src/CMakeLists.txt    |  10 +-
 .../src/otbWrapperCommandLineParser.cxx            |   2 +-
 .../otbWrapperQtWidgetInputFilenameListParameter.h |   2 +-
 .../otbWrapperQtWidgetInputImageListParameter.h    |   2 +-
 ...tbWrapperQtWidgetInputVectorDataListParameter.h |   2 +-
 .../otbWrapperQtWidgetStringListParameter.h        |   2 +-
 Modules/Wrappers/QtWidget/src/CMakeLists.txt       |  10 +-
 ...tbWrapperQtWidgetInputFilenameListParameter.cxx |   8 +-
 .../otbWrapperQtWidgetInputImageListParameter.cxx  |   8 +-
 ...WrapperQtWidgetInputVectorDataListParameter.cxx |   8 +-
 .../src/otbWrapperQtWidgetStringListParameter.cxx  |   8 +-
 Modules/Wrappers/SWIG/src/numpy.i                  |   2 +-
 RELEASE_NOTES.txt                                  | 134 ++++++++++++---------
 Utilities/Doxygen/OTB/ImageSimilarityMetrics.dox   |   2 +-
 Utilities/Doxygen/OTB/Iterators.dox                |  77 ++++++------
 Utilities/Doxygen/OTB/Modules.dox                  |   9 +-
 Utilities/Doxygen/OTB/Registration.dox             |   4 +-
 246 files changed, 695 insertions(+), 647 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git



More information about the Pkg-grass-devel mailing list