diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-25 11:43:10 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-25 11:43:10 +0200 |
| commit | 10ac081b3c4ebb9b29b81b30f5efe6622f4212bc (patch) | |
| tree | fedfe7efc494145d0b46e91ba5a94c47cb0c1b6f /ftnoir_tracker_aruco/include/boarddetector.h | |
| parent | 6baa8ca1070612e5d7cbae7aa62cbe4a9e51ad40 (diff) | |
| parent | 24538cf3a3a91481851618791b11be81437563e4 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_aruco/include/boarddetector.h')
| -rw-r--r-- | ftnoir_tracker_aruco/include/boarddetector.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ftnoir_tracker_aruco/include/boarddetector.h b/ftnoir_tracker_aruco/include/boarddetector.h index a0ee2361..619b4798 100644 --- a/ftnoir_tracker_aruco/include/boarddetector.h +++ b/ftnoir_tracker_aruco/include/boarddetector.h @@ -32,11 +32,10 @@ or implied, of Rafael Muñoz Salinas. #include "board.h" #include "cameraparameters.h" #include "markerdetector.h" -using namespace std; namespace aruco { - +using namespace std; /**\brief This class detects AR boards * Version 1.2 * There are two modes for board detection. |