Migrating to new opencv

Author: prouast

Baseline.cpp

@@ -10,7 +10,7 @@
 
 #include <fstream>
 #include "opencv.hpp"
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
 
 bool Baseline::load(const double samplingFrequency, const double timeBase, const string baseline_path) {
 

Baseline.hpp

@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include <string>
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 using namespace std;
 using namespace cv;
@@ -23,33 +23,33 @@ enum class CSVState {
 };
 
 class Baseline {
-    
+
 public:
-    
+
     // Constructor
     Baseline() {;}
-    
+
     bool load(const double samplingFrequency, const double timeBase, const string baseline_path);
-    
+
     // Process a frame
     void processFrame(Mat &frameRGB, int64_t time);
-    
+
 private:
-    
+
     vector<string> readCSVRow(const string &row);
-    
+
     // Settings
     double samplingFrequency;
     double timeBase;
-    
+
     // Data
     vector<vector<string>> data;
     int dataIndex = 2;
-    
+
     // State variables
     int64_t time;
     int64_t lastSamplingTime = 0;
-    
+
     // Estimation
     double bpm_ppg = 0.0;
     double bpm_ecg = 0.0;

Heartbeat.cpp

@@ -9,9 +9,9 @@
 #include "Heartbeat.hpp"
 
 #include <opencv2/imgcodecs.hpp>
-#include <opencv2/videoio/videoio.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/videoio.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/imgproc.hpp>
 #include "opencv.hpp"
 #include "Baseline.hpp"
 
@@ -291,11 +291,11 @@ int main(int argc, char * argv[]) {
             break;
 
         // Generate grayframe
-        cvtColor(frameRGB, frameGray, CV_BGR2GRAY);
+        cvtColor(frameRGB, frameGray, COLOR_BGR2GRAY);
         equalizeHist(frameGray, frameGray);
 
         int time;
-        if (offlineMode) time = (int)cap.get(CV_CAP_PROP_POS_MSEC);
+        if (offlineMode) time = (int)cap.get(CAP_PROP_POS_MSEC);
         else time = (cv::getTickCount()*1000.0)/cv::getTickFrequency();
 
         if (i % downsample == 0) {

RPPG.cpp

@@ -8,10 +8,10 @@
 
 #include "RPPG.hpp"
 
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/core/core.hpp>
-#include <opencv2/video/video.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/video.hpp>
 
 #include "opencv.hpp"
 
@@ -185,7 +185,7 @@ void RPPG::detectFace(Mat &frameRGB, Mat &frameGray) {
     switch (faceDetAlg) {
       case haar:
         // Detect faces with Haar classifier
-        haarClassifier.detectMultiScale(frameGray, boxes, 1.1, 2, CV_HAAR_SCALE_IMAGE, minFaceSize);
+        haarClassifier.detectMultiScale(frameGray, boxes, 1.1, 2, CASCADE_SCALE_IMAGE, minFaceSize);
         break;
       case deep:
         // Detect faces with DNN

RPPG.hpp

@@ -11,7 +11,7 @@
 
 #include <fstream>
 #include <string>
-#include <opencv2/objdetect/objdetect.hpp>
+#include <opencv2/objdetect.hpp>
 #include <opencv2/dnn.hpp>
 
 #include <stdio.h>

opencv.cpp

@@ -9,8 +9,8 @@
 #include "opencv.hpp"
 #include <limits>
 
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/imgproc.hpp>
 
 using namespace std;
 
@@ -212,7 +212,7 @@ namespace cv {
         Mat outputPlanes[2];
         split(a, outputPlanes);
         Mat output = Mat(a.rows, 1, a.type());
-        normalize(outputPlanes[0], output, 0, 1, CV_MINMAX);
+        normalize(outputPlanes[0], output, 0, 1, NORM_MINMAX);
         output.copyTo(_b);
     }
 
@@ -222,7 +222,7 @@ namespace cv {
         CV_Assert(a.type() == CV_64F);
 
         // Perform PCA
-        cv::PCA pca(a, cv::Mat(), CV_PCA_DATA_AS_ROW);
+        cv::PCA pca(a, cv::Mat(), PCA::DATA_AS_ROW);
 
         // Calculate PCA components
         cv::Mat pc = a * pca.eigenvectors.t();

opencv.hpp

@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include <iostream>
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 namespace cv {
 
@@ -29,7 +29,7 @@ namespace cv {
     double getFps(cv::Mat &t, const double timeBase);
     void push(cv::Mat &m);
     void plot(cv::Mat &mat);
-    
+
     /* FILTERS */
 
     void normalization(cv::InputArray _a, cv::OutputArray _b);