[otb] 02/08: Merge tag 'upstream/5.10.0+dfsg'
Bas Couwenberg
sebastic at debian.org
Tue Feb 14 19:48:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository otb.
commit a6036e557832aacc645e43f138de1a4a366b17a5
Merge: 3440bd1 e3db981
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Feb 14 18:31:33 2017 +0100
Merge tag 'upstream/5.10.0+dfsg'
Upstream version 5.10.0+dfsg
.hgignore | 10 -
.hgsigs | 3 -
.travis.yml | 8 +-
CMake/FindGBenchmark.cmake | 9 +-
CMake/FindMuParserX.cmake | 2 +-
CMake/OTBCheckCpp11Keywords.cmake | 7 +-
CMake/OTBConfig.cmake.in | 2 +
CMake/OTBModuleEnablement.cmake | 5 +
CMake/OTBModuleMacros.cmake | 10 +-
CMake/SourceStatus.cmake | 2 +-
CMake/UseOTB.cmake | 8 +
CMake/otbcli.bat.in | 9 +-
CMake/otbcli.sh.in | 7 +-
CMake/otbgui.sh.in | 6 +-
CMakeLists.txt | 21 +-
.../AsymmetricFusionOfLineDetectorExample.cxx | 11 +-
Examples/Markov/MarkovRestorationExample.cxx | 11 +-
.../GdalAdapters/include/otbOGRVersionProxy.h | 16 +
.../GdalAdapters/src/otbOGRVersionProxy1x.cxx | 8 +
.../GdalAdapters/src/otbOGRVersionProxy2x.cxx | 5 +
Modules/Adapters/QtAdapters/src/otbQtAdapters.cxx | 52 +-
.../app/otbComputeConfusionMatrix.cxx | 52 +-
.../app/otbComputeImagesStatistics.cxx | 118 +-
.../app/otbDSFuzzyModelEstimation.cxx | 8 +-
.../app/otbKMeansClassification.cxx | 5 +-
.../app/otbMultiImageSamplingRate.cxx | 21 +-
.../app/otbOGRLayerClassifier.cxx | 2 +-
.../app/otbPolygonClassStatistics.cxx | 57 +-
.../AppClassification/app/otbSOMClassification.cxx | 2 +-
.../AppClassification/app/otbSampleExtraction.cxx | 57 +-
.../AppClassification/app/otbSampleSelection.cxx | 109 +-
.../app/otbTrainImagesClassifier.cxx | 805 ++++-----
.../app/otbTrainOGRLayersClassifier.cxx | 2 +-
.../AppClassification/app/otbTrainRegression.cxx | 2 +-
.../app/otbTrainVectorClassifier.cxx | 64 +-
.../app/otbVectorDataDSValidation.cxx | 4 +-
.../AppClassification/include/otbTrainBoost.txx | 8 +-
.../include/otbTrainDecisionTree.txx | 10 +-
.../include/otbTrainGradientBoostedTree.txx | 8 +-
.../AppClassification/include/otbTrainKNN.txx | 2 +-
.../AppClassification/include/otbTrainLibSVM.txx | 12 +-
.../include/otbTrainNeuralNetwork.txx | 22 +-
.../include/otbTrainRandomForests.txx | 14 +-
.../AppClassification/include/otbTrainSVM.txx | 34 +-
.../include/otbTrainSharkRandomForests.txx | 8 +-
.../AppClassification/test/CMakeLists.txt | 12 +-
.../app/otbDimensionalityReduction.cxx | 12 +-
.../Applications/AppDomainTransform/CMakeLists.txt | 2 +
.../AppDomainTransform/app/CMakeLists.txt | 4 +
.../AppDomainTransform/app/otbDomainTransform.cxx | 425 +++++
.../AppDomainTransform/otb-module.cmake | 15 +
.../AppDomainTransform/test/CMakeLists.txt | 38 +
.../Applications/AppEdge/app/otbEdgeExtraction.cxx | 2 +-
.../Applications/AppFiltering/app/otbDespeckle.cxx | 2 +-
.../Applications/AppFiltering/app/otbSmoothing.cxx | 2 +-
.../AppFusion/app/otbBundleToPerfectSensor.cxx | 209 +--
Modules/Applications/AppFusion/otb-module.cmake | 1 +
.../app/otbHyperspectralUnmixing.cxx | 3 +-
.../app/otbVertexComponentAnalysis.cxx | 3 +-
.../AppImageUtils/app/otbColorMapping.cxx | 16 +-
.../AppImageUtils/app/otbCompareImages.cxx | 10 +-
.../Applications/AppImageUtils/app/otbConvert.cxx | 5 +-
.../AppImageUtils/app/otbDownloadSRTMTiles.cxx | 2 +-
.../AppImageUtils/app/otbExtractROI.cxx | 16 +-
.../AppImageUtils/app/otbManageNoData.cxx | 7 +-
.../app/otbMultiResolutionPyramid.cxx | 2 +-
.../AppImageUtils/app/otbPixelValue.cxx | 3 +-
.../AppImageUtils/app/otbQuicklook.cxx | 16 +-
.../AppImageUtils/app/otbReadImageInfo.cxx | 76 +-
.../Applications/AppImageUtils/app/otbRescale.cxx | 6 +-
.../AppIndices/app/otbRadiometricIndices.cxx | 2 +-
Modules/Applications/AppKMZ/app/otbKmzExport.cxx | 1 +
.../Applications/AppMathParser/app/otbBandMath.cxx | 4 +-
.../AppMathParserX/app/otbBandMathX.cxx | 4 +-
.../AppMoments/app/otbLocalStatisticExtraction.cxx | 2 +-
.../app/otbBinaryMorphologicalOperation.cxx | 2 +-
.../app/otbGrayScaleMorphologicalOperation.cxx | 2 +-
.../app/otbOpticalCalibration.cxx | 24 +-
.../app/otbConvertCartoToGeoPoint.cxx | 6 +-
.../app/otbConvertSensorToGeoPoint.cxx | 8 +-
.../app/otbGenerateRPCSensorModel.cxx | 26 +-
.../app/otbGridBasedImageResampling.cxx | 2 +-
.../app/otbObtainUTMZoneFromGeoPoint.cxx | 3 +-
.../AppProjection/app/otbOrthoRectification.cxx | 79 +-
.../app/otbRigidTransformResample.cxx | 7 +-
.../AppProjection/app/otbSuperimpose.cxx | 20 +-
.../app/otbVectorDataReprojection.cxx | 2 +-
.../Applications/AppProjection/test/CMakeLists.txt | 1 +
.../AppSARCalibration/test/CMakeLists.txt | 12 +-
.../app/otbConnectedComponentSegmentation.cxx | 2 +-
.../app/otbHooverCompareSegmentation.cxx | 8 +-
.../AppSegmentation/app/otbMeanShiftSmoothing.cxx | 2 +-
.../AppSegmentation/app/otbSegmentation.cxx | 4 +-
.../AppStereo/app/otbStereoFramework.cxx | 4 +-
.../AppTest/app/otbTestApplication.cxx | 7 +-
Modules/Applications/AppTest/test/CMakeLists.txt | 23 +
.../AppTest/test/otbWrapperApplicationDocTests.cxx | 1 +
.../app/otbHaralickTextureExtraction.cxx | 21 +-
.../AppTextures/app/otbSFSTextureExtraction.cxx | 2 +-
.../app/otbRasterization.cxx | 2 +-
.../AppVectorUtils/app/otbOSMDownloader.cxx | 2 +
.../AppVectorUtils/app/otbVectorDataExtractROI.cxx | 1 +
Modules/Core/ImageBase/test/CMakeLists.txt | 17 -
.../include/otbBCOInterpolateImageFunction.txx | 28 +-
.../src/otbSentinel1ImageMetadataInterface.cxx | 4 +-
Modules/Core/Metadata/test/CMakeLists.txt | 2 +-
.../include/otbStreamingWarpImageFilter.h | 2 +-
.../include/otbDescriptorsListSampleGenerator.txx | 24 +-
.../otbScalarImageToAdvancedTexturesFilter.h | 19 +
.../otbScalarImageToAdvancedTexturesFilter.txx | 53 +-
.../otbScalarImageToHigherOrderTexturesFilter.h | 20 +
.../otbScalarImageToHigherOrderTexturesFilter.txx | 61 +-
.../include/otbScalarImageToTexturesFilter.h | 19 +
.../include/otbScalarImageToTexturesFilter.txx | 52 +-
.../otbOverlapSaveConvolutionImageFilter.txx | 6 +
.../include/otbStreamingShrinkImageFilter.h | 4 +-
.../include/otbStreamingShrinkImageFilter.txx | 21 +-
.../include/otbVectorRescaleIntensityImageFilter.h | 5 +
.../src/otbStreamingShrinkImageFilter.cxx | 26 +-
Modules/Filtering/MathParserX/include/otbParserX.h | 9 +-
.../include/otbMeanShiftSmoothingImageFilter.txx | 2 +-
.../Statistics/include/otbPeriodicSampler.h | 6 +
.../otbStreamingStatisticsVectorImageFilter.h | 31 +-
.../otbStreamingStatisticsVectorImageFilter.txx | 56 +-
.../Statistics/src/otbPeriodicSampler.cxx | 23 +-
.../Filtering/Statistics/test/otbSamplerTest.cxx | 1 +
.../Wavelet/include/otbSubsampleImageFilter.h | 1 -
.../Wavelet/include/otbSubsampleImageFilter.txx | 7 +-
.../Wavelet/include/otbWaveletFilterBank.h | 5 +
.../Wavelet/include/otbWaveletFilterBank.txx | 27 +-
.../Wavelet/include/otbWaveletImageFilter.h | 112 ++
.../Wavelet/include/otbWaveletImageFilter.txx | 95 ++
.../Wavelet/include/otbWaveletInverseImageFilter.h | 113 ++
.../include/otbWaveletInverseImageFilter.txx | 109 ++
...aveletsBandsListToWaveletsSynopsisImageFilter.h | 103 ++
...eletsBandsListToWaveletsSynopsisImageFilter.txx | 222 +++
...aveletsSynopsisImageToWaveletsBandsListFilter.h | 122 ++
...eletsSynopsisImageToWaveletsBandsListFilter.txx | 179 ++
Modules/Filtering/Wavelet/test/CMakeLists.txt | 9 +
.../Wavelet/test/otbWaveletImageToImageFilter.cxx | 87 +
.../Wavelet/test/otbWaveletTestDriver.cxx | 1 +
.../otbNeighborhoodMajorityVotingImageFilter.txx | 24 +-
.../otbSimpleRcsPanSharpeningFusionImageFilter.h | 101 +-
.../otbSimpleRcsPanSharpeningFusionImageFilter.txx | 95 +-
Modules/IO/IOGDAL/src/otbGDALOverviewsBuilder.cxx | 2 +-
Modules/IO/IOJPEG2000/CMakeLists.txt | 4 -
Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h | 175 --
.../IOJPEG2000/include/otbJPEG2000ImageIOFactory.h | 69 -
Modules/IO/IOJPEG2000/otb-module.cmake | 22 -
Modules/IO/IOJPEG2000/src/CMakeLists.txt | 18 -
Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx | 1796 --------------------
.../IOJPEG2000/src/otbJPEG2000ImageIOFactory.cxx | 65 -
Modules/IO/IOJPEG2000/test/CMakeLists.txt | 80 -
.../test/otbGenerateClassicalQLWithJPEG2000.cxx | 65 -
.../IO/IOJPEG2000/test/otbIOJPEG2000TestDriver.cxx | 7 -
.../test/otbJPEG2000ImageIOTestCanRead.cxx | 36 -
.../test/otbJPEG2000ImageIOTestCanWrite.cxx | 37 -
Modules/IO/ImageIO/include/otbImageFileReader.txx | 3 -
Modules/IO/ImageIO/otb-module.cmake | 3 -
Modules/IO/ImageIO/src/CMakeLists.txt | 1 -
Modules/IO/ImageIO/src/otbImageIOFactory.cxx | 7 -
.../include/otbOGRDataToSamplePositionFilter.h | 6 +-
.../include/otbOGRDataToSamplePositionFilter.txx | 12 +-
.../Sampling/src/otbSamplingRateCalculator.cxx | 30 +-
.../Sampling/src/otbSamplingRateCalculatorList.cxx | 26 +-
.../include/otbImageClassificationFilter.txx | 9 +-
.../otbSharkRandomForestsMachineLearningModel.h | 3 +
.../Learning/Supervised/include/otbSharkUtils.h | 1 +
Modules/MPI/MPIConfig/src/otbMPIConfig.cxx | 1 +
.../include/otbSimpleParallelTiffWriter.h | 1 +
Modules/Remote/Mosaic.remote.cmake | 2 +-
Modules/Remote/otb-bv.remote.cmake | 2 +-
Modules/Remote/otbFFSforGMM.remote.cmake | 4 +-
Modules/Remote/phenotb.remote.cmake | 2 +-
Modules/Remote/temporal-gapfilling.remote.cmake | 2 +-
Modules/ThirdParty/GDAL/otb-module-init.cmake | 26 +-
Modules/ThirdParty/MuParserX/CMakeLists.txt | 8 -
Modules/ThirdParty/MuParserX/otb-module.cmake | 2 +
Modules/ThirdParty/MuParserX/src/mpCompat.h.in | 46 -
Modules/ThirdParty/OpenGL/CMakeLists.txt | 2 +-
Modules/ThirdParty/OpenGL/otb-module-init.cmake | 68 +-
Modules/ThirdParty/OpenJPEG/CMakeLists.txt | 32 -
Modules/ThirdParty/OpenJPEG/otb-module-init.cmake | 2 -
Modules/ThirdParty/OpenJPEG/otb-module.cmake | 12 -
Modules/ThirdParty/OpenJPEG/src/otb_openjpeg.h.in | 29 -
.../OssimPlugins/src/ossim/ossimSentinel1Model.cpp | 37 +-
.../ThirdParty/OssimPlugins/test/CMakeLists.txt | 56 +-
Modules/ThirdParty/Shark/src/otb_shark.h.in | 2 +-
Modules/ThirdParty/SiftFast/src/CMakeLists.txt | 4 +-
Modules/ThirdParty/SiftFast/src/libsiftfast.cpp | 2 +
Modules/Visualization/Ice/include/otbGlView.h | 13 +-
.../Visualization/Ice/include/otbStandardShader.h | 12 +-
Modules/Visualization/Ice/src/otbGlImageActor.cxx | 4 +-
.../Visualization/Ice/src/otbStandardShader.cxx | 138 +-
.../Visualization/IceViewer/src/otbIceViewer.cxx | 30 +
.../Mapla/src/mvdMaplaApplication.cxx | 2 +
.../Monteverdi/include/mvdMainWindow.h | 15 +-
.../Visualization/Monteverdi/src/CMakeLists.txt | 8 +
Modules/Visualization/Monteverdi/src/main.cxx | 75 +-
.../Monteverdi/src/mvdApplication.cxx | 8 +
.../Visualization/Monteverdi/src/mvdMainWindow.cxx | 130 +-
.../Visualization/Monteverdi/src/mvdMainWindow.qrc | 2 +-
.../Visualization/Monteverdi/src/mvdMainWindow.ui | 25 +
.../Visualization/MonteverdiCore/include/mvdCore.h | 12 +-
.../MonteverdiCore/include/mvdImageSettings.h | 14 +-
.../MonteverdiCore/include/mvdTypes.h | 1 +
.../include/mvdVectorImageSettings.h | 12 +
.../Visualization/MonteverdiCore/src/mvdCore.cxx | 12 +-
.../MonteverdiCore/src/mvdI18nCoreApplication.cxx | 11 +-
.../MonteverdiCore/src/mvdImageSettings.cxx | 50 +
.../MonteverdiCore/src/mvdStackedLayerModel.cxx | 6 +-
.../MonteverdiCore/src/mvdVectorImageModel.cxx | 4 +-
Modules/Visualization/MonteverdiGui/CMakeLists.txt | 41 +
.../include/mvdAbstractImageViewRenderer.h | 13 +-
.../MonteverdiGui/include/mvdColorDynamicsWidget.h | 2 +
.../MonteverdiGui/include/mvdImageViewRenderer.h | 1 +
.../MonteverdiGui/include/mvdImageViewWidget.h | 1 +
.../MonteverdiGui/include/mvdImportImagesDialog.h | 4 -
.../include/mvdLayerStackController.h | 1 +
.../MonteverdiGui/include/mvdLayerStackWidget.h | 5 +
.../MonteverdiGui/include/mvdShaderWidget.h | 6 +-
.../Visualization/MonteverdiGui/src/CMakeLists.txt | 2 +-
.../src/mvdColorBandDynamicsWidget.ui | 2 +-
.../MonteverdiGui/src/mvdColorDynamicsWidget.cxx | 7 +
.../MonteverdiGui/src/mvdColorDynamicsWidget.ui | 15 +-
.../MonteverdiGui/src/mvdColorSetupWidget.ui | 39 +-
.../MonteverdiGui/src/mvdHistogramWidget.ui | 2 +-
.../MonteverdiGui/src/mvdI18nMainWindow.cxx | 14 +
.../Visualization/MonteverdiGui/src/mvdIcons.qrc | 2 +
.../MonteverdiGui/src/mvdImageViewRenderer.cxx | 112 +-
.../MonteverdiGui/src/mvdImageViewWidget.cxx | 24 +
.../MonteverdiGui/src/mvdImportImagesDialog.cxx | 33 +-
.../MonteverdiGui/src/mvdLayerStackController.cxx | 18 +
.../MonteverdiGui/src/mvdLayerStackItemModel.cxx | 7 +-
.../MonteverdiGui/src/mvdLayerStackWidget.cxx | 20 +
.../MonteverdiGui/src/mvdLayerStackWidget.ui | 45 +-
.../MonteverdiGui/src/mvdShaderWidget.cxx | 39 +-
.../include/otbWrapperApplication.h | 120 +-
.../include/otbWrapperCompositeApplication.h | 158 ++
.../include/otbWrapperListViewParameter.h | 54 +-
.../include/otbWrapperOutputImageParameter.h | 2 +
.../include/otbWrapperOutputProcessXMLParameter.h | 2 +
.../include/otbWrapperParameterGroup.h | 12 +-
.../include/otbWrapperParameterKey.h | 4 +-
.../include/otbWrapperProxyParameter.h | 71 +
.../Wrappers/ApplicationEngine/src/CMakeLists.txt | 1 +
.../src/otbWrapperApplication.cxx | 403 +++--
.../src/otbWrapperApplicationHtmlDocGenerator.cxx | 110 +-
.../src/otbWrapperChoiceParameter.cxx | 11 +-
.../src/otbWrapperComplexOutputImageParameter.cxx | 4 +-
.../src/otbWrapperCompositeApplication.cxx | 216 +++
.../src/otbWrapperElevationParametersHandler.cxx | 24 +-
.../src/otbWrapperListViewParameter.cxx | 32 +-
.../src/otbWrapperOutputImageParameter.cxx | 43 +
.../src/otbWrapperOutputProcessXMLParameter.cxx | 20 +-
.../src/otbWrapperParameterGroup.cxx | 183 +-
.../Wrappers/ApplicationEngine/test/CMakeLists.txt | 4 +
.../test/otbApplicationEngineTestDriver.cxx | 1 +
.../test/otbApplicationMemoryConnectTest.cxx | 1 +
.../test/otbWrapperParameterListTest.cxx | 66 +
.../src/otbWrapperCommandLineLauncher.cxx | 26 +-
.../QtWidget/include/otbWrapperQtWidgetModel.h | 5 +
.../QtWidget/include/otbWrapperQtWidgetView.h | 1 +
.../QtWidget/src/otbApplicationLauncherQt.cxx | 9 +-
.../src/otbWrapperQtWidgetListViewParameter.cxx | 14 +-
.../QtWidget/src/otbWrapperQtWidgetModel.cxx | 127 +-
.../src/otbWrapperQtWidgetParameterGroup.cxx | 5 +-
.../src/otbWrapperQtWidgetParameterLabel.cxx | 2 +-
.../src/otbWrapperQtWidgetSimpleProgressReport.cxx | 3 +-
.../QtWidget/src/otbWrapperQtWidgetView.cxx | 19 +-
.../QtWidget/test/otbWrapperQtWidgetShowWidget.cxx | 2 +
Modules/Wrappers/SWIG/src/CMakeLists.txt | 11 +-
Modules/Wrappers/SWIG/src/otbApplication.i | 20 +-
.../SWIG/test/python/PythonConnectApplications.py | 1 +
RELEASE_NOTES.txt | 60 +-
Utilities/Data/CMakeLists.txt | 43 -
Utilities/Data/Icons/edit-clear.png | Bin 0 -> 773 bytes
Utilities/Data/Icons/layer-delete.png | Bin 0 -> 925 bytes
Utilities/Data/Icons/layer-delete_24x24.png | Bin 489 -> 0 bytes
Utilities/Data/Icons/layers-remove_24x24.png | Bin 658 -> 391 bytes
Utilities/Data/Icons/view-refresh.png | Bin 0 -> 912 bytes
.../{monteverdi.desktop => monteverdi.desktop.in} | 5 +-
Utilities/Maintenance/TravisBuild.cmake | 4 +-
i18n/fr_FR.ts | 92 +-
284 files changed, 6073 insertions(+), 4492 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