Commit 47b24239 authored 9 years ago by Julien Michel

Merge branch 'develop' into fix-1087

parents 2d2bb896 8c05017b

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CMake/CTestCustom.cmake.in 3 additions, 0 deletions

CMake/CTestCustom.cmake.in
Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx 1 addition, 3 deletions

...es/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h 0 additions, 93 deletions

.../Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h
Modules/Adapters/OSSIMAdapters/src/CMakeLists.txt 1 addition, 2 deletions

Modules/Adapters/OSSIMAdapters/src/CMakeLists.txt
Modules/Adapters/OSSIMAdapters/src/otbRPCProjectionAdapter.cxx 0 additions, 161 deletions

...es/Adapters/OSSIMAdapters/src/otbRPCProjectionAdapter.cxx
Modules/Core/Common/include/otbDecimateImageFilter.txx 1 addition, 1 deletion

Modules/Core/Common/include/otbDecimateImageFilter.txx
Modules/Core/Common/include/otbDotProductImageFilter.h 1 addition, 1 deletion

Modules/Core/Common/include/otbDotProductImageFilter.h
Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h 1 addition, 1 deletion

...e/VectorDataBase/include/otbGISConnectionImplementation.h
Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h 0 additions, 164 deletions

...CooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.txx 0 additions, 196 deletions

...occurrenceMatrixAdvancedTextureCoefficientsCalculator.txx
Modules/Feature/Textures/test/CMakeLists.txt 0 additions, 12 deletions

Modules/Feature/Textures/test/CMakeLists.txt
Modules/Feature/Textures/test/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx 0 additions, 196 deletions

...occurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
Modules/Feature/Textures/test/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx 0 additions, 33 deletions

...urrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
Modules/Feature/Textures/test/otbTexturesTestDriver.cxx 0 additions, 2 deletions

Modules/Feature/Textures/test/otbTexturesTestDriver.cxx
Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h 1 addition, 1 deletion

...nipulation/include/otbConcatenateScalarValueImageFilter.h
Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h 1 addition, 1 deletion

...arser/include/otbParserConditionDataNodeFeatureFunction.h
Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h 1 addition, 1 deletion

...g/Projection/include/otbProjectiveProjectionImageFilter.h
Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx 2 additions, 2 deletions

Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx 2 additions, 2 deletions

...rspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx
Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx 2 additions, 2 deletions

...rspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx

with 17 additions and 874 deletions

Please register or to comment