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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-15 00:52:21 +03:00
committed by Alexander Alekhin
parent a024593fa6 14b438317e
commit 808ba552c5
235 changed files with 18422 additions and 3526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/shape/src/aff_trans.cpp
+3 -3
View File
@@ -104,7 +104,7 @@ protected:
void AffineTransformerImpl::warpImage(InputArray transformingImage, OutputArray output,
int flags, int borderMode, const Scalar& borderValue) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert(!affineMat.empty());
warpAffine(transformingImage, output, affineMat, transformingImage.getMat().size(), flags, borderMode, borderValue);
@@ -187,7 +187,7 @@ static Mat _localAffineEstimate(const std::vector<Point2f>& shape1, const std::v
void AffineTransformerImpl::estimateTransformation(InputArray _pts1, InputArray _pts2, std::vector<DMatch>& _matches)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Mat pts1 = _pts1.getMat();
Mat pts2 = _pts2.getMat();
@@ -240,7 +240,7 @@ void AffineTransformerImpl::estimateTransformation(InputArray _pts1, InputArray
float AffineTransformerImpl::applyTransformation(InputArray inPts, OutputArray outPts)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Mat pts1 = inPts.getMat();
CV_Assert((pts1.channels()==2) && (pts1.cols>0));
modules/shape/src/emdL1.cpp
+1 -1
View File
@@ -789,7 +789,7 @@ float EmdL1::compuTotalFlow()
float cv::EMDL1(InputArray _signature1, InputArray _signature2)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Mat signature1 = _signature1.getMat(), signature2 = _signature2.getMat();
EmdL1 emdl1;
modules/shape/src/haus_dis.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ static float _apply(const Mat &set1, const Mat &set2, int distType, double propR
float HausdorffDistanceExtractorImpl::computeDistance(InputArray contour1, InputArray contour2)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Mat set1=contour1.getMat(), set2=contour2.getMat();
if (set1.type() != CV_32F)
modules/shape/src/hist_cost.cpp
+4 -4
View File
@@ -125,7 +125,7 @@ protected:
void NormHistogramCostExtractorImpl::buildCostMatrix(InputArray _descriptors1, InputArray _descriptors2, OutputArray _costMatrix)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
// size of the costMatrix with dummies //
Mat descriptors1=_descriptors1.getMat();
@@ -253,7 +253,7 @@ protected:
void EMDHistogramCostExtractorImpl::buildCostMatrix(InputArray _descriptors1, InputArray _descriptors2, OutputArray _costMatrix)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
// size of the costMatrix with dummies //
Mat descriptors1=_descriptors1.getMat();
@@ -377,7 +377,7 @@ protected:
void ChiHistogramCostExtractorImpl::buildCostMatrix(InputArray _descriptors1, InputArray _descriptors2, OutputArray _costMatrix)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
// size of the costMatrix with dummies //
Mat descriptors1=_descriptors1.getMat();
@@ -496,7 +496,7 @@ protected:
void EMDL1HistogramCostExtractorImpl::buildCostMatrix(InputArray _descriptors1, InputArray _descriptors2, OutputArray _costMatrix)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
// size of the costMatrix with dummies //
Mat descriptors1=_descriptors1.getMat();
modules/shape/src/sc_dis.cpp
+2 -2
View File
@@ -187,7 +187,7 @@ protected:
float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, InputArray contour2)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
// Checking //
Mat sset1=contour1.getMat(), sset2=contour2.getMat(), set1, set2;
@@ -502,7 +502,7 @@ void SCDMatcher::matchDescriptors(cv::Mat &descriptors1, cv::Mat &descriptors2,
void SCDMatcher::buildCostMatrix(const cv::Mat &descriptors1, const cv::Mat &descriptors2,
cv::Mat &costMatrix, cv::Ptr<cv::HistogramCostExtractor> &comparer) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
comparer->buildCostMatrix(descriptors1, descriptors2, costMatrix);
}
modules/shape/src/tps_trans.cpp
+3 -3
View File
@@ -148,7 +148,7 @@ static Point2f _applyTransformation(const Mat &shapeRef, const Point2f point, co
void ThinPlateSplineShapeTransformerImpl::warpImage(InputArray transformingImage, OutputArray output,
int flags, int borderMode, const Scalar& borderValue) const
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert(tpsComputed==true);
@@ -170,7 +170,7 @@ void ThinPlateSplineShapeTransformerImpl::warpImage(InputArray transformingImage
float ThinPlateSplineShapeTransformerImpl::applyTransformation(InputArray inPts, OutputArray outPts)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
CV_Assert(tpsComputed);
Mat pts1 = inPts.getMat();
@@ -195,7 +195,7 @@ float ThinPlateSplineShapeTransformerImpl::applyTransformation(InputArray inPts,
void ThinPlateSplineShapeTransformerImpl::estimateTransformation(InputArray _pts1, InputArray _pts2,
std::vector<DMatch>& _matches )
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
Mat pts1 = _pts1.getMat();
Mat pts2 = _pts2.getMat();