summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco/include/markerdetector.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-10-05 19:55:05 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-10-05 19:55:05 +0200
commitf4754d23984126de847279f4abad4ae713d9e386 (patch)
tree78757d55b07887da427058853d88718ce27c2028 /ftnoir_tracker_aruco/include/markerdetector.h
parentcfffa29e29db6b2234c7f534b1ebcd612b7f4914 (diff)
flush and push
Diffstat (limited to 'ftnoir_tracker_aruco/include/markerdetector.h')
-rw-r--r--ftnoir_tracker_aruco/include/markerdetector.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/ftnoir_tracker_aruco/include/markerdetector.h b/ftnoir_tracker_aruco/include/markerdetector.h
index a4656527..6f489c34 100644
--- a/ftnoir_tracker_aruco/include/markerdetector.h
+++ b/ftnoir_tracker_aruco/include/markerdetector.h
@@ -52,13 +52,11 @@ class ARUCO_EXPORTS MarkerDetector
contour=M.contour;
idx=M.idx;
}
- MarkerCandidate operator=(const MarkerCandidate &M){
- if (this == &M)
- return *this;
+ MarkerCandidate & operator=(const MarkerCandidate &M){
(*(Marker*)this)=(*(Marker*)&M);
contour=M.contour;
idx=M.idx;
- return M;
+ return *this;
}
vector<cv::Point> contour;//all the points of its contour
@@ -69,11 +67,11 @@ public:
/**
* See
*/
- MarkerDetector() {}
+ MarkerDetector();
/**
*/
- ~MarkerDetector() {}
+ ~MarkerDetector();
/**Detects the markers in the image passed
*
@@ -353,5 +351,9 @@ private:
void draw(cv::Mat out,const std::vector<Marker> &markers );
};
-}
+
+
+
+
+};
#endif