Commit5c6c6af

authored

Merge pull request#27004 from asmorkalov:as/minMax_backport

Backported some CALL_HAL improvements from 5.x#26946

2 parents8a24d41 +1aa6929 commit5c6c6afCopy full SHA for 5c6c6af

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1437,7 +1437,7 @@ void cv::minMaxIdx(InputArray _src, double* minVal,`
`1437`	`1437`
`1438`	`1438`	`if (src.dims <=2)`
`1439`	`1439`	`{`
`1440`		`-if ((size_t)src.step == (size_t)mask.step)`
	`1440`	`+if ((size_t)src.step == (size_t)mask.step \|\| mask.empty())`
`1441`	`1441`	`{`
`1442`	`1442`	`CALL_HAL(minMaxIdx, cv_hal_minMaxIdx, src.data, src.step, src.cols*cn, src.rows,`
`1443`	`1443`	`src.depth(), minVal, maxVal, minIdx, maxIdx, mask.data);`
`@@ -1446,7 +1446,7 @@ void cv::minMaxIdx(InputArray _src, double* minVal,`
`1446`	`1446`	`CALL_HAL(minMaxIdxMaskStep, cv_hal_minMaxIdxMaskStep, src.data, src.step, src.cols*cn, src.rows,`
`1447`	`1447`	`src.depth(), minVal, maxVal, minIdx, maxIdx, mask.data, mask.step);`
`1448`	`1448`	`}`
`1449`		`-elseif (src.isContinuous() && mask.isContinuous())`
	`1449`	`+elseif (src.isContinuous() &&(mask.isContinuous() \|\| mask.empty()))`
`1450`	`1450`	`{`
`1451`	`1451`	`int res =cv_hal_minMaxIdx(src.data,0, (int)src.total()*cn,1, src.depth(),`
`1452`	`1452`	`minVal, maxVal, minIdx, maxIdx, mask.data);`

Comments

(0)