Skip to content

O
opencv_contrib
Commit e8a23dbb authored by Vladimir's avatar Vladimir
Browse files
Options

Fixed spaces in >>

parent 59b18dcf
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
modules/tracking/src/multiTracker.cpp
View file @ e8a23dbb
...@@ -71,9 +71,9 @@ namespace cv ...@@ -71,9 +71,9 @@ namespace cv
//best overlap around 92% //best overlap around 92%
Mat_<uchar> standardPatch(tld::STANDARD_PATCH_SIZE, tld::STANDARD_PATCH_SIZE); Mat_<uchar> standardPatch(tld::STANDARD_PATCH_SIZE, tld::STANDARD_PATCH_SIZE);
std::vector<std::vector<tld::TLDDetector::LabeledPatch>> detectorResults(targetNum); std::vector<std::vector<tld::TLDDetector::LabeledPatch> > detectorResults(targetNum);
std::vector<std::vector<Rect2d>> candidates(targetNum); std::vector<std::vector<Rect2d> > candidates(targetNum);
std::vector<std::vector<double>> candidatesRes(targetNum); std::vector<std::vector<double> > candidatesRes(targetNum);
std::vector<Rect2d> tmpCandidates(targetNum); std::vector<Rect2d> tmpCandidates(targetNum);
std::vector<bool> detect_flgs(targetNum); std::vector<bool> detect_flgs(targetNum);
std::vector<bool> trackerNeedsReInit(targetNum); std::vector<bool> trackerNeedsReInit(targetNum);
...@@ -221,8 +221,8 @@ namespace cv ...@@ -221,8 +221,8 @@ namespace cv
return true; return true;
} }
void detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, std::vector<bool> &detect_flgs, void detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector<bool> &detect_flgs,
std::vector<Ptr<Tracker>> &trackers) std::vector<Ptr<Tracker> > &trackers)
{ {
//TLD Tracker data extraction //TLD Tracker data extraction
Tracker* trackerPtr = trackers[0]; Tracker* trackerPtr = trackers[0];
...@@ -245,8 +245,8 @@ namespace cv ...@@ -245,8 +245,8 @@ namespace cv
int scaleID; int scaleID;
std::vector <Mat> resized_imgs, blurred_imgs; std::vector <Mat> resized_imgs, blurred_imgs;
std::vector <std::vector <Point>> varBuffer(trackers.size()), ensBuffer(trackers.size()); std::vector <std::vector <Point> > varBuffer(trackers.size()), ensBuffer(trackers.size());
std::vector <std::vector <int>> varScaleIDs(trackers.size()), ensScaleIDs(trackers.size()); std::vector <std::vector <int> > varScaleIDs(trackers.size()), ensScaleIDs(trackers.size());
std::vector <Point> tmpP; std::vector <Point> tmpP;
std::vector <int> tmpI; std::vector <int> tmpI;
...@@ -457,8 +457,8 @@ namespace cv ...@@ -457,8 +457,8 @@ namespace cv
//printf("NN: %d\t%f\n", patches.size(), t); //printf("NN: %d\t%f\n", patches.size(), t);
} }
void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, std::vector<bool> &detect_flgs, void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector<bool> &detect_flgs,
std::vector<Ptr<Tracker>> &trackers) std::vector<Ptr<Tracker> > &trackers)
{ {
//TLD Tracker data extraction //TLD Tracker data extraction
Tracker* trackerPtr = trackers[0]; Tracker* trackerPtr = trackers[0];
...@@ -481,8 +481,8 @@ namespace cv ...@@ -481,8 +481,8 @@ namespace cv
int scaleID; int scaleID;
std::vector <Mat> resized_imgs, blurred_imgs; std::vector <Mat> resized_imgs, blurred_imgs;
std::vector <std::vector <Point>> varBuffer(trackers.size()), ensBuffer(trackers.size()); std::vector <std::vector <Point> > varBuffer(trackers.size()), ensBuffer(trackers.size());
std::vector <std::vector <int>> varScaleIDs(trackers.size()), ensScaleIDs(trackers.size()); std::vector <std::vector <int> > varScaleIDs(trackers.size()), ensScaleIDs(trackers.size());
std::vector <Point> tmpP; std::vector <Point> tmpP;
std::vector <int> tmpI; std::vector <int> tmpI;
......
modules/tracking/src/multiTracker.hpp
View file @ e8a23dbb
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
namespace cv namespace cv
{ {
void detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, void detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches,
std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker>>& trackers); std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker> >& trackers);
void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches,
std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker>>& trackers); std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker> >& trackers);
std::vector <Rect2d> debugStack[10]; std::vector <Rect2d> debugStack[10];
} }
#endif #endif
\ No newline at end of file
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