summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStéphane Lenclud <github@lenclud.com>2019-02-17 11:02:50 +0100
committerGitHub <noreply@github.com>2019-02-17 11:02:50 +0100
commit7d5575efd88fa6b6ee24367d0d16e0dafeeac49e (patch)
treeb033405e0f7c9de4ec4fd8351fee4c5f0a3b26c9
parent5b23ad4e24a920636b70ad99872ce8221a3a4aac (diff)
parent7f2103eb4c91b4c1801ddfefeda5ac8d8b7c49d8 (diff)
Merge pull request #875 from opentrack/kinect-copyright
Kinect: Copyright fix and minor cmake changes.
-rw-r--r--tracker-kinect-face/CMakeLists.txt12
-rw-r--r--tracker-kinect-face/kinect_face_settings.cpp2
-rw-r--r--tracker-kinect-face/kinect_face_settings.h8
-rw-r--r--tracker-kinect-face/kinect_face_tracker.cpp6
-rw-r--r--tracker-kinect-face/kinect_face_tracker.h7
5 files changed, 27 insertions, 8 deletions
diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index 92ed00c1..8eb064e7 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -16,17 +16,17 @@ if (WIN32 AND opentrack-intel)
target_include_directories(${self} SYSTEM PRIVATE "${SDK_KINECT20}/inc")
# Check processor architecture
- if(NOT opentrack-64bit)
- # 32 bits
- set(kinect-arch-dir "x86")
- else()
- # 64 bits
+ if(opentrack-64bit)
+ # 64 bits
set(kinect-arch-dir "x64")
+ else()
+ # 32 bits
+ set(kinect-arch-dir "x86")
endif()
# Link against Kinect SDK libraries
target_link_libraries(${self} "${SDK_KINECT20}/lib/${kinect-arch-dir}/Kinect20.lib" "${SDK_KINECT20}/lib/${kinect-arch-dir}/Kinect20.Face.lib")
- # Link against OpenCV stuff, needed for video preview
+ # Link against video utilities, needed for video preview
target_link_libraries(${self} opentrack-video)
# Install Kinect Face DLL
diff --git a/tracker-kinect-face/kinect_face_settings.cpp b/tracker-kinect-face/kinect_face_settings.cpp
index c27b20bd..394bbe06 100644
--- a/tracker-kinect-face/kinect_face_settings.cpp
+++ b/tracker-kinect-face/kinect_face_settings.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, Stanislaw Halik <sthalik@misaki.pl>
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
* Permission to use, copy, modify, and/or distribute this
* software for any purpose with or without fee is hereby granted,
diff --git a/tracker-kinect-face/kinect_face_settings.h b/tracker-kinect-face/kinect_face_settings.h
index dfba3968..4a18cc3a 100644
--- a/tracker-kinect-face/kinect_face_settings.h
+++ b/tracker-kinect-face/kinect_face_settings.h
@@ -1,3 +1,11 @@
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
+
+ * 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.
+ */
+
#pragma once
#include "ui_kinect_face_settings.h"
#include "compat/macros.hpp"
diff --git a/tracker-kinect-face/kinect_face_tracker.cpp b/tracker-kinect-face/kinect_face_tracker.cpp
index d4cf89e3..e7b77133 100644
--- a/tracker-kinect-face/kinect_face_tracker.cpp
+++ b/tracker-kinect-face/kinect_face_tracker.cpp
@@ -1,4 +1,10 @@
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
+ * 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 "kinect_face_tracker.h"
diff --git a/tracker-kinect-face/kinect_face_tracker.h b/tracker-kinect-face/kinect_face_tracker.h
index 3ed28bea..e708328d 100644
--- a/tracker-kinect-face/kinect_face_tracker.h
+++ b/tracker-kinect-face/kinect_face_tracker.h
@@ -1,5 +1,10 @@
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
-
+ * 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 <cmath>