pass -Wall -Wextra -pedantic

4 files changed, 10 insertions, 7 deletions

diff --git a/ftnoir_csv/csv.cpp b/ftnoir_csv/csv.cpp
index 4753e8df..4e76e844 100644
--- a/ftnoir_csv/csv.cpp
+++ b/ftnoir_csv/csv.cpp
@@ -137,7 +137,7 @@ void CSV::getGameData( const int id, unsigned char* table, QString& gamename)
 		if (gameLine.count() > 6) {
 			if (gameLine.at(6).compare( gameID, Qt::CaseInsensitive ) == 0) {
                 QByteArray id = gameLine.at(7).toLatin1();
-                int tmp[8];
+                unsigned int tmp[8];
                 int fuzz[3];
                 if (gameLine.at(3) == QString("V160"))
                 {
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
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
index 64eaaa42..db6f658c 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
@@ -18,22 +18,22 @@ FTNoIR_TrackerDll::~FTNoIR_TrackerDll()
 void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled)
 {
 	*strToBeFilled = trackerFullName;
-};
+}
 
 void FTNoIR_TrackerDll::getShortName(QString *strToBeFilled)
 {
 	*strToBeFilled = trackerShortName;
-};
+}
 
 void FTNoIR_TrackerDll::getDescription(QString *strToBeFilled)
 {
 	*strToBeFilled = trackerDescription;
-};
+}
 
 void FTNoIR_TrackerDll::getIcon(QIcon *icon)
 {
     *icon = QIcon(":/images/facetracknoir.png");
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // Factory function that creates instances if the Tracker object.