Commit c93de78f authored by E Sommerlade's avatar E Sommerlade

removed spaces at line endings, fixed warning

parent 41c47a84
...@@ -125,7 +125,7 @@ namespace cv ...@@ -125,7 +125,7 @@ namespace cv
class cv::DetectionBasedTracker::SeparateDetectionWork class cv::DetectionBasedTracker::SeparateDetectionWork
{ {
public: public:
SeparateDetectionWork(cv::DetectionBasedTracker& _detectionBasedTracker, cv::Ptr<DetectionBasedTracker::IDetector> _detector, SeparateDetectionWork(cv::DetectionBasedTracker& _detectionBasedTracker, cv::Ptr<DetectionBasedTracker::IDetector> _detector,
const cv::DetectionBasedTracker::Parameters& params); const cv::DetectionBasedTracker::Parameters& params);
virtual ~SeparateDetectionWork(); virtual ~SeparateDetectionWork();
bool communicateWithDetectingThread(const Mat& imageGray, std::vector<Rect>& rectsWhereRegions); bool communicateWithDetectingThread(const Mat& imageGray, std::vector<Rect>& rectsWhereRegions);
...@@ -204,14 +204,14 @@ class cv::DetectionBasedTracker::SeparateDetectionWork ...@@ -204,14 +204,14 @@ class cv::DetectionBasedTracker::SeparateDetectionWork
cv::DetectionBasedTracker::Parameters parameters; cv::DetectionBasedTracker::Parameters parameters;
}; };
cv::DetectionBasedTracker::SeparateDetectionWork::SeparateDetectionWork(DetectionBasedTracker& _detectionBasedTracker, cv::Ptr<DetectionBasedTracker::IDetector> _detector, cv::DetectionBasedTracker::SeparateDetectionWork::SeparateDetectionWork(DetectionBasedTracker& _detectionBasedTracker, cv::Ptr<DetectionBasedTracker::IDetector> _detector,
const cv::DetectionBasedTracker::Parameters& params) const cv::DetectionBasedTracker::Parameters& params)
:detectionBasedTracker(_detectionBasedTracker), :detectionBasedTracker(_detectionBasedTracker),
cascadeInThread(), cascadeInThread(),
isObjectDetectingReady(false), isObjectDetectingReady(false),
shouldObjectDetectingResultsBeForgot(false), shouldObjectDetectingResultsBeForgot(false),
stateThread(STATE_THREAD_STOPPED), stateThread(STATE_THREAD_STOPPED),
timeWhenDetectingThreadStartedWork(-1), timeWhenDetectingThreadStartedWork(-1),
parameters(params) parameters(params)
{ {
CV_Assert(_detector); CV_Assert(_detector);
......
...@@ -81,7 +81,7 @@ int main(int , char** ) ...@@ -81,7 +81,7 @@ int main(int , char** )
Mat GrayFrame; Mat GrayFrame;
vector<Rect> Faces; vector<Rect> Faces;
while(true) do
{ {
VideoStream >> ReferenceFrame; VideoStream >> ReferenceFrame;
cvtColor(ReferenceFrame, GrayFrame, COLOR_RGB2GRAY); cvtColor(ReferenceFrame, GrayFrame, COLOR_RGB2GRAY);
...@@ -94,9 +94,7 @@ int main(int , char** ) ...@@ -94,9 +94,7 @@ int main(int , char** )
} }
imshow(WindowName, ReferenceFrame); imshow(WindowName, ReferenceFrame);
} while (waitKey(30) < 0);
if (waitKey(30) >= 0) break;
}
Detector.stop(); Detector.stop();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment