potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Add semicolons after CV_INSTRUMENT macros

Browse Source
This commit is contained in:
Hamdi Sahloul
2018-09-14 06:35:26 +09:00
parent dbfeb8892d
commit 5d54def264
161 changed files with 695 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/hog.cpp
+10 -10
View File
@@ -237,7 +237,7 @@ inline float32x4_t vsetq_f32(float f0, float f1, float f2, float f3)
void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle,
Size paddingTL, Size paddingBR) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert( img.type() == CV_8U || img.type() == CV_8UC3 );
@@ -1587,7 +1587,7 @@ static bool ocl_compute(InputArray _img, Size win_stride, std::vector<float>& _d
void HOGDescriptor::compute(InputArray _img, std::vector<float>& descriptors,
Size winStride, Size padding, const std::vector<Point>& locations) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
if( winStride == Size() )
winStride = cellSize;
@@ -1654,7 +1654,7 @@ void HOGDescriptor::detect(const Mat& img,
std::vector<Point>& hits, std::vector<double>& weights, double hitThreshold,
Size winStride, Size padding, const std::vector<Point>& locations) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
hits.clear();
weights.clear();
@@ -1767,7 +1767,7 @@ void HOGDescriptor::detect(const Mat& img,
void HOGDescriptor::detect(const Mat& img, std::vector<Point>& hits, double hitThreshold,
Size winStride, Size padding, const std::vector<Point>& locations) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
std::vector<double> weightsV;
detect(img, hits, weightsV, hitThreshold, winStride, padding, locations);
@@ -2051,7 +2051,7 @@ void HOGDescriptor::detectMultiScale(
double hitThreshold, Size winStride, Size padding,
double scale0, double finalThreshold, bool useMeanshiftGrouping) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
double scale = 1.;
int levels = 0;
@@ -2106,7 +2106,7 @@ void HOGDescriptor::detectMultiScale(InputArray img, std::vector<Rect>& foundLoc
double hitThreshold, Size winStride, Size padding,
double scale0, double finalThreshold, bool useMeanshiftGrouping) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
std::vector<double> foundWeights;
detectMultiScale(img, foundLocations, foundWeights, hitThreshold, winStride,
@@ -3504,7 +3504,7 @@ public:
void operator()(const Range& range) const CV_OVERRIDE
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
int i, i1 = range.start, i2 = range.end;
@@ -3548,7 +3548,7 @@ void HOGDescriptor::detectROI(const cv::Mat& img, const std::vector<cv::Point> &
CV_OUT std::vector<cv::Point>& foundLocations, CV_OUT std::vector<double>& confidences,
double hitThreshold, cv::Size winStride, cv::Size padding) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
foundLocations.clear();
confidences.clear();
@@ -3660,7 +3660,7 @@ void HOGDescriptor::detectMultiScaleROI(const cv::Mat& img,
CV_OUT std::vector<cv::Rect>& foundLocations, std::vector<DetectionROI>& locations,
double hitThreshold, int groupThreshold) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
std::vector<Rect> allCandidates;
Mutex mtx;
@@ -3780,7 +3780,7 @@ void HOGDescriptor::readALTModel(String modelfile)
void HOGDescriptor::groupRectangles(std::vector<cv::Rect>& rectList, std::vector<double>& weights, int groupThreshold, double eps) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
if( groupThreshold <= 0 || rectList.empty() )
{