summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--facetracknoir/main.cpp2
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp2
-rw-r--r--ftnoir_tracker_aruco/trans_calib.cpp1
-rw-r--r--ftnoir_tracker_pt/point_tracker.cpp1
-rw-r--r--opentrack-compat/shm.cpp5
-rw-r--r--opentrack-compat/sleep.hpp2
6 files changed, 7 insertions, 6 deletions
diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp
index 45483a68..a63fe54a 100644
--- a/facetracknoir/main.cpp
+++ b/facetracknoir/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
// qt5 designer-made controls look like shit on 'doze -sh 20140921
// also our OSX look leaves a lot to be desired -sh 20150726
{
- const QStringList preferred { "fusion", "windowsvista", "jazzbands'-marijuana", "macintosh", "windowsxp" };
+ const QStringList preferred { "fusion", "windowsvista", "macintosh", "windowsxp" };
for (const auto& style_name : preferred)
{
QStyle* s = QStyleFactory::create(style_name);
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
index d77df027..702a92d4 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
@@ -114,7 +114,7 @@ void FTNoIR_Protocol::pose(const double *headpose ) {
// FSUIPC checks for already open connections and returns FSUIPC_ERR_OPEN in that case
// the connection scope is global for the process. this is why above code doesn't
// leak resources or have logic errors. see: http://www.purebasic.fr/english/viewtopic.php?t=31112
- FSUIPC_Close(); //timeout (1 second) so assume FS closed
+ FSUIPC_Close();
}
}
}
diff --git a/ftnoir_tracker_aruco/trans_calib.cpp b/ftnoir_tracker_aruco/trans_calib.cpp
index 176cf24c..b5148efd 100644
--- a/ftnoir_tracker_aruco/trans_calib.cpp
+++ b/ftnoir_tracker_aruco/trans_calib.cpp
@@ -7,7 +7,6 @@
#include "trans_calib.h"
-//-----------------------------------------------------------------------------
TranslationCalibrator::TranslationCalibrator()
{
reset();
diff --git a/ftnoir_tracker_pt/point_tracker.cpp b/ftnoir_tracker_pt/point_tracker.cpp
index cec107cf..924b75de 100644
--- a/ftnoir_tracker_pt/point_tracker.cpp
+++ b/ftnoir_tracker_pt/point_tracker.cpp
@@ -15,7 +15,6 @@
const float PI = 3.14159265358979323846f;
-// ----------------------------------------------------------------------------
static void get_row(const cv::Matx33f& m, int i, cv::Vec3f& v)
{
v[0] = m(i,0);
diff --git a/opentrack-compat/shm.cpp b/opentrack-compat/shm.cpp
index b18a9933..029a4c95 100644
--- a/opentrack-compat/shm.cpp
+++ b/opentrack-compat/shm.cpp
@@ -43,10 +43,13 @@ void PortableLockedShm::unlock()
(void) ReleaseMutex(hMutex);
}
#else
+
+#include <limits.h>
+
#pragma GCC diagnostic ignored "-Wunused-result"
PortableLockedShm::PortableLockedShm(const char *shmName, const char* /*mutexName*/, int mapSize) : size(mapSize)
{
- char filename[512] = {0};
+ char filename[PATH_MAX+2] = {0};
strcpy(filename, "/");
strcat(filename, shmName);
fd = shm_open(filename, O_RDWR | O_CREAT, 0600);
diff --git a/opentrack-compat/sleep.hpp b/opentrack-compat/sleep.hpp
index 27920842..e7c70285 100644
--- a/opentrack-compat/sleep.hpp
+++ b/opentrack-compat/sleep.hpp
@@ -3,7 +3,7 @@
namespace portable
{
#ifdef _WIN32
- #include <windows.h>
+# include <windows.h>
template<typename = void>
void sleep(unsigned milliseconds)