mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
Merge branch 4.x
This commit is contained in:
@@ -995,9 +995,18 @@ double Mat::dot(InputArray _mat) const
|
||||
CV_INSTRUMENT_REGION();
|
||||
|
||||
Mat mat = _mat.getMat();
|
||||
CV_Assert_N( mat.type() == type(), mat.size == size);
|
||||
|
||||
int cn = channels();
|
||||
if (this->dims <= 2)
|
||||
{
|
||||
double product = 0;
|
||||
CALL_HAL_RET(dotProduct, cv_hal_dotProduct, product, this->data, this->step, mat.data, mat.step,
|
||||
this->cols * cn, this->rows, this->depth());
|
||||
}
|
||||
|
||||
DotProdFunc func = getDotProdFunc(depth());
|
||||
CV_Assert_N( mat.type() == type(), mat.size == size, func != 0 );
|
||||
CV_Assert(func != 0 );
|
||||
|
||||
if( isContinuous() && mat.isContinuous() )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user