Merge branch 'master' into jet_autodiff (50c46bba) · Commits · mobile_robotics / wolf_projects / wolf_lib / wolf · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

wolf
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

50c46bba

Commit 50c46bba authored 7 years ago by Joan Solà Ortega

Downloads
- Plain Diff

Merge branch 'master' into jet_autodiff

Conflicts:
	src/examples/CMakeLists.txt

parents 60881f75 e0406590

No related branches found

No related tags found

1 merge request!111Jet autodiff

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

README.md 29 additions, 6 deletions

README.md
src/CMakeLists.txt 12 additions, 4 deletions

src/CMakeLists.txt
src/examples/CMakeLists.txt 8 additions, 10 deletions

src/examples/CMakeLists.txt
src/examples/processor_image_ORB.yaml 2 additions, 1 deletion

src/examples/processor_image_ORB.yaml
src/examples/test_ROI_ORB.cpp 11 additions, 4 deletions

src/examples/test_ROI_ORB.cpp
src/examples/test_opencv.cpp 22 additions, 20 deletions

src/examples/test_opencv.cpp
src/examples/test_tracker_ORB.cpp 62 additions, 71 deletions

src/examples/test_tracker_ORB.cpp
src/processor_image_feature.cpp 72 additions, 1 deletion

src/processor_image_feature.cpp
src/processor_image_feature.h 29 additions, 18 deletions

src/processor_image_feature.h
src/processor_image_landmark.cpp 75 additions, 1 deletion

src/processor_image_landmark.cpp
src/processor_image_landmark.h 17 additions, 4 deletions

src/processor_image_landmark.h
src/test/gtest_roi_ORB.cpp 28 additions, 10 deletions

src/test/gtest_roi_ORB.cpp

with 367 additions and 150 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