Skip to content

Commit 1ff16cb

Browse files
asmorkalovasmorkalov
committed
Backport some of C API removal in core module implementation.
1 parent e1d6664 commit 1ff16cb

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎modules/core/src/matmul.dispatch.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ void calcCovarMatrix( const Mat* data, int nsamples, Mat& covar, Mat& _mean, int
696696
Mat mean;
697697
ctype = std::max(std::max(CV_MAT_DEPTH(ctype >= 0 ? ctype : type), _mean.depth()), CV_32F);
698698

699-
if( (flags & CV_COVAR_USE_AVG) != 0 )
699+
if( (flags & cv::COVAR_USE_AVG) != 0 )
700700
{
701701
CV_Assert( _mean.size() == size );
702702
if( _mean.isContinuous() && _mean.type() == ctype )
@@ -722,8 +722,8 @@ void calcCovarMatrix( const Mat* data, int nsamples, Mat& covar, Mat& _mean, int
722722
}
723723
}
724724

725-
calcCovarMatrix( _data, covar, mean, (flags & ~(CV_COVAR_ROWS|CV_COVAR_COLS)) | CV_COVAR_ROWS, ctype );
726-
if( (flags & CV_COVAR_USE_AVG) == 0 )
725+
calcCovarMatrix( _data, covar, mean, (flags & ~(cv::COVAR_ROWS|cv::COVAR_COLS)) | cv::COVAR_ROWS, ctype );
726+
if( (flags & cv::COVAR_USE_AVG) == 0 )
727727
_mean = mean.reshape(1, size.height);
728728
}
729729

@@ -754,7 +754,7 @@ void calcCovarMatrix( InputArray _src, OutputArray _covar, InputOutputArray _mea
754754
}
755755

