summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco/include
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-24 14:08:44 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-24 14:11:07 +0200
commit7d0c58540103e9182ba584b440b91068df03a49c (patch)
tree21ab00a85b0c74d3dcb9064aa838136473b4c7ac /ftnoir_tracker_aruco/include
parent948fb5ef0ffd6a83675763d80053a433e09aea06 (diff)
standardize on not using "using namespace {cv,std}"
Diffstat (limited to 'ftnoir_tracker_aruco/include')
-rw-r--r--ftnoir_tracker_aruco/include/board.h2
-rw-r--r--ftnoir_tracker_aruco/include/boarddetector.h3
-rw-r--r--ftnoir_tracker_aruco/include/cameraparameters.h3
-rw-r--r--ftnoir_tracker_aruco/include/marker.h2
-rw-r--r--ftnoir_tracker_aruco/include/markerdetector.h3
5 files changed, 6 insertions, 7 deletions
diff --git a/ftnoir_tracker_aruco/include/board.h b/ftnoir_tracker_aruco/include/board.h
index c1d79292..ec7dd43f 100644
--- a/ftnoir_tracker_aruco/include/board.h
+++ b/ftnoir_tracker_aruco/include/board.h
@@ -32,8 +32,8 @@ or implied, of Rafael Muñoz Salinas.
#include <vector>
#include "exports.h"
#include "marker.h"
-using namespace std;
namespace aruco {
+using namespace std;
/**
* 3d representation of a marker
*/
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.
diff --git a/ftnoir_tracker_aruco/include/cameraparameters.h b/ftnoir_tracker_aruco/include/cameraparameters.h
index a419afbe..083d5f96 100644
--- a/ftnoir_tracker_aruco/include/cameraparameters.h
+++ b/ftnoir_tracker_aruco/include/cameraparameters.h
@@ -30,9 +30,10 @@ or implied, of Rafael Muñoz Salinas.
#include "exports.h"
#include <opencv2/core/core.hpp>
#include <string>
-using namespace std;
+
namespace aruco
{
+using namespace std;
/**\brief Parameters of the camera
*/
diff --git a/ftnoir_tracker_aruco/include/marker.h b/ftnoir_tracker_aruco/include/marker.h
index 89961002..efc3e5fe 100644
--- a/ftnoir_tracker_aruco/include/marker.h
+++ b/ftnoir_tracker_aruco/include/marker.h
@@ -32,8 +32,8 @@ or implied, of Rafael Muñoz Salinas.
#include <opencv2/core/core.hpp>
#include "exports.h"
#include "cameraparameters.h"
-using namespace std;
namespace aruco {
+using namespace std;
/**\brief This class represents a marker. It is a vector of the fours corners ot the marker
*
*/
diff --git a/ftnoir_tracker_aruco/include/markerdetector.h b/ftnoir_tracker_aruco/include/markerdetector.h
index 8a351f7c..ac120b18 100644
--- a/ftnoir_tracker_aruco/include/markerdetector.h
+++ b/ftnoir_tracker_aruco/include/markerdetector.h
@@ -33,11 +33,10 @@ or implied, of Rafael Muñoz Salinas.
#include "cameraparameters.h"
#include "exports.h"
#include "marker.h"
-using namespace std;
namespace aruco
{
-
+using namespace std;
/**\brief Main class for marker detection
*
*/