From 0dc40e32f05b9e3afeee16adcbff2b6adf547da5 Mon Sep 17 00:00:00 2001 From: Onur Ferhat Date: Tue, 10 May 2016 23:07:23 +0200 Subject: [PATCH] Solved compilation problems related to non-static member initialization in header files (for some compilers) --- AnchorPointSelector.cpp | 1 + AnchorPointSelector.h | 2 +- EyeCenterDetector.cpp | 4 +++- EyeCenterDetector.h | 2 +- EyeExtractor.cpp | 2 ++ EyeExtractor.h | 2 +- GazeTracker.cpp | 3 +++ GazeTracker.h | 4 ++-- GazeTrackerHistogramFeatures.cpp | 3 +++ GazeTrackerHistogramFeatures.h | 4 ++-- HeadTracker.cpp | 1 + HeadTracker.h | 2 +- HistogramFeatureExtractor.cpp | 1 + MainGazeTracker.h | 2 +- 14 files changed, 23 insertions(+), 10 deletions(-) diff --git a/AnchorPointSelector.cpp b/AnchorPointSelector.cpp index 153eb41..abf6eb2 100755 --- a/AnchorPointSelector.cpp +++ b/AnchorPointSelector.cpp @@ -6,6 +6,7 @@ #include "utils.h" AnchorPointSelector::AnchorPointSelector() { + _pointTracker = NULL; loadCascades(); } diff --git a/AnchorPointSelector.h b/AnchorPointSelector.h index 66e6dda..dbfbcfb 100644 --- a/AnchorPointSelector.h +++ b/AnchorPointSelector.h @@ -11,7 +11,7 @@ class AnchorPointSelector: public Component { cv::CascadeClassifier eyeCascade; cv::CascadeClassifier noseCascade; cv::CascadeClassifier mouthCascade; - PointTracker* _pointTracker = NULL; + PointTracker* _pointTracker; void choosePoints(); void loadCascades(); diff --git a/EyeCenterDetector.cpp b/EyeCenterDetector.cpp index 68caa9b..9ad21cc 100644 --- a/EyeCenterDetector.cpp +++ b/EyeCenterDetector.cpp @@ -12,7 +12,9 @@ #include "Application.h" -EyeCenterDetector::EyeCenterDetector() {} +EyeCenterDetector::EyeCenterDetector() { + _eyeExtractor = NULL; +} void EyeCenterDetector::process() { diff --git a/EyeCenterDetector.h b/EyeCenterDetector.h index 20d4703..65f92bf 100644 --- a/EyeCenterDetector.h +++ b/EyeCenterDetector.h @@ -46,7 +46,7 @@ class EyeCenterDetector: public Component { cv::Point eyeCenterLeft; private: - EyeExtractor* _eyeExtractor = NULL; + EyeExtractor* _eyeExtractor; //cv::Point unscalePoint(cv::Point p, cv::Mat origSize); //void scaleToFastSize(const cv::Mat &src,cv::Mat &dst); diff --git a/EyeExtractor.cpp b/EyeExtractor.cpp index 17d5490..ece72ec 100755 --- a/EyeExtractor.cpp +++ b/EyeExtractor.cpp @@ -12,6 +12,8 @@ const int EyeExtractor::eyeDY = 32; const cv::Size EyeExtractor::eyeSize = cv::Size(eyeDX * 2, eyeDY * 2); EyeExtractor::EyeExtractor(bool fromGroundTruth): + _pointTracker(NULL), + eyeGrey(eyeSize, CV_8UC1), eyeFloat(eyeSize, CV_32FC1), diff --git a/EyeExtractor.h b/EyeExtractor.h index 5ce7e62..4922940 100755 --- a/EyeExtractor.h +++ b/EyeExtractor.h @@ -35,7 +35,7 @@ class EyeExtractor: public Component { BlinkDetector _blinkDetectorLeft; bool _isBlinking; bool _fromGroundTruth; - PointTracker *_pointTracker = NULL; + PointTracker *_pointTracker; void extractEye(const cv::Mat originalImage); void extractEyeLeft(const cv::Mat originalImage); diff --git a/GazeTracker.cpp b/GazeTracker.cpp index 25622f5..dc77db2 100755 --- a/GazeTracker.cpp +++ b/GazeTracker.cpp @@ -17,6 +17,9 @@ GazeTracker::GazeTracker() { gazePoint.x = 0; gazePoint.y = 0; + + _eyeExtractor = NULL; + _pointTracker = NULL; } bool GazeTracker::isActive() { diff --git a/GazeTracker.h b/GazeTracker.h index 28dcbc7..41584e9 100755 --- a/GazeTracker.h +++ b/GazeTracker.h @@ -33,8 +33,8 @@ class GazeTracker: public GazeTrackerComponent { boost::scoped_ptr _gaussianProcessX, _gaussianProcessY; boost::scoped_ptr _gaussianProcessXLeft, _gaussianProcessYLeft; - EyeExtractor* _eyeExtractor = NULL; - PointTracker* _pointTracker = NULL; + EyeExtractor* _eyeExtractor; + PointTracker* _pointTracker; static double imageDistance(const cv::Mat *image1, const cv::Mat *image2); static double covarianceFunction(const Utils::SharedImage &image1, const Utils::SharedImage &image2); diff --git a/GazeTrackerHistogramFeatures.cpp b/GazeTrackerHistogramFeatures.cpp index 96bd1d4..7ee5c38 100755 --- a/GazeTrackerHistogramFeatures.cpp +++ b/GazeTrackerHistogramFeatures.cpp @@ -20,6 +20,9 @@ GazeTrackerHistogramFeatures::GazeTrackerHistogramFeatures() gazePoint.x = 0; gazePoint.y = 0; + + _histFeatureExtractor = NULL; + _eyeExtractor = NULL; } void GazeTrackerHistogramFeatures::process() { diff --git a/GazeTrackerHistogramFeatures.h b/GazeTrackerHistogramFeatures.h index 95e3999..44f3ad2 100755 --- a/GazeTrackerHistogramFeatures.h +++ b/GazeTrackerHistogramFeatures.h @@ -31,8 +31,8 @@ class GazeTrackerHistogramFeatures: public GazeTrackerComponent { std::vector _exemplars, _exemplarsLeft; int _currentTargetSampleCount; - HistogramFeatureExtractor *_histFeatureExtractor = NULL; - EyeExtractor* _eyeExtractor = NULL; + HistogramFeatureExtractor *_histFeatureExtractor; + EyeExtractor *_eyeExtractor; // Gaussian Process estimators for right and left eye and both directions (X, Y) boost::scoped_ptr _histX, _histY, _histXLeft, _histYLeft; diff --git a/HeadTracker.cpp b/HeadTracker.cpp index 9e96b33..bc57b43 100755 --- a/HeadTracker.cpp +++ b/HeadTracker.cpp @@ -41,6 +41,7 @@ static Point predictPoint(Point p, double depth, double dMeanX, double dMeanY, d HeadTracker::HeadTracker() { + _pointTracker = NULL; } void HeadTracker::draw() { diff --git a/HeadTracker.h b/HeadTracker.h index 4e64357..4ddcc65 100755 --- a/HeadTracker.h +++ b/HeadTracker.h @@ -16,7 +16,7 @@ class HeadTracker: public Component { private: std::vector _depths; - PointTracker* _pointTracker = NULL; + PointTracker* _pointTracker; std::vector detectInliers(std::vector const &prev, std::vector const &now, double radius=30.0); void predictPoints(double xx0, double yy0, double xx1, double yy1, double rotX, double rotY, double atX, double atY); diff --git a/HistogramFeatureExtractor.cpp b/HistogramFeatureExtractor.cpp index 8ab2bec..6f80d40 100644 --- a/HistogramFeatureExtractor.cpp +++ b/HistogramFeatureExtractor.cpp @@ -28,6 +28,7 @@ HistogramFeatureExtractor::HistogramFeatureExtractor() { this->verticalFeaturesLeft.create(cv::Size(1, VERTICAL_BIN_SIZE), CV_32SC1); _groundTruth = new EyeExtractor(true); + _eyeExtractor = NULL; } HistogramFeatureExtractor::~HistogramFeatureExtractor() { diff --git a/MainGazeTracker.h b/MainGazeTracker.h index cc2da29..41c8df4 100755 --- a/MainGazeTracker.h +++ b/MainGazeTracker.h @@ -45,7 +45,7 @@ public slots: std::vector _commands; int _commandIndex; - EyeExtractor* _eyeExtractor = NULL; + EyeExtractor* _eyeExtractor; int _headDistance; QTimer _timer;