Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 14 Aug 2022 15:50:42 +0000 (15:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 14 Aug 2022 15:50:42 +0000 (15:50 +0000)
commit2ebdc047875436f9e2dee31edb7f137a0df6c2cf
treeed8fee798e2894b987c11f594fb0e7519acc5012
parentd09cc0f30c708ca06ad1a05f5b39f6368d986fad
parentcc8add9f6691881b002dad704b228fed30361e63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
26 files changed:
3rdparty/carotene/hal/CMakeLists.txt
cmake/OpenCVCompilerOptimizations.cmake
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVDetectCUDA.cmake
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/src/calibinit.cpp
modules/calib3d/src/five-point.cpp
modules/core/CMakeLists.txt
modules/core/include/opencv2/core/cv_cpu_dispatch.h
modules/core/include/opencv2/core/cv_cpu_helper.h
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/hal/intrin_neon.hpp
modules/core/src/system.cpp
modules/core/test/test_utils.cpp
modules/dnn/src/layers/scale_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/features2d/src/sift.simd.hpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/drawing.cpp
modules/imgproc/src/pyramids.cpp
modules/js/src/core_bindings.cpp
modules/objdetect/test/test_precomp.hpp
modules/objdetect/test/test_qrcode_encode.cpp
modules/python/CMakeLists.txt
modules/python/package/cv2/__init__.py