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

fixed detection_based_tracker on visual studio 2013 and later

Browse Source 
modules/objectdetect/src/detection_based_tracker.cpp: made unique_lock<mutex> local to each function
samples/cpp/dbt_face_detection.cpp: fixed warnings on loop in Visual Studio
This commit is contained in:
Eric Sommerlade
2016-10-31 11:07:09 +00:00
parent 5ebdf6cedd
commit 049a894986
3 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/cpp/dbt_face_detection.cpp
+14 -6
View File
@@ -1,4 +1,4 @@
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID)
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID) || (defined(_MSC_VER) && _MSC_VER>1700)
#include <opencv2/imgproc.hpp> // Gaussian Blur
#include <opencv2/core.hpp> // Basic OpenCV structures (cv::Mat, Scalar)
@@ -54,9 +54,19 @@ int main(int , char** )
std::string cascadeFrontalfilename = "../../data/lbpcascades/lbpcascade_frontalface.xml";
cv::Ptr<cv::CascadeClassifier> cascade = makePtr<cv::CascadeClassifier>(cascadeFrontalfilename);
cv::Ptr<DetectionBasedTracker::IDetector> MainDetector = makePtr<CascadeDetectorAdapter>(cascade);
if ( cascade->empty() )
{
printf("Error: Cannot load %s\n", cascadeFrontalfilename.c_str());
return 2;
}
cascade = makePtr<cv::CascadeClassifier>(cascadeFrontalfilename);
cv::Ptr<DetectionBasedTracker::IDetector> TrackingDetector = makePtr<CascadeDetectorAdapter>(cascade);
if ( cascade->empty() )
{
printf("Error: Cannot load %s\n", cascadeFrontalfilename.c_str());
return 2;
}
DetectionBasedTracker::Parameters params;
DetectionBasedTracker Detector(MainDetector, TrackingDetector, params);
@@ -71,7 +81,7 @@ int main(int , char** )
Mat GrayFrame;
vector<Rect> Faces;
while(true)
do
{
VideoStream >> ReferenceFrame;
cvtColor(ReferenceFrame, GrayFrame, COLOR_RGB2GRAY);
@@ -84,9 +94,7 @@ int main(int , char** )
}
imshow(WindowName, ReferenceFrame);
if (waitKey(30) >= 0) break;
}
} while (waitKey(30) < 0);
Detector.stop();
@@ -98,7 +106,7 @@ int main(int , char** )
#include <stdio.h>
int main()
{
printf("This sample works for UNIX or ANDROID only\n");
printf("This sample works for UNIX or ANDROID or Visual Studio 2013+ only\n");
return 0;
}