Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

otb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

77f80161

Commit 77f80161 authored 8 years ago by Julien Michel

Downloads
- Plain Diff

Merge branch 'develop' into shark-integration-enhancements

parents d231e0dc ae41903a

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CMake/OTBSetStandardCompilerFlags.cmake 11 additions, 13 deletions

CMake/OTBSetStandardCompilerFlags.cmake
Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx 3 additions, 1 deletion

Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterWorld.cxx 6 additions, 0 deletions

...ectorDataRendering/test/otbVectorDataToMapFilterWorld.cxx
Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx 5 additions, 2 deletions

Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
Modules/ThirdParty/OssimPlugins/src/CMakeLists.txt 12 additions, 24 deletions

Modules/ThirdParty/OssimPlugins/src/CMakeLists.txt
Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h 6 additions, 0 deletions

...alization/MonteverdiGui/include/mvdImageViewManipulator.h
Modules/Visualization/MonteverdiGui/src/mvdImageViewManipulator.cxx 52 additions, 32 deletions

...sualization/MonteverdiGui/src/mvdImageViewManipulator.cxx
SuperBuild/CMake/External_gdal.cmake 8 additions, 7 deletions

SuperBuild/CMake/External_gdal.cmake
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in 0 additions, 6 deletions

SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in

with 103 additions and 85 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment