busywork

6 files changed, 7 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2be2a878..78233543 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(opentrack)
+project(opentrack-trackhat)
 cmake_minimum_required(VERSION 2.8.11)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/)
diff --git a/cmake/opentrack-policy.cmake b/cmake/opentrack-policy.cmake
index 48aba3cc..a7470e3e 100644
--- a/cmake/opentrack-policy.cmake
+++ b/cmake/opentrack-policy.cmake
@@ -3,8 +3,9 @@ if(POLICY CMP0058)
     cmake_policy(SET CMP0058 OLD)
 endif()
 if(POLICY CMP0028)
-    cmake_policy(SET CMP0028 OLD)
+    cmake_policy(SET CMP0028 NEW)
 endif()
 if(POLICY CMP0042)
     cmake_policy(SET CMP0042 NEW)
 endif()
+
diff --git a/csv/csv.cpp b/csv/csv.cpp
index 26a36b70..2f3d4d1f 100644
--- a/csv/csv.cpp
+++ b/csv/csv.cpp
@@ -54,7 +54,7 @@ QString CSV::readLine(){
 QStringList CSV::parseLine(){
 	return parseLine(readLine());
 }
-QStringList CSV::parseLine(QString line){
+QStringList CSV::parseLine(QString const& line){
 	QStringList list;
 	int pos2 = 0;
 	QRegExp rx2("(?:\"([^\"]*)\";?)|(?:([^;]*);?)");
diff --git a/csv/csv.h b/csv/csv.h
index e5a37793..8ea0942b 100644
--- a/csv/csv.h
+++ b/csv/csv.h
@@ -18,7 +18,7 @@ class CSV_EXPORT CSV
 public:
     QString readLine();
     QStringList parseLine();
-    static QStringList parseLine(QString line);
+    static QStringList parseLine(const QString& line);
 
     void setCodec(const char* codecName);
     static bool getGameData(const int gameID, unsigned char* table, QString& gamename);
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index 79405b4d..a7aee1d4 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenCV 3.0 QUIET)
+find_package(OpenCV 4.0 QUIET)
 if(OpenCV_FOUND)
     opentrack_boilerplate(opentrack-tracker-pt STATIC)
     target_link_libraries(opentrack-tracker-pt ${OpenCV_LIBS})
diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/point_extractor.cpp
index 52cbd7a7..8b2982ae 100644
--- a/tracker-pt/point_extractor.cpp
+++ b/tracker-pt/point_extractor.cpp
@@ -81,7 +81,7 @@ void PointExtractor::extract_points(cv::Mat& frame, std::vector<cv::Vec2d>& poin
         //val *= 240./256.;
         //qDebug() << "thres" << thres;
 
-        cv::threshold(frame_gray, frame_bin, thres, 255, CV_THRESH_BINARY);
+        cv::threshold(frame_gray, frame_bin, thres, 255, cv::THRESH_BINARY);
     }
 
     blobs.clear();