Commit 1ffa7b13 authored 8 years ago by Mickael Savinaud

Merge branch 'develop' into improve_CompareImages_app

parents 82d427e0 239e3c73

Branches

Tags

Hide whitespace changes

Inline Side-by-side

Showing

Modules/Applications/AppClassification/app/CMakeLists.txt 6 additions, 1 deletion

Modules/Applications/AppClassification/app/CMakeLists.txt
Modules/Applications/AppClassification/app/otbSampleExtraction.cxx 171 additions, 0 deletions

...pplications/AppClassification/app/otbSampleExtraction.cxx
Modules/Applications/AppClassification/app/otbSampleSelection.cxx 1 addition, 1 deletion

...Applications/AppClassification/app/otbSampleSelection.cxx
Modules/Applications/AppClassification/test/CMakeLists.txt 11 additions, 0 deletions

Modules/Applications/AppClassification/test/CMakeLists.txt
Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx 7 additions, 7 deletions

.../Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
Modules/Core/ImageBase/test/CMakeLists.txt 40 additions, 36 deletions

Modules/Core/ImageBase/test/CMakeLists.txt
Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx 4 additions, 3 deletions

...stics/include/otbStreamingStatisticsVectorImageFilter.txx
Modules/IO/IOGDAL/test/CMakeLists.txt 9 additions, 7 deletions

Modules/IO/IOGDAL/test/CMakeLists.txt
Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h 191 additions, 0 deletions

...Learning/Sampling/include/otbImageSampleExtractorFilter.h
Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.txx 360 additions, 0 deletions

...arning/Sampling/include/otbImageSampleExtractorFilter.txx
Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.txx 2 additions, 4 deletions

...ing/Sampling/include/otbOGRDataToSamplePositionFilter.txx
Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h 23 additions, 3 deletions

...arning/Sampling/include/otbPersistentSamplingFilterBase.h
Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.txx 66 additions, 12 deletions

...ning/Sampling/include/otbPersistentSamplingFilterBase.txx
Modules/Learning/Sampling/otb-module.cmake 1 addition, 0 deletions

Modules/Learning/Sampling/otb-module.cmake
Modules/Learning/Sampling/test/CMakeLists.txt 20 additions, 0 deletions

Modules/Learning/Sampling/test/CMakeLists.txt
Modules/Learning/Sampling/test/otbImageSampleExtractorFilterTest.cxx 169 additions, 0 deletions

...rning/Sampling/test/otbImageSampleExtractorFilterTest.cxx
Modules/Learning/Sampling/test/otbSamplingTestDriver.cxx 3 additions, 0 deletions

Modules/Learning/Sampling/test/otbSamplingTestDriver.cxx
Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.txx 2 additions, 1 deletion

...pervised/include/otbNeuralNetworkMachineLearningModel.txx
Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h 16 additions, 0 deletions

...on/Conversion/include/otbPersistentImageToOGRDataFilter.h
Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx 15 additions, 21 deletions

.../Conversion/include/otbPersistentImageToOGRDataFilter.txx

with 1117 additions and 96 deletions

Please register or to comment