diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-16 23:44:58 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-17 03:16:11 +0200 |
commit | a8a8cfac5f1be7e0cbfadcc2def8aaa0e8d9d9a0 (patch) | |
tree | bdbd4ca204fec2009a003d7f9e140706afe38446 /ftnoir_tracker_aruco | |
parent | 3e71e6218557bf14220a23d5afb772c170545cb4 (diff) |
all except 3rdparty-maintained stuff pass -Wall -Wextra -pedantic
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
Diffstat (limited to 'ftnoir_tracker_aruco')
-rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp | 4 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.h | 4 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/include/boarddetector.h | 2 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/include/cvdrawingutils.h | 2 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/include/markerdetector.h | 6 |
5 files changed, 7 insertions, 11 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp index c735b479..a221c2ff 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp @@ -385,11 +385,11 @@ TrackerControls::~TrackerControls() { } -void TrackerControls::showEvent(QShowEvent *event) +void TrackerControls::showEvent(QShowEvent *) { } -void TrackerControls::Initialize(QWidget* parent) +void TrackerControls::Initialize(QWidget*) { loadSettings(); show(); diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h index 0f811f5d..260ca41e 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h @@ -54,9 +54,9 @@ public: explicit TrackerControls(); virtual ~TrackerControls(); - void showEvent ( QShowEvent * event ); + void showEvent (QShowEvent *); - void Initialize(QWidget *parent); + void Initialize(QWidget *); void registerTracker(ITracker *) {} void unRegisterTracker() {} diff --git a/ftnoir_tracker_aruco/include/boarddetector.h b/ftnoir_tracker_aruco/include/boarddetector.h index a0ee2361..4770b5c9 100644 --- a/ftnoir_tracker_aruco/include/boarddetector.h +++ b/ftnoir_tracker_aruco/include/boarddetector.h @@ -134,6 +134,6 @@ private: }; -}; +} #endif diff --git a/ftnoir_tracker_aruco/include/cvdrawingutils.h b/ftnoir_tracker_aruco/include/cvdrawingutils.h index ff67242f..38e9986e 100644 --- a/ftnoir_tracker_aruco/include/cvdrawingutils.h +++ b/ftnoir_tracker_aruco/include/cvdrawingutils.h @@ -46,7 +46,7 @@ namespace aruco static void draw3dCube(cv::Mat &Image,Board &m,const CameraParameters &CP); }; -}; +} #endif diff --git a/ftnoir_tracker_aruco/include/markerdetector.h b/ftnoir_tracker_aruco/include/markerdetector.h index 68aa7f8a..4d6e7b90 100644 --- a/ftnoir_tracker_aruco/include/markerdetector.h +++ b/ftnoir_tracker_aruco/include/markerdetector.h @@ -353,9 +353,5 @@ private: void draw(cv::Mat out,const std::vector<Marker> &markers ); }; - - - - -}; +} #endif |