Alexander Alekhin [Fri, 11 Dec 2020 19:27:20 +0000 (19:27 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 11 Dec 2020 19:15:26 +0000 (19:15 +0000)]
Merge pull request #19079 from alalek:issue_18713
Alexander Alekhin [Fri, 11 Dec 2020 19:14:29 +0000 (19:14 +0000)]
Merge pull request #19085 from OrestChura:oc/fix_new_streaming_tests
Alexander Alekhin [Fri, 11 Dec 2020 19:13:40 +0000 (19:13 +0000)]
Merge pull request #19084 from alalek:issue_16197
Alexander Alekhin [Fri, 11 Dec 2020 19:11:04 +0000 (19:11 +0000)]
Merge pull request #19068 from alalek:issue_18157
Alexander Alekhin [Fri, 11 Dec 2020 19:10:16 +0000 (19:10 +0000)]
Merge pull request #19064 from alalek:cmake_update_mkl
Alexander Alekhin [Fri, 11 Dec 2020 19:09:35 +0000 (22:09 +0300)]
Merge pull request #19045 from alalek:issue_17553
* flann: avoid dangling pointers on lost features data
* flann: fix Index::load()
Alexander Alekhin [Fri, 11 Dec 2020 19:08:46 +0000 (19:08 +0000)]
Merge pull request #19062 from alalek:3.4_issue_17553
Alexander Alekhin [Fri, 11 Dec 2020 19:07:56 +0000 (19:07 +0000)]
Merge pull request #19055 from alalek:4.x_issue_18244
Alexander Alekhin [Fri, 11 Dec 2020 19:07:34 +0000 (19:07 +0000)]
Merge pull request #19054 from alalek:3.4_issue_18244
Alexander Alekhin [Fri, 11 Dec 2020 19:06:47 +0000 (19:06 +0000)]
Merge pull request #19049 from alalek:issue_17282
Alexander Alekhin [Fri, 11 Dec 2020 19:06:12 +0000 (19:06 +0000)]
Merge pull request #19048 from alalek:android_gradle_5.6.4
Alexander Alekhin [Fri, 11 Dec 2020 18:25:55 +0000 (18:25 +0000)]
Merge pull request #19071 from LupusSanctus:am/dnn_nearest_resize_3.4
Alexander Alekhin [Fri, 11 Dec 2020 17:21:48 +0000 (17:21 +0000)]
features2d: fix ORB::setFirstScale() handling
OrestChura [Fri, 11 Dec 2020 17:26:39 +0000 (20:26 +0300)]
Fix new streaming tests for CI
Anatoliy Talamanov [Fri, 11 Dec 2020 16:29:34 +0000 (19:29 +0300)]
Merge pull request #19009 from TolyaTalamanov:at/media-frame-copy
[G-API] GStreamingBackend
* Snapshot
* Implement StreamingBackend
* Refactoring
* Refactoring 2
* Clean up
* Add missing functionality to support MediaFrame as output
* Partially address review comments
* Fix build
* Implement reshape for gstreamingbackend and add a test on it
* Address more comments
* Add format.hpp to gapi.hpp
* Fix debug build
* Address review comments
Co-authored-by: Smirnov Alexey <alexey.smirnov@intel.com>
Alexander Alekhin [Fri, 11 Dec 2020 15:14:42 +0000 (15:14 +0000)]
Merge pull request #19024 from komakai:cmake319-proposal2
Sergei Slashchinin [Fri, 11 Dec 2020 10:15:32 +0000 (13:15 +0300)]
Merge pull request #18591 from sl-sergei:download_utilities
Scripts for downloading models in DNN samples
* Initial commit. Utility classes and functions for downloading files
* updated download script
* Support YAML parsing, update download script and configs
* Fix problem with archived files
* fix models.yml
* Move download utilities to more appropriate place
* Fix script description
* Update README
* update utilities for broader range of files
* fix loading with no hashsum provided
* remove unnecessary import
* fix for Python2
* Add usage examples for downloadFile function
* Add more secure cache folder selection
* Remove trailing whitespaces
* Fix indentation
* Update function interface
* Change function for temp dir, change entry name in models.yml
* Update getCacheDirectory function call
* Return python implementation for cache directory selection, use more specific env variable
* Fix whitespace
Yosshi999 [Fri, 11 Dec 2020 10:14:15 +0000 (19:14 +0900)]
Merge pull request #18983 from Yosshi999:bitexact-gaussian-16U-faster
support SIMD for larger symmetric Bit-exact 16U gaussian blur
* support SIMD for bit-exact 16U symmetric gaussian blur
* use tighter SIMD registers
Alexander Alekhin [Fri, 11 Dec 2020 07:00:25 +0000 (07:00 +0000)]
calib3d: fix findCirclesGrid hang
- detect case with infinite loop and raise NoConv exception
- handle such exception
- add support for case with missing `blobDetector` (image contains Point2f array of candidates)
- add regression test
- undone rectification for "failed" detections too
- drop redirectError() usage
Jonathan Cole [Fri, 11 Dec 2020 07:14:28 +0000 (02:14 -0500)]
Merge pull request #19076 from Rightpoint:bugfix/colejd/fix-path-resolution-bugs
Fix path resolution bugs for XCFramework builds
* Fix incorrect paths for intermediate frameworks
* Remove unnecessary `./` prepend preventing use of absolute paths
Alexander Alekhin [Thu, 10 Dec 2020 20:37:37 +0000 (20:37 +0000)]
Merge pull request #19075 from alalek:dnn_fix_halide_build
Alexander Alekhin [Thu, 10 Dec 2020 20:29:36 +0000 (20:29 +0000)]
Merge pull request #19074 from alalek:dnn_test_tolerance_east
Alexander Alekhin [Thu, 10 Dec 2020 20:05:46 +0000 (20:05 +0000)]
Merge pull request #19072 from mshabunin:sink-sync-off
Alexander Alekhin [Tue, 8 Dec 2020 09:12:23 +0000 (09:12 +0000)]
android: add -llog for libprotobuf
Alexander Alekhin [Thu, 10 Dec 2020 18:23:24 +0000 (18:23 +0000)]
dnn: fix build with Halide, skip tests with crashes
Alexander Alekhin [Thu, 10 Dec 2020 15:51:58 +0000 (15:51 +0000)]
dnn(test): adjust EAST test tolerance
Maksim Shabunin [Thu, 10 Dec 2020 13:07:28 +0000 (16:07 +0300)]
videoio: turn off syncronized sink in GStreamer
Anastasia Murzova [Thu, 10 Dec 2020 11:27:23 +0000 (14:27 +0300)]
Added TF nearest neighbour resize behaviour alignment
Relates to OpenCV issue #18721
Giles Payne [Thu, 10 Dec 2020 12:43:26 +0000 (21:43 +0900)]
CMake version checks for iOS and macOS builds
Alexander Alekhin [Thu, 10 Dec 2020 08:07:50 +0000 (08:07 +0000)]
imgproc: fix minAreaRect()
Alexander Alekhin [Wed, 9 Dec 2020 18:09:00 +0000 (18:09 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 9 Dec 2020 18:05:17 +0000 (21:05 +0300)]
Merge pull request #18712 from mshabunin:doc-update-2
Alexander Alekhin [Wed, 9 Dec 2020 18:03:52 +0000 (18:03 +0000)]
Merge pull request #19061 from alalek:dnn_load_face_detector_with_external_protobuf
Alexander Alekhin [Wed, 9 Dec 2020 18:02:41 +0000 (18:02 +0000)]
Merge pull request #19060 from alalek:issue_18097
Alexander Alekhin [Wed, 9 Dec 2020 18:01:03 +0000 (18:01 +0000)]
Merge pull request #19059 from alalek:fixup_19000
Alexander Alekhin [Wed, 9 Dec 2020 15:29:57 +0000 (18:29 +0300)]
cmake: update MKL library searching
- allow to specify MKL_LIBRARIES through command-line
Anatoliy Talamanov [Wed, 9 Dec 2020 14:00:56 +0000 (17:00 +0300)]
Merge pull request #19002 from TolyaTalamanov:at/infer_gframe
[G-API] Support GFrame for infer
* GInfer(GFrame), currently broken
* Fixed (API only)
* Support GFrame in GIEBackend
* Fix comments to review
* Fix comments to review
* Fix doxygen
* Fix building with different IE versions
* Fix warning on MacOS
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
Co-authored-by: Smirnov Alexey <alexey.smirnov@intel.com>
Alexander Alekhin [Wed, 9 Dec 2020 05:35:37 +0000 (05:35 +0000)]
flann: drop wrapping of Index class
- due to lifetime restrictions on passed 'features' parameter and its dangling pointers
- dangling pointer issue is fixed for OpenCV 4.5.1+
Alexander Alekhin [Wed, 9 Dec 2020 05:12:18 +0000 (05:12 +0000)]
dnn(caffe): add DetectionOutputParameter.clip to .proto file
- allow to load opencv_face_detector with external unpatched protobuf
Alexander Alekhin [Wed, 9 Dec 2020 03:58:36 +0000 (03:58 +0000)]
js(wasm): use fallback on missing intrinsics in Emscripten 2.0.0+
Alexander Alekhin [Tue, 8 Dec 2020 21:09:41 +0000 (21:09 +0000)]
Merge pull request #18996 from LupusSanctus:am/dnn_bilinear_resize
Anastasia Murzova [Wed, 2 Dec 2020 22:48:18 +0000 (01:48 +0300)]
Added TF resize_bilinear behaviour alignment
Fixes OpenCV issue #18721
Alexander Alekhin [Tue, 8 Dec 2020 19:10:04 +0000 (19:10 +0000)]
cmake: fix handling of wrappers dependencies
Alexander Alekhin [Tue, 8 Dec 2020 18:03:19 +0000 (18:03 +0000)]
Merge pull request #19052 from diablodale:fix18888-opencl-doc
Alexander Alekhin [Tue, 8 Dec 2020 16:48:16 +0000 (16:48 +0000)]
cmake: don't define ENABLE_NEON flags in non-cross-compiling mode
- NEON / ANDROID_ARM_NEON are toolchain-specific flags
- they are usually not defined for native builds
- let work CPU_BASELINE=DETECT properly
Alexander Alekhin [Tue, 8 Dec 2020 16:48:16 +0000 (16:48 +0000)]
cmake: don't define ENABLE_NEON flags in non-cross-compiling mode
- NEON / ANDROID_ARM_NEON are toolchain-specific flags
- they are usually not defined for native builds
- let work CPU_BASELINE=DETECT properly
Orest Chura [Tue, 8 Dec 2020 15:44:33 +0000 (18:44 +0300)]
Merge pull request #18969 from OrestChura:oc/fix_notes_returns
[G-API] Multiple return/note fix
* Fix doxygen:
- multiple return
- multiple notes
* Addressing comments
- divide description of split(merge)3/4
Dale Phurrough [Tue, 8 Dec 2020 15:08:53 +0000 (16:08 +0100)]
clarify opencl execution context doc
- fix opencv/opencv#18888
Alexander Alekhin [Tue, 8 Dec 2020 11:34:20 +0000 (11:34 +0000)]
Merge pull request #19046 from alalek:issue_16861
Alexander Alekhin [Tue, 8 Dec 2020 10:31:31 +0000 (10:31 +0000)]
Merge pull request #19044 from OrestChura:oc/fix_coverity_warn_kmeans
Dale Phurrough [Tue, 8 Dec 2020 10:05:14 +0000 (11:05 +0100)]
Merge pull request #19029 from diablodale:fix19004-memthreadstart
add thread-safe startup of fastMalloc and fastFree
* add perf test core memory allocation
* fix threading in isAlignedAllocationEnabled()
* tweaks requested by maintainer
Alexander Alekhin [Tue, 8 Dec 2020 07:18:30 +0000 (07:18 +0000)]
android: use gradle 5.6.4
Alexander Alekhin [Tue, 8 Dec 2020 05:18:21 +0000 (05:18 +0000)]
android: use protected fields in JavaCamera2View
OrestChura [Mon, 7 Dec 2020 23:44:01 +0000 (02:44 +0300)]
Moved G-API output to the first place of arguments in comparison functions
Alexander Alekhin [Mon, 7 Dec 2020 22:31:53 +0000 (22:31 +0000)]
Merge pull request #19041 from alalek:issue_19025
Alexander Alekhin [Mon, 7 Dec 2020 22:11:49 +0000 (22:11 +0000)]
Merge pull request #19035 from berak:fix_dnn_net_dump_colors
Alexander Alekhin [Mon, 7 Dec 2020 21:18:47 +0000 (21:18 +0000)]
videoio(test): skip GStreamer in 'frame_timestamp' tests
- CAP_PROP_POS_MSEC is not reliable
Alexander Alekhin [Mon, 7 Dec 2020 20:41:37 +0000 (20:41 +0000)]
Merge pull request #19023 from alalek:core_update_allocator_stats_type
Alexander Alekhin [Mon, 7 Dec 2020 20:40:56 +0000 (20:40 +0000)]
Merge pull request #19019 from alalek:cmake_avoid_excessive_trace_dump
Alexander Alekhin [Mon, 7 Dec 2020 20:40:21 +0000 (20:40 +0000)]
Merge pull request #19015 from alalek:dnn_use_fma
berak [Mon, 7 Dec 2020 16:23:04 +0000 (17:23 +0100)]
dnn: add another color to Net::Impl::dump()
Maksim Shabunin [Mon, 7 Dec 2020 16:13:54 +0000 (19:13 +0300)]
Added TOC to most of tutorials
Alexander Alekhin [Sun, 6 Dec 2020 17:22:45 +0000 (17:22 +0000)]
Merge pull request #19021 from alalek:4.x_build_warnings_gcc_4.8.5
Alexander Alekhin [Sun, 6 Dec 2020 16:14:25 +0000 (16:14 +0000)]
Merge pull request #19022 from alalek:cmake_avoid_duplication_of_winit_self
joshdoe [Sat, 5 Dec 2020 21:28:07 +0000 (16:28 -0500)]
Merge pull request #18535 from joshdoe:gray16_gstreamer_writing
Add CV_16UC1/GRAY16_LE support to GStreamer backend for VideoWriter
* videoio(backend): add Writer_open_with_params to plugin API
This will allow arbitrary parameters to be passed to plugin backends
* videoio(gstreamer): add GRAY16_LE/CV_16UC1 writing support to GStreamer
This introduces a new property VIDEOWRITER_PROP_DEPTH, which defaults to
CV_8U, but for GStreamer can be set to CV_16U.
Also, fix another test to not fail if plugin isn't found, copying logic
from the read_write test.
* videoio(plugin): fix handling plugins with previous API level
* videoio: coding style
* fix warning
Alexander Alekhin [Sat, 5 Dec 2020 20:41:25 +0000 (20:41 +0000)]
core: update handling of allocator stats type
- don't use OPENCV_ALLOCATOR_STATS_COUNTER_TYPE definition in non C++11 builds
- don't use with MinGW
Alexander Alekhin [Sat, 5 Dec 2020 20:18:02 +0000 (20:18 +0000)]
cmake: avoid duplication of -Winit-self flag
Alexander Alekhin [Sat, 5 Dec 2020 19:40:04 +0000 (19:40 +0000)]
build warnings
- GCC 4.8.5 / CentOS 7
Alexander Alekhin [Sat, 5 Dec 2020 19:59:22 +0000 (19:59 +0000)]
Merge pull request #19018 from alalek:issue_19016
Alexander Alekhin [Sat, 5 Dec 2020 13:28:20 +0000 (13:28 +0000)]
cmake: avoid excessive output from cmake --trace/--trace-expand
- `cmake . --trace-expand -DCMAKE_TRACE_MODE=1`
Alexander Alekhin [Sat, 5 Dec 2020 12:50:37 +0000 (12:50 +0000)]
samples: replace regex
- GCC 4.8.5 doesn't support regex
Alexander Alekhin [Sat, 5 Dec 2020 11:51:03 +0000 (11:51 +0000)]
dnn: prefer to use v_fma() instead of v_c += v_a * v_b
Maksim Shabunin [Fri, 4 Dec 2020 22:46:00 +0000 (01:46 +0300)]
doc: tutorial refactor
Alexander Alekhin [Fri, 4 Dec 2020 18:25:32 +0000 (18:25 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 4 Dec 2020 18:09:59 +0000 (18:09 +0000)]
Merge pull request #18955 from alalek:test_debug_flag
Wenqing Zhang [Thu, 3 Dec 2020 18:47:40 +0000 (02:47 +0800)]
Merge pull request #17570 from HannibalAPE:text_det_recog_demo
[GSoC] High Level API and Samples for Scene Text Detection and Recognition
* APIs and samples for scene text detection and recognition
* update APIs and tutorial for Text Detection and Recognition
* API updates:
(1) put decodeType into struct Voc
(2) optimize the post-processing of DB
* sample update:
(1) add transformation into scene_text_spotting.cpp
(2) modify text_detection.cpp with API update
* update tutorial
* simplify text recognition API
update tutorial
* update impl usage in recognize() and detect()
* dnn: refactoring public API of TextRecognitionModel/TextDetectionModel
* update provided models
update opencv.bib
* dnn: adjust text rectangle angle
* remove points ordering operation in model.cpp
* update gts of DB test in test_model.cpp
* dnn: ensure to keep text rectangle angle
- avoid 90/180 degree turns
* dnn(text): use quadrangle result in TextDetectionModel API
* dnn: update Text Detection API
(1) keep points' order consistent with (bl, tl, tr, br) in unclip
(2) update contourScore with boundingRect
Alexander Alekhin [Thu, 3 Dec 2020 18:10:30 +0000 (18:10 +0000)]
Merge pull request #18965 from alalek:cmake_gen_js_code
Alexander Alekhin [Thu, 3 Dec 2020 18:08:40 +0000 (18:08 +0000)]
Merge pull request #19000 from alalek:cmake_fix_order_of_bindings_generators
Alexander Alekhin [Mon, 30 Nov 2020 03:41:21 +0000 (03:41 +0000)]
cmake(js): update js targets
- unconditional js bindings source code generation
- use common name for tests: opencv_test_js
Alexander Alekhin [Thu, 3 Dec 2020 13:55:35 +0000 (16:55 +0300)]
Merge pull request #18997 from alalek:disable_github_action_workflow
Alexander Alekhin [Thu, 3 Dec 2020 13:55:07 +0000 (13:55 +0000)]
Merge pull request #18993 from alalek:issue_18984
Alexander Alekhin [Thu, 3 Dec 2020 11:59:06 +0000 (11:59 +0000)]
cmake: fix processing order of <wrapper>_bindings_generator
- ensure that wrapped modules are already processed
Alexander Alekhin [Thu, 3 Dec 2020 10:59:59 +0000 (10:59 +0000)]
Merge pull request #18998 from upupming:patch-1
Alexander Alekhin [Thu, 3 Dec 2020 10:58:47 +0000 (10:58 +0000)]
Merge pull request #18992 from vertexcite:patch-1
Alexander Alekhin [Thu, 3 Dec 2020 10:57:25 +0000 (10:57 +0000)]
Merge pull request #18966 from Staticity:add_live_timestamps_to_msmf
Randall Britten [Wed, 2 Dec 2020 01:47:37 +0000 (14:47 +1300)]
Fixed minor typo "poins" in documentation page
Yiming Li [Thu, 3 Dec 2020 07:35:52 +0000 (15:35 +0800)]
fix: typo
Alexander Alekhin [Thu, 3 Dec 2020 02:03:11 +0000 (02:03 +0000)]
github(actions): manual trigger for arm64-build-checks.yml
Alexander Alekhin [Wed, 2 Dec 2020 22:54:47 +0000 (22:54 +0000)]
Merge pull request #18994 from alalek:umat_drop_unavailable_methods
Jaime Rivera [Mon, 30 Nov 2020 05:17:24 +0000 (21:17 -0800)]
Add Timestamps to MSMF Video Capture by index
Enable frame timestamp tests for MSMF
Add functional test for camera live timestamps
Remove trailing whitespace
Add timestamp test to all functional tests. Protect div by 0
Add Timestamps to MSMF Video Capture by index
Vadim Pisarevsky [Wed, 2 Dec 2020 19:14:47 +0000 (19:14 +0000)]
Merge pull request #18911 from chargerKong:quat
Alexander Alekhin [Wed, 2 Dec 2020 19:09:24 +0000 (19:09 +0000)]
Merge pull request #18986 from alalek:fix_ipp_17453_2
Alexander Alekhin [Wed, 2 Dec 2020 19:07:38 +0000 (19:07 +0000)]
Merge pull request #18831 from rjiejie:master-opt@pipeline
Alexander Alekhin [Wed, 2 Dec 2020 19:06:57 +0000 (19:06 +0000)]
Merge pull request #18977 from Rightpoint:objc-collision-fix
Vadim Pisarevsky [Wed, 2 Dec 2020 18:38:16 +0000 (18:38 +0000)]
Merge pull request #18462 from joy2myself:riscv_toolchian
Kong Liangqian [Tue, 24 Nov 2020 10:35:39 +0000 (18:35 +0800)]
Add adding and subtraction operations between a number and a quaternion;
fix a typo;
Add documentation of quaternion operators;
Restrict the type of scalar: the same as quaternion;
Alexander Alekhin [Wed, 2 Dec 2020 17:34:22 +0000 (17:34 +0000)]
Merge pull request #18991 from alalek:workaround_12959
Alexander Alekhin [Wed, 2 Dec 2020 15:02:43 +0000 (15:02 +0000)]
core(UMat): drop unavailable methods
Vadim Pisarevsky [Wed, 2 Dec 2020 13:33:32 +0000 (13:33 +0000)]
Merge pull request #18971 from GArik:orbbec