Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

afde7ad7

Commit afde7ad7 authored 5 years ago by Cédric Traizet

Downloads
- Plain Diff

MRG: resolve conflicts

parents 2997e1a4 f53e0e64

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CMake/FindOpenCV.cmake 9 additions, 10 deletions

CMake/FindOpenCV.cmake
Modules/Learning/Supervised/include/otbCvRTreesWrapper.h 4 additions, 0 deletions

Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h 4 additions, 2 deletions

...Supervised/include/otbNeuralNetworkMachineLearningModel.h
Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx 32 additions, 31 deletions

...pervised/include/otbNeuralNetworkMachineLearningModel.hxx
Modules/Learning/Supervised/src/otbCvRTreesWrapper.cxx 7 additions, 0 deletions

Modules/Learning/Supervised/src/otbCvRTreesWrapper.cxx
Modules/ThirdParty/OpenCV/otb-module-init.cmake 8 additions, 1 deletion

Modules/ThirdParty/OpenCV/otb-module-init.cmake
Modules/ThirdParty/OpenCV/src/otb_opencv_api.h.in 1 addition, 0 deletions

Modules/ThirdParty/OpenCV/src/otb_opencv_api.h.in
SuperBuild/CMake/External_opencv.cmake 2 additions, 2 deletions

SuperBuild/CMake/External_opencv.cmake
SuperBuild/patches/OPENCV/opencv-1-install-prefix-win.diff 5 additions, 5 deletions

SuperBuild/patches/OPENCV/opencv-1-install-prefix-win.diff

with 72 additions and 51 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