NotificationsYou must be signed in to change notification settings
Fork56.4k
Star85.3k

Commit4450226

authored

Merge pull request#25789 from asmorkalov:as/HAL_meanStdDev_tails

Fill mean and stdDev tails with zeros for HAL branch in meanStdDev#25789as it's done for other branches.### Pull Request Readiness ChecklistSee details athttps://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request- [x] I agree to contribute to the project under Apache 2 License.- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV- [x] The PR is proposed to the proper branch- [ ] There is a reference to the original bug report and related work- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name.- [ ] The feature is well documented and sample code can be built with the project CMake

1 parent204d62a commit4450226Copy full SHA for 4450226

File tree

1 file changed

-6

lines changed

modules/core/src
- mean.dispatch.cpp

1 file changed

-6

lines changed

`‎modules/core/src/mean.dispatch.cpp‎`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -544,6 +544,10 @@ void meanStdDev(InputArray _src, OutputArray _mean, OutputArray _sdv, InputArray`
`544`	`544`	`int dcn = (int)mean_mat.total();`
`545`	`545`	`CV_Assert( mean_mat.type() == CV_64F && mean_mat.isContinuous() &&`
`546`	`546`	`(mean_mat.cols ==1 \|\| mean_mat.rows ==1) && dcn >= cn );`
	`547`	`+`
	`548`	`+double* dptr = mean_mat.ptr<double>();`
	`549`	`+for(k = cn ; k < dcn; k++ )`
	`550`	`+ dptr[k] =0;`
`547`	`551`	`}`
`548`	`552`
`549`	`553`	`if (_sdv.needed())`
`@@ -555,6 +559,11 @@ void meanStdDev(InputArray _src, OutputArray _mean, OutputArray _sdv, InputArray`
`555`	`559`	`int dcn = (int)stddev_mat.total();`
`556`	`560`	`CV_Assert( stddev_mat.type() == CV_64F && stddev_mat.isContinuous() &&`
`557`	`561`	`(stddev_mat.cols ==1 \|\| stddev_mat.rows ==1) && dcn >= cn );`
	`562`	`+`
	`563`	`+double* dptr = stddev_mat.ptr<double>();`
	`564`	`+for(k = cn ; k < dcn; k++ )`
	`565`	`+ dptr[k] =0;`
	`566`	`+`
`558`	`567`	`}`
`559`	`568`
`560`	`569`	`if (src.isContinuous() && mask.isContinuous())`
`@@ -646,23 +655,17 @@ void meanStdDev(InputArray _src, OutputArray _mean, OutputArray _sdv, InputArray`
`646`	`655`	`if (_mean.needed())`
`647`	`656`	`{`
`648`	`657`	`constdouble* sptr = s;`
`649`		`-int dcn = (int)mean_mat.total();`
`650`	`658`	`double* dptr = mean_mat.ptr<double>();`
`651`	`659`	`for( k =0; k < cn; k++ )`
`652`	`660`	`dptr[k] = sptr[k];`
`653`		`-for( ; k < dcn; k++ )`
`654`		`- dptr[k] =0;`
`655`	`661`	`}`
`656`	`662`
`657`	`663`	`if (_sdv.needed())`
`658`	`664`	`{`
`659`	`665`	`constdouble* sptr = sq;`
`660`		`-int dcn = (int)stddev_mat.total();`
`661`	`666`	`double* dptr = stddev_mat.ptr<double>();`
`662`	`667`	`for( k =0; k < cn; k++ )`
`663`	`668`	`dptr[k] = sptr[k];`
`664`		`-for( ; k < dcn; k++ )`
`665`		`- dptr[k] =0;`
`666`	`669`	`}`
`667`	`670`	`}`
`668`	`671`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit4450226

File tree

1 file changed

1 file changed

`‎modules/core/src/mean.dispatch.cpp‎`

0 commit comments