summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormm0zct <the_cartographer@hotmail.com>2013-10-19 17:13:11 +0100
committermm0zct <the_cartographer@hotmail.com>2013-10-19 17:13:11 +0100
commit55edd79182774d1c7ae93f1ed3d1b40b2468cc36 (patch)
treead8aecb3b6fff2f57bb1c32e406d64a8350e3876
parent1d4776beab92c264ffb5b12f2eef93da9169441d (diff)
parentcb1ec6d5e6f893654723d45be4572f070044c2c2 (diff)
Merge branch 'master' of https://github.com/opentrack/opentrack
-rw-r--r--facetracknoir/tracker.h7
-rw-r--r--qfunctionconfigurator/functionconfig.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/facetracknoir/tracker.h b/facetracknoir/tracker.h
index 28f8dc99..24a22c16 100644
--- a/facetracknoir/tracker.h
+++ b/facetracknoir/tracker.h
@@ -125,6 +125,13 @@ public:
axes[Pitch] = new THeadPoseDOF("ry", "ry_alt", 90, 90, 90, 90);
axes[Roll] = new THeadPoseDOF("rz", "rz_alt", 180, 180, 180, 180);
}
+ ~HeadPoseData()
+ {
+ for (int i = 0; i < 6; i++)
+ {
+ delete axes[i];
+ }
+ }
};
#endif
diff --git a/qfunctionconfigurator/functionconfig.h b/qfunctionconfigurator/functionconfig.h
index b6257df2..4f48096a 100644
--- a/qfunctionconfigurator/functionconfig.h
+++ b/qfunctionconfigurator/functionconfig.h
@@ -37,7 +37,7 @@ public:
//
FunctionConfig();
FunctionConfig(QString title, int intMaxInput, int intMaxOutput);
- virtual ~FunctionConfig();
+ ~FunctionConfig();
float getValue(float x);
bool getLastPoint(QPointF& point); // Get the last Point that was requested.