Merge remote-tracking branch 'upstream/3.4' into merge-3.4

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/OpenCVCompilerOptimizations.cmake
Simple merge
diff --cc modules/core/include/opencv2/core/cvdef.h
Simple merge
diff --cc modules/features2d/src/hal_replacement.hpp
Simple merge
diff --cc modules/imgproc/src/hal_replacement.hpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVCompilerOptimizations.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/cvdef.h	patch \|	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/hal_replacement.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/hal_replacement.hpp	patch \|	diff1 \|	diff2 \|	blob \| history