756756
Mat mean;
757-
if( (flags & CV_COVAR_USE_AVG) != 0 )
757+
if( (flags & cv::COVAR_USE_AVG) != 0 )
758758
{
759759
CV_Assert( _mean.size() == size );
760760

@@ -770,9 +770,9 @@ void calcCovarMatrix( InputArray _src, OutputArray _covar, InputOutputArray _mea
770770
mean = _mean.getMat().reshape(1, 1);
771771
}
772772

773-
calcCovarMatrix( _data, _covar, mean, (flags & ~(CV_COVAR_ROWS|CV_COVAR_COLS)) | CV_COVAR_ROWS, ctype );
773+
calcCovarMatrix( _data, _covar, mean, (flags & ~(cv::COVAR_ROWS|cv::COVAR_COLS)) | cv::COVAR_ROWS, ctype );
774774

775-
if( (flags & CV_COVAR_USE_AVG) == 0 )
775+
if( (flags & cv::COVAR_USE_AVG) == 0 )
776776
{
777777
mean = mean.reshape(1, size.height);
778778
mean.copyTo(_mean);
@@ -781,14 +781,14 @@ void calcCovarMatrix( InputArray _src, OutputArray _covar, InputOutputArray _mea
781781
}
782782

783783
Mat data = _src.getMat(), mean;
784-
CV_Assert( ((flags & CV_COVAR_ROWS) != 0) ^ ((flags & CV_COVAR_COLS) != 0) );
785-
bool takeRows = (flags & CV_COVAR_ROWS) != 0;
784+
CV_Assert( ((flags & cv::COVAR_ROWS) != 0) ^ ((flags & cv::COVAR_COLS) != 0) );
785+
bool takeRows = (flags & cv::COVAR_ROWS) != 0;
786786
int type = data.type();
787787
int nsamples = takeRows ? data.rows : data.cols;
788788
CV_Assert( nsamples > 0 );
789789
Size size = takeRows ? Size(data.cols, 1) : Size(1, data.rows);
790790

791-
if( (flags & CV_COVAR_USE_AVG) != 0 )
791+
if( (flags & cv::COVAR_USE_AVG) != 0 )
792792
{
793793
mean = _mean.getMat();
794794
ctype = std::max(std::max(CV_MAT_DEPTH(ctype >= 0 ? ctype : type), mean.depth()), CV_32F);
@@ -808,8 +808,8 @@ void calcCovarMatrix( InputArray _src, OutputArray _covar, InputOutputArray _mea
808808
mean = _mean.getMat();
809809
}
810810

811-
mulTransposed( data, _covar, ((flags & CV_COVAR_NORMAL) == 0) ^ takeRows,
812-
mean, (flags & CV_COVAR_SCALE) != 0 ? 1./nsamples : 1, ctype );
811+
mulTransposed( data, _covar, ((flags & cv::COVAR_NORMAL) == 0) ^ takeRows,
812+
mean, (flags & cv::COVAR_SCALE) != 0 ? 1./nsamples : 1, ctype );
813813
}
814814

815815

@@ -1171,7 +1171,7 @@ cvCalcCovarMatrix( const CvArr** vecarr, int count,
11711171
if( avgarr )
11721172
mean = mean0 = cv::cvarrToMat(avgarr);
11731173

1174-
if( (flags & CV_COVAR_COLS) != 0 || (flags & CV_COVAR_ROWS) != 0 )
1174+
if( (flags & cv::COVAR_COLS) != 0 || (flags & cv::COVAR_ROWS) != 0 )
11751175
{
11761176

11771177
cv::Mat data = cv::cvarrToMat(vecarr[0]);

‎modules/core/src/matrix_expressions.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ void MatOp::matmul(const MatExpr& e1, const MatExpr& e2, MatExpr& res) const
554554

555555
if( isT(e1) )
556556
{
557-
flags = CV_GEMM_A_T;
557+
flags = cv::GEMM_1_T;
558558
scale = e1.alpha;
559559
m1 = e1.a;
560560
}
@@ -568,7 +568,7 @@ void MatOp::matmul(const MatExpr& e1, const MatExpr& e2, MatExpr& res) const
568568

569569
if( isT(e2) )
570570
{
571-
flags |= CV_GEMM_B_T;
571+
flags |= cv::GEMM_2_T;
572572
scale *= e2.alpha;
573573
m2 = e2.a;
574574
}
@@ -1574,10 +1574,10 @@ void MatOp_GEMM::add(const MatExpr& e1, const MatExpr& e2, MatExpr& res) const
15741574
double alpha1 = i1 ? 1 : e1.alpha, alpha2 = i2 ? 1 : e2.alpha;
15751575

15761576
if( isMatProd(e1) && (i2 || isScaled(e2) || isT(e2)) )
1577-
MatOp_GEMM::makeExpr(res, (e1.flags & ~CV_GEMM_C_T)|(isT(e2) ? CV_GEMM_C_T : 0),
1577+
MatOp_GEMM::makeExpr(res, (e1.flags & ~cv::GEMM_3_T)|(isT(e2) ? cv::GEMM_3_T : 0),
15781578
e1.a, e1.b, alpha1, e2.a, alpha2);
15791579
else if( isMatProd(e2) && (i1 || isScaled(e1) || isT(e1)) )
1580-
MatOp_GEMM::makeExpr(res, (e2.flags & ~CV_GEMM_C_T)|(isT(e1) ? CV_GEMM_C_T : 0),
1580+
MatOp_GEMM::makeExpr(res, (e2.flags & ~cv::GEMM_3_T)|(isT(e1) ? cv::GEMM_3_T : 0),
15811581
e2.a, e2.b, alpha2, e1.a, alpha1);
15821582
else if( this == e2.op )
15831583
MatOp::add(e1, e2, res);
@@ -1593,10 +1593,10 @@ void MatOp_GEMM::subtract(const MatExpr& e1, const MatExpr& e2, MatExpr& res) co
15931593
double alpha1 = i1 ? 1 : e1.alpha, alpha2 = i2 ? 1 : e2.alpha;
15941594

15951595
if( isMatProd(e1) && (i2 || isScaled(e2) || isT(e2)) )
1596-
MatOp_GEMM::makeExpr(res, (e1.flags & ~CV_GEMM_C_T)|(isT(e2) ? CV_GEMM_C_T : 0),
1596+
MatOp_GEMM::makeExpr(res, (e1.flags & ~cv::GEMM_3_T)|(isT(e2) ? cv::GEMM_3_T : 0),
15971597
e1.a, e1.b, alpha1, e2.a, -alpha2);
15981598
else if( isMatProd(e2) && (i1 || isScaled(e1) || isT(e1)) )
1599-
MatOp_GEMM::makeExpr(res, (e2.flags & ~CV_GEMM_C_T)|(isT(e1) ? CV_GEMM_C_T : 0),
1599+
MatOp_GEMM::makeExpr(res, (e2.flags & ~cv::GEMM_3_T)|(isT(e1) ? cv::GEMM_3_T : 0),
16001600
e2.a, e2.b, -alpha2, e1.a, alpha1);
16011601
else if( this == e2.op )
16021602
MatOp::subtract(e1, e2, res);
@@ -1618,9 +1618,9 @@ void MatOp_GEMM::transpose(const MatExpr& e, MatExpr& res) const
16181618
CV_INSTRUMENT_REGION();
16191619

16201620
res = e;
1621-
res.flags = (!(e.flags & CV_GEMM_A_T) ? CV_GEMM_B_T : 0) |
1622-
(!(e.flags & CV_GEMM_B_T) ? CV_GEMM_A_T : 0) |
1623-
(!(e.flags & CV_GEMM_C_T) ? CV_GEMM_C_T : 0);
1621+
res.flags = (!(e.flags & cv::GEMM_1_T) ? cv::GEMM_2_T : 0) |
1622+
(!(e.flags & cv::GEMM_2_T) ? cv::GEMM_1_T : 0) |
1623+
(!(e.flags & cv::GEMM_3_T) ? cv::GEMM_3_T : 0);
16241624
swap(res.a, res.b);
16251625
}
16261626

0 commit comments

Comments
 (0)