third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed spaces at line endings, fixed warning

Browse Source
This commit is contained in:
E Sommerlade 2016-10-26 19:59:10 +01:00
parent 41c47a84fc
commit c93de78ff6
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/objdetect/src/detection_based_tracker.cpp
View File

@ -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);

6
samples/cpp/dbt_face_detection.cpp
View File

@ -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();