Merge pull request #8432 from csukuangfj:issue-8411

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)

committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)
committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)
diff --cc modules/core/include/opencv2/core/mat.hpp
Simple merge
diff --cc modules/core/include/opencv2/core/mat.inl.hpp
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)
committer	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)
		1	2
modules/core/include/opencv2/core/mat.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history