From c93de78ff659ed435ed430b66d55f09ad032f2e8 Mon Sep 17 00:00:00 2001
From: E Sommerlade <es0m@users.noreply.github.com>
Date: Wed, 26 Oct 2016 19:59:10 +0100
Subject: [PATCH] removed spaces at line endings, fixed warning
---
modules/objdetect/src/detection_based_tracker.cpp | 6 +++---
samples/cpp/dbt_face_detection.cpp | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/modules/objdetect/src/detection_based_tracker.cpp b/modules/objdetect/src/detection_based_tracker.cpp
index 5bff2f9ab6..88c7923efa 100644
--- a/modules/objdetect/src/detection_based_tracker.cpp
+++ b/modules/objdetect/src/detection_based_tracker.cpp
@@ -125,7 +125,7 @@ namespace cv
class cv::DetectionBasedTracker::SeparateDetectionWork
{
public:
- SeparateDetectionWork(cv::DetectionBasedTracker& _detectionBasedTracker, cv::Ptr<DetectionBasedTracker::IDetector> _detector,
+ SeparateDetectionWork(cv::DetectionBasedTracker& _detectionBasedTracker, cv::Ptr<DetectionBasedTracker::IDetector> _detector,
const cv::DetectionBasedTracker::Parameters& params);
virtual ~SeparateDetectionWork();
bool communicateWithDetectingThread(const Mat& imageGray, std::vector<Rect>& rectsWhereRegions);
@@ -204,14 +204,14 @@ class cv::DetectionBasedTracker::SeparateDetectionWork
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)
:detectionBasedTracker(_detectionBasedTracker),
cascadeInThread(),
isObjectDetectingReady(false),
shouldObjectDetectingResultsBeForgot(false),
stateThread(STATE_THREAD_STOPPED),
- timeWhenDetectingThreadStartedWork(-1),
+ timeWhenDetectingThreadStartedWork(-1),
parameters(params)
{
CV_Assert(_detector);
diff --git a/samples/cpp/dbt_face_detection.cpp b/samples/cpp/dbt_face_detection.cpp
index 355dd52a65..0b465cdc23 100755
--- a/samples/cpp/dbt_face_detection.cpp
+++ b/samples/cpp/dbt_face_detection.cpp
@@ -81,7 +81,7 @@ int main(int , char** )
Mat GrayFrame;
vector<Rect> Faces;
- while(true)
+ do
{
VideoStream >> ReferenceFrame;
cvtColor(ReferenceFrame, GrayFrame, COLOR_RGB2GRAY);
@@ -94,9 +94,7 @@ int main(int , char** )
}
imshow(WindowName, ReferenceFrame);
-
- if (waitKey(30) >= 0) break;
- }
+ } while (waitKey(30) < 0);
Detector.stop();