Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 40 insertions, 40 deletions

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
index 22c4a33d..1c486382 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
@@ -1,40 +1,40 @@
-/* Copyright (c) 2012 Patrick Ruoff

- *

- * Permission to use, copy, modify, and/or distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- */

-

-#include "ftnoir_tracker_pt_dll.h"

-#include <QIcon>

-#include "facetracknoir/global-settings.h"

-

-//-----------------------------------------------------------------------------

-void TrackerDll::getFullName(QString *strToBeFilled)

-{

-	*strToBeFilled = "PointTracker 1.0";

-}

-

-void TrackerDll::getShortName(QString *strToBeFilled)

-{

-	*strToBeFilled = "PointTracker";

-}

-

-void TrackerDll::getDescription(QString *strToBeFilled)

-{

-	*strToBeFilled = "Tracks a 3-point model with know geometry like Freetrack / TrackIR";

-}

-

-void TrackerDll::getIcon(QIcon *icon)

-{

-    *icon = QIcon(":/resources/icon.png");

-}

-

-

-//-----------------------------------------------------------------------------

-//#pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")

-

-extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()

-{

-	return new TrackerDll;

-}

+/* Copyright (c) 2012 Patrick Ruoff
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#include "ftnoir_tracker_pt_dll.h"
+#include <QIcon>
+#include "facetracknoir/global-settings.h"
+
+//-----------------------------------------------------------------------------
+void TrackerDll::getFullName(QString *strToBeFilled)
+{
+	*strToBeFilled = "PointTracker 1.0";
+}
+
+void TrackerDll::getShortName(QString *strToBeFilled)
+{
+	*strToBeFilled = "PointTracker";
+}
+
+void TrackerDll::getDescription(QString *strToBeFilled)
+{
+	*strToBeFilled = "Tracks a 3-point model with know geometry like Freetrack / TrackIR";
+}
+
+void TrackerDll::getIcon(QIcon *icon)
+{
+    *icon = QIcon(":/resources/icon.png");
+}
+
+
+//-----------------------------------------------------------------------------
+//#pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
+
+extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+{
+	return new TrackerDll;
+}