summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-10-16 23:29:16 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-10-17 03:16:10 +0200
commit4157874768594164e1d5b366e5a9cb9bc931e761 (patch)
tree94f5001ccb85dce2759f8e54b612bdd0e5903a79 /ftnoir_tracker_aruco
parent1a77ab96501324a7417c970bec753e1304931267 (diff)
pass -Wall -Wextra -pedantic
Diffstat (limited to 'ftnoir_tracker_aruco')
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h2
-rw-r--r--ftnoir_tracker_aruco/include/markerdetector.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index ddbdd179..0f811f5d 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -57,7 +57,7 @@ public:
void showEvent ( QShowEvent * event );
void Initialize(QWidget *parent);
- void registerTracker(ITracker *tracker) {}
+ void registerTracker(ITracker *) {}
void unRegisterTracker() {}
private:
diff --git a/ftnoir_tracker_aruco/include/markerdetector.h b/ftnoir_tracker_aruco/include/markerdetector.h
index 35369cea..68aa7f8a 100644
--- a/ftnoir_tracker_aruco/include/markerdetector.h
+++ b/ftnoir_tracker_aruco/include/markerdetector.h
@@ -52,10 +52,13 @@ class ARUCO_EXPORTS MarkerDetector
contour=M.contour;
idx=M.idx;
}
- MarkerCandidate & operator=(const MarkerCandidate &M){
+ MarkerCandidate operator=(const MarkerCandidate &M){
+ if (this == &M)
+ return *this;
(*(Marker*)this)=(*(Marker*)&M);
contour=M.contour;
idx=M.idx;
+ return M;
}
vector<cv::Point> contour;//all the points of its contour