potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +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/stitching/src/exposure_compensate.cpp
+2 -2
View File
@@ -146,7 +146,7 @@ void GainCompensator::feed(const std::vector<Point> &corners, const std::vector<
void GainCompensator::apply(int index, Point /*corner*/, InputOutputArray image, InputArray /*mask*/)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
multiply(image, gains_(index, 0), image);
}
@@ -226,7 +226,7 @@ void BlocksGainCompensator::feed(const std::vector<Point> &corners, const std::v
void BlocksGainCompensator::apply(int index, Point /*corner*/, InputOutputArray _image, InputArray /*mask*/)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert(_image.type() == CV_8UC3);
modules/stitching/src/matchers.cpp
+3 -3
View File
@@ -183,7 +183,7 @@ private:
void CpuMatcher::match(const ImageFeatures &features1, const ImageFeatures &features2, MatchesInfo& matches_info)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert(features1.descriptors.type() == features2.descriptors.type());
CV_Assert(features2.descriptors.depth() == CV_8U || features2.descriptors.depth() == CV_32F);
@@ -253,7 +253,7 @@ void CpuMatcher::match(const ImageFeatures &features1, const ImageFeatures &feat
#ifdef HAVE_OPENCV_CUDAFEATURES2D
void GpuMatcher::match(const ImageFeatures &features1, const ImageFeatures &features2, MatchesInfo& matches_info)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
matches_info.matches.clear();
@@ -727,7 +727,7 @@ BestOf2NearestMatcher::BestOf2NearestMatcher(bool try_use_gpu, float match_conf,
void BestOf2NearestMatcher::match(const ImageFeatures &features1, const ImageFeatures &features2,
MatchesInfo &matches_info)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
(*impl_)(features1, features2, matches_info);
modules/stitching/src/seam_finders.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ void DpSeamFinder::process(
const Mat &image1, const Mat &image2, Point tl1, Point tl2,
Mat &mask1, Mat &mask2)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert(image1.size() == mask1.size());
CV_Assert(image2.size() == mask2.size());
modules/stitching/src/stitcher.cpp
+8 -8
View File
@@ -121,7 +121,7 @@ Ptr<Stitcher> Stitcher::create(Mode mode, bool try_use_gpu)
Stitcher::Status Stitcher::estimateTransform(InputArrayOfArrays images)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
return estimateTransform(images, std::vector<std::vector<Rect> >());
}
@@ -129,7 +129,7 @@ Stitcher::Status Stitcher::estimateTransform(InputArrayOfArrays images)
Stitcher::Status Stitcher::estimateTransform(InputArrayOfArrays images, const std::vector<std::vector<Rect> > &rois)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
images.getUMatVector(imgs_);
rois_ = rois;
@@ -149,7 +149,7 @@ Stitcher::Status Stitcher::estimateTransform(InputArrayOfArrays images, const st
Stitcher::Status Stitcher::composePanorama(OutputArray pano)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
return composePanorama(std::vector<UMat>(), pano);
}
@@ -157,7 +157,7 @@ Stitcher::Status Stitcher::composePanorama(OutputArray pano)
Stitcher::Status Stitcher::composePanorama(InputArrayOfArrays images, OutputArray pano)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
LOGLN("Warping images (auxiliary)... ");
@@ -407,7 +407,7 @@ Stitcher::Status Stitcher::composePanorama(InputArrayOfArrays images, OutputArra
Stitcher::Status Stitcher::stitch(InputArrayOfArrays images, OutputArray pano)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Status status = estimateTransform(images);
if (status != OK)
@@ -418,7 +418,7 @@ Stitcher::Status Stitcher::stitch(InputArrayOfArrays images, OutputArray pano)
Stitcher::Status Stitcher::stitch(InputArrayOfArrays images, const std::vector<std::vector<Rect> > &rois, OutputArray pano)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Status status = estimateTransform(images, rois);
if (status != OK)
@@ -604,14 +604,14 @@ Stitcher::Status Stitcher::estimateCameraParams()
Ptr<Stitcher> createStitcher(bool try_use_gpu)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
return Stitcher::create(Stitcher::PANORAMA, try_use_gpu);
}
Ptr<Stitcher> createStitcherScans(bool try_use_gpu)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
return Stitcher::create(Stitcher::SCANS, try_use_gpu);
}
modules/stitching/src/timelapsers.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void Timelapser::initialize(const std::vector<Point> &corners, const std::vector
void Timelapser::process(InputArray _img, InputArray /*_mask*/, Point tl)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
dst_.setTo(Scalar::all(0));