summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--FTNoIR_Tracker_PT/boost-compat.h2
-rw-r--r--ftnoir_csv/csv.cpp4
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp4
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h4
-rw-r--r--ftnoir_tracker_aruco/include/boarddetector.h2
-rw-r--r--ftnoir_tracker_aruco/include/cvdrawingutils.h2
-rw-r--r--ftnoir_tracker_aruco/include/markerdetector.h6
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp4
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h6
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp5
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.h8
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp2
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.cpp2
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp.h8
-rw-r--r--ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp2
-rw-r--r--x-plane-plugin/plugin.c20
16 files changed, 40 insertions, 41 deletions
diff --git a/FTNoIR_Tracker_PT/boost-compat.h b/FTNoIR_Tracker_PT/boost-compat.h
index b5be237a..612f2c4d 100644
--- a/FTNoIR_Tracker_PT/boost-compat.h
+++ b/FTNoIR_Tracker_PT/boost-compat.h
@@ -2,4 +2,4 @@
#include <memory>
namespace boost {
using std::shared_ptr;
-};
+}
diff --git a/ftnoir_csv/csv.cpp b/ftnoir_csv/csv.cpp
index 4e76e844..ebdf50bb 100644
--- a/ftnoir_csv/csv.cpp
+++ b/ftnoir_csv/csv.cpp
@@ -138,7 +138,7 @@ void CSV::getGameData( const int id, unsigned char* table, QString& gamename)
if (gameLine.at(6).compare( gameID, Qt::CaseInsensitive ) == 0) {
QByteArray id = gameLine.at(7).toLatin1();
unsigned int tmp[8];
- int fuzz[3];
+ unsigned int fuzz[3];
if (gameLine.at(3) == QString("V160"))
{
qDebug() << "no table";
@@ -155,7 +155,7 @@ void CSV::getGameData( const int id, unsigned char* table, QString& gamename)
tmp + 6,
tmp + 5,
tmp + 4,
- fuzz + 1) != 11 || ((fuzz[2] << 8) | fuzz[0]) != gameLine.at(0).toInt())
+ fuzz + 1) != 11 || (int) ((fuzz[2] << 8) | fuzz[0]) != gameLine.at(0).toInt())
{
qDebug() << "scanf failed" << fuzz[0] << fuzz[1] << fuzz[2];
}
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
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index b4fd03f6..14cd3942 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -305,11 +305,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_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index 96607411..aae4e6d6 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -46,10 +46,10 @@ public:
explicit TrackerControls();
virtual ~TrackerControls();
- void showEvent ( QShowEvent * event );
+ void showEvent (QShowEvent *);
- void Initialize(QWidget *parent);
- void registerTracker(ITracker *tracker) {}
+ void Initialize(QWidget *);
+ void registerTracker(ITracker *) {}
void unRegisterTracker() {}
private:
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
index 7333fbc4..86ca8888 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
@@ -48,7 +48,7 @@ void controller_manager_setup_callback( sixenseUtils::ControllerManager::setup_s
}
}*/
-void Hydra_Tracker::StartTracker(QFrame* videoFrame)
+void Hydra_Tracker::StartTracker(QFrame*)
{
//QMessageBox::warning(0,"FaceTrackNoIR Notification", "Tracking loading settings...",QMessageBox::Ok,QMessageBox::NoButton);
loadSettings();
@@ -78,9 +78,6 @@ bool Hydra_Tracker::GiveHeadPoseData(double *data)
//Rotation quat = Rotation(acd.controllers[0].rot_quat[1],acd.controllers[0].rot_quat[2],acd.controllers[0].rot_quat[3],acd.controllers[0].rot_quat[0]);
sixenseMath::Matrix4 mat = sixenseMath::Matrix4(acd.controllers[0].rot_mat);// sixenseMath::Quat(acd.controllers[0].rot_quat[1],acd.controllers[0].rot_quat[2],acd.controllers[0].rot_quat[3],acd.controllers[0].rot_quat[0]);
- double yaw = 0.0f;
- double pitch = 0.0f;
- double roll = 0.0f;
float ypr[3];
mat.getEulerAngles().fill(ypr);
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
index 82a72f56..19f2a685 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
@@ -11,7 +11,7 @@ public:
Hydra_Tracker();
~Hydra_Tracker();
- void StartTracker( QFrame *videoframe );
+ void StartTracker(QFrame *);
bool GiveHeadPoseData(double *data);
void loadSettings();
volatile bool should_quit;
@@ -44,11 +44,11 @@ public:
explicit TrackerControls();
~TrackerControls();
- void showEvent ( QShowEvent * event );
+ void showEvent (QShowEvent *);
void Initialize(QWidget *parent);
- void registerTracker(ITracker *tracker) {};
- void unRegisterTracker() {};
+ void registerTracker(ITracker *) {}
+ void unRegisterTracker() {}
private:
Ui::UIHydraControls ui;
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp
index 913f8070..165f8573 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp
@@ -81,7 +81,7 @@ void TrackerControls::doOK() {
}
// override show event
-void TrackerControls::showEvent ( QShowEvent * event ) {
+void TrackerControls::showEvent ( QShowEvent * ) {
loadSettings();
}
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
index d67fb636..1539707e 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp
@@ -88,7 +88,7 @@ quint16 senderPort;
}
}
-void FTNoIR_Tracker::StartTracker(QFrame* videoFrame)
+void FTNoIR_Tracker::StartTracker(QFrame*)
{
loadSettings();
//
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index e5ea7ff3..d158630b 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -15,7 +15,7 @@ public:
FTNoIR_Tracker();
~FTNoIR_Tracker();
- void StartTracker( QFrame *videoframe );
+ void StartTracker(QFrame *);
bool GiveHeadPoseData(double *data);
void loadSettings();
volatile bool should_quit;
@@ -49,11 +49,11 @@ public:
explicit TrackerControls();
~TrackerControls();
- void showEvent ( QShowEvent * event );
+ void showEvent (QShowEvent *);
void Initialize(QWidget *parent);
- void registerTracker(ITracker *tracker) {};
- void unRegisterTracker() {};
+ void registerTracker(ITracker *) {}
+ void unRegisterTracker() {}
private:
Ui::UICFTNClientControls ui;
diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
index 55bb6c97..e17d5c32 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp
@@ -81,7 +81,7 @@ void TrackerControls::doOK() {
}
// override show event
-void TrackerControls::showEvent ( QShowEvent * event ) {
+void TrackerControls::showEvent ( QShowEvent * ) {
loadSettings();
}
diff --git a/x-plane-plugin/plugin.c b/x-plane-plugin/plugin.c
index 67dab7ad..38e1e7bf 100644
--- a/x-plane-plugin/plugin.c
+++ b/x-plane-plugin/plugin.c
@@ -40,7 +40,13 @@ static WineSHM* shm_posix = NULL;
static void *view_x, *view_y, *view_z, *view_heading, *view_pitch;
static float offset_x, offset_y, offset_z;
-PortableLockedShm* PortableLockedShm_init(const char *shmName, const char *mutexName, int mapSize)
+#ifdef __GNUC__
+# define OT_UNUSED(varname) varname __attribute__((__unused__))
+#else
+# define OT_UNUSED(varname) varname
+#endif
+
+PortableLockedShm* PortableLockedShm_init(const char *shmName, const char *OT_UNUSED(mutexName), int mapSize)
{
PortableLockedShm* self = malloc(sizeof(PortableLockedShm));
char shm_filename[NAME_MAX];
@@ -83,9 +89,9 @@ static void reinit_offset() {
}
int write_head_position(
- XPLMDrawingPhase inPhase,
- int inIsBefore,
- void * inRefcon)
+ XPLMDrawingPhase OT_UNUSED(inPhase),
+ int OT_UNUSED(inIsBefore),
+ void * OT_UNUSED(inRefcon))
{
if (lck_posix != NULL && shm_posix != NULL) {
PortableLockedShm_lock(lck_posix);
@@ -140,9 +146,9 @@ PLUGIN_API void XPluginDisable ( void ) {
}
PLUGIN_API void XPluginReceiveMessage(
- XPLMPluginID inFromWho,
- int inMessage,
- void * inParam)
+ XPLMPluginID OT_UNUSED(inFromWho),
+ int OT_UNUSED(inMessage),
+ void * OT_UNUSED(inParam))
{
if (inMessage == XPLM_MSG_AIRPORT_LOADED)
reinit_offset();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 16:59:48 +0000