Merge branch 'joan_fixes' into 'master' (29ff87bc) · Commits · labrobotica / algorithms / vision_utils · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

vision_utils
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

29ff87bc

Commit 29ff87bc authored 7 years ago by Angel Santamaria-Navarro

Downloads
- Plain Diff

Merge branch 'joan_fixes' into 'master'

Joan fixes

See merge request asantamaria/vision_utils!1

parents 0085b9dc 26dabc6e

No related branches found

No related tags found

1 merge request!1Joan fixes

Changes 55

Hide whitespace changes

Inline Side-by-side

Showing

src/detectors/sbd/detector_sbd.cpp 1 addition, 1 deletion

src/detectors/sbd/detector_sbd.cpp
src/detectors/sbd/detector_sbd.h 2 additions, 2 deletions

src/detectors/sbd/detector_sbd.h
src/detectors/sift/detector_sift.cpp 1 addition, 1 deletion

src/detectors/sift/detector_sift.cpp
src/detectors/sift/detector_sift.h 2 additions, 2 deletions

src/detectors/sift/detector_sift.h
src/detectors/surf/detector_surf.cpp 1 addition, 1 deletion

src/detectors/surf/detector_surf.cpp
src/detectors/surf/detector_surf.h 2 additions, 2 deletions

src/detectors/surf/detector_surf.h
src/matchers/bruteforce/matcher_bruteforce.h 1 addition, 1 deletion

src/matchers/bruteforce/matcher_bruteforce.h
src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h 1 addition, 1 deletion

src/matchers/bruteforce_hamming/matcher_bruteforce_hamming.h
src/matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h 1 addition, 1 deletion

...chers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h
src/matchers/bruteforce_l1/matcher_bruteforce_l1.h 1 addition, 1 deletion

src/matchers/bruteforce_l1/matcher_bruteforce_l1.h
src/matchers/flannbased/matcher_flannbased.h 1 addition, 1 deletion

src/matchers/flannbased/matcher_flannbased.h
src/matchers/matcher_base.h 1 addition, 1 deletion

src/matchers/matcher_base.h
src/sensors/sensor_base.h 1 addition, 1 deletion

src/sensors/sensor_base.h
src/sensors/usb_cam/usb_cam.h 1 addition, 1 deletion

src/sensors/usb_cam/usb_cam.h
src/vision_utils.h 2 additions, 2 deletions

src/vision_utils.h

with 19 additions and 19 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