Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 Feb 2021 21:20:54 +0000 (21:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 Feb 2021 21:34:49 +0000 (21:34 +0000)
commite5d78960c6c96c255ca699a0b9f0974e571055b3
tree9fabd7d171c56be1c86d815b9349f3b94c16ddde
parentba8d20e9ae4400be593583138c47eb72fd2adf6e
parentfba70f799160280bb981fcbd8b7f739812601b32
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
12 files changed:
modules/core/src/parallel_impl.cpp
modules/imgcodecs/CMakeLists.txt
modules/imgcodecs/src/grfmt_base.cpp
modules/imgcodecs/src/grfmt_jpeg.cpp
modules/imgcodecs/src/loadsave.cpp
modules/stitching/perf/opencl/perf_stitch.cpp
modules/stitching/perf/perf_estimators.cpp
modules/stitching/perf/perf_matchers.cpp
modules/stitching/perf/perf_precomp.hpp
modules/stitching/perf/perf_stich.cpp
platforms/js/build_js.py
samples/python/tutorial_code/ImgTrans/distance_transformation/imageSegmentation.py