Alexander Alekhin [Fri, 30 Jul 2021 14:43:17 +0000 (14:43 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 30 Jul 2021 14:38:45 +0000 (14:38 +0000)]
Merge pull request #20478 from rogday:onnx_refactor_master
Smirnov Egor [Fri, 30 Jul 2021 10:00:13 +0000 (13:00 +0300)]
reimplement onnx refactor for master
Alexander Alekhin [Thu, 29 Jul 2021 13:11:02 +0000 (13:11 +0000)]
Merge pull request #20472 from zchrissirhcz:fix-typo-in-comment
Zhuo Zhang [Thu, 29 Jul 2021 01:34:09 +0000 (09:34 +0800)]
Fix typo in comment, OpenMP => TBB
rogday [Wed, 28 Jul 2021 15:06:24 +0000 (18:06 +0300)]
Merge pull request #20453 from rogday:onnx_importer_fix
Split layer dispatch into functions in ONNXImporter
* split layer dispatch into functions
* fixes
* identation and comment fixes
* fix constness
Alexander Alekhin [Mon, 26 Jul 2021 10:09:04 +0000 (10:09 +0000)]
Merge pull request #20445 from dbudniko:dbudniko/G-API_mtcnn_demo_single_transpose
Alexander Alekhin [Mon, 26 Jul 2021 09:57:44 +0000 (09:57 +0000)]
Merge pull request #20459 from xerxesb:bugfix/cuda-cmake-typo
Xerxes Battiwalla [Mon, 26 Jul 2021 04:54:27 +0000 (14:54 +1000)]
Fixed typo in error message in OpenCVDetectCUDA.cmake
There was a minor typo in the FATAL error message when the specified CUDA generation does not match any known generation
Alexander Alekhin [Sat, 24 Jul 2021 15:34:58 +0000 (15:34 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Parsa [Sat, 24 Jul 2021 15:29:24 +0000 (19:59 +0430)]
Merge pull request #20440 from parsa-ra:patch-1
* Update config_reference.markdown
Added description for `WITH_CLP` build option.
* Added extra description
Can't cross-reference with anchors to other sections of the markdown file due to the presence of markdown link extension in the form of
`## Header {#id-of-header}`
* Fixed trailing space issue
Alexander Alekhin [Sat, 24 Jul 2021 15:28:01 +0000 (15:28 +0000)]
Merge pull request #20424 from sbajtl:worker-importscript-bugfix
Alexander Alekhin [Sat, 24 Jul 2021 13:41:01 +0000 (13:41 +0000)]
Merge pull request #20369 from shreyastaware:master
Alexander Alekhin [Fri, 23 Jul 2021 14:34:57 +0000 (14:34 +0000)]
Merge pull request #20447 from snoyes:patch-1
Julia Bareeva [Fri, 23 Jul 2021 14:11:50 +0000 (17:11 +0300)]
Merge pull request #20450 from JulieBar:lstm_inside
Support non-zero hidden state for LSTM
* fully support non-zero hidden state for LSTM
* check dims of hidden state for LSTM
* fix failed test Test_Model.TextRecognition
* add new tests for LSTM w/ non-zero hidden params
Co-authored-by: Julie Bareeva <julia.bareeva@xperience.ai>
ZhangYin [Fri, 23 Jul 2021 14:08:43 +0000 (22:08 +0800)]
Merge pull request #20412 from joy2myself:rvv-0.10
bug fixes for universal intrinsics of RISC-V back-end
* Align universal intrinsic comparator behaviour with other platforms
Set all bits to one for return value of int and fp comparators.
* fix v_pack_triplets, v_pack_store and v_pack_u_store
* Remove redundant CV_DECL_ALIGNED statements
Co-authored-by: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Scott Noyes [Thu, 22 Jul 2021 19:58:20 +0000 (14:58 -0500)]
minor grammar edits
Shreyas Taware [Wed, 7 Jul 2021 09:10:08 +0000 (14:40 +0530)]
Update py_canny.markdown
Fixed a word that was previously written as third argument but it is instead the fourth argument of cv.Canny() function
Alexander Alekhin [Thu, 22 Jul 2021 16:44:47 +0000 (16:44 +0000)]
Merge pull request #20429 from rogday:tf_importer_asym_pads
Smirnov Egor [Mon, 19 Jul 2021 15:24:15 +0000 (18:24 +0300)]
implement asymmetric padding for conv2d, max_pool and conv2d_backprop_input
Dmitry Budnikov [Thu, 22 Jul 2021 13:52:11 +0000 (16:52 +0300)]
single transpose MTCNN version
Francesco Petrogalli [Wed, 21 Jul 2021 15:46:05 +0000 (16:46 +0100)]
Merge pull request #20392 from fpetrogalli:aarch64-semihosting
AArch64 semihosting
* [ts] Disable filesystem support in the TS module.
Because of this change, all the tests loading data will file, but tat
least the core module can be tested with the following line:
opencv_test_core --gtest_filter=-"*Core_InputOutput*:*Core_globbing.accuracy*"
* [aarch64] Build OpenCV for AArch64 semihosting.
This patch provide a toolchain file that allows to build the library
for semihosting applications [1]. Minimal changes have been applied to
the code to be able to compile with a baremetal toolchain.
[1] https://developer.arm.com/documentation/100863/latest
The option `CV_SEMIHOSTING` is used to guard the bits in the code that
are specific to the target.
To build the code:
cmake ../opencv/ \
-DCMAKE_TOOLCHAIN_FILE=../opencv/platforms/semihosting/aarch64-semihosting.toolchain.cmake \
-DSEMIHOSTING_TOOLCHAIN_PATH=/path/to/baremetal-toolchain/bin/ \
-DBUILD_EXAMPLES=ON -GNinja
A barematel toolchain for targeting aarch64 semihosting can be found
at [2], under `aarch64-none-elf`.
[2] https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads
The folder `samples/semihosting` provides two example semihosting
applications.
The two binaries can be executed on the host platform with:
qemu-aarch64 ./bin/example_semihosting_histogram
qemu-aarch64 ./bin/example_semihosting_norm
Similarly, the test and perf executables of the modules can be run
with:
qemu-aarch64 ./bin/opecv_[test|perf]_<module>
Notice that filesystem support is disabled by the toolchain file,
hence some of the test that depend on filesystem support will fail.
* [semihosting] Remove blank like at the end of file. [NFC]
The spurious blankline was reported by
https://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/31158.
* [semihosting] Make the raw pixel file generation OS independent.
Use the facilities provided by Cmake to generate the header file
instead of a shell script, so that the build doesn't fail on systems
that do not have a unix shell.
* [semihosting] Rename variable for semihosting compilation.
* [semihosting] Move the cmake configuration to a variable file.
* [semihosting] Make the guard macro private for the core module.
* [semihosting] Remove space. [NFC]
* [semihosting] Improve comment with information about semihosting. [NFC]
* [semihosting] Update license statement on top of sourvce file. [NFC]
* [semihosting] Replace BM_SUFFIX with SEMIHOSTING_SUFFIX. [NFC]
* [semihosting] Remove double space. [NFC]
* [semihosting] Add some text output to the sample applications.
* [semihosting] Remove duplicate entry in cmake configuration. [NFCI]
* [semihosting] Replace `long` with `int` in sample apps. [NFCI]
* [semihosting] Use `configure_file` to create the random pixels. [NFCI]
* [semihosting][bugfix] Fix name of cmakedefine variable.
* [semihosting][samples] Use CV_8UC1 for grayscale images. [NFCI]
* [semihosting] Add readme file.
* [semihosting] Remove blank like at the end of README. [NFC]
This fixes the failure at
https://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/31272.
Alexander Alekhin [Wed, 21 Jul 2021 09:47:10 +0000 (09:47 +0000)]
Merge pull request #20437 from pytianxxiao:fix#20430
Xiaoxiao Tian [Wed, 21 Jul 2021 05:32:50 +0000 (13:32 +0800)]
fix: ocv_target_link_libraries could not handle the keyword rightly #20430
Alexander Alekhin [Tue, 20 Jul 2021 16:25:43 +0000 (16:25 +0000)]
Merge pull request #20431 from lukasalexanderweber:debug-stitching_detailed.py
Lukas-Alexander Weber [Tue, 20 Jul 2021 08:59:15 +0000 (10:59 +0200)]
fix TypeError when specifying compose_megapix
without rounding the composed image sizes (variable "sz") they will be odly fractions of a pixel (e.g. (5300.965, 3772.897)) and therefore cause a "TypeError: integer argument expected, got float" in line
456 roi = warper.warpRoi(sz, K, cameras[i].R)
Alexander Alekhin [Mon, 19 Jul 2021 20:43:18 +0000 (20:43 +0000)]
Merge pull request #20143 from rogday:base64_encoding
Saša Bajtl [Sun, 18 Jul 2021 08:12:39 +0000 (10:12 +0200)]
Bugfix on import script with web worker.
Alexander Alekhin [Fri, 16 Jul 2021 15:44:29 +0000 (15:44 +0000)]
Merge pull request #20402 from rogday:tf_diag_dummy
Smirnov Egor [Tue, 13 Jul 2021 09:20:35 +0000 (12:20 +0300)]
add NotImplemented layer
Alexander Alekhin [Fri, 16 Jul 2021 10:35:42 +0000 (10:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 16 Jul 2021 10:33:42 +0000 (10:33 +0000)]
Merge pull request #20394 from SamFC10:conv-asymmetric-pads
Alexander Alekhin [Fri, 16 Jul 2021 10:19:25 +0000 (10:19 +0000)]
Merge pull request #20200 from rmeertens:update_grabcut
SamFC10 [Fri, 16 Jul 2021 04:09:41 +0000 (09:39 +0530)]
Fix convolution asymmetric padding bug in onnx importer
Alexander Alekhin [Thu, 15 Jul 2021 22:43:42 +0000 (22:43 +0000)]
Merge pull request #20410 from alalek:fix_dnn_dldt_output_layout
Alexander Alekhin [Wed, 14 Jul 2021 23:31:41 +0000 (23:31 +0000)]
dnn(ie): fix handling of 1D and non-32F outputs of InferenceEngine
Alexander Alekhin [Sat, 10 Jul 2021 13:06:33 +0000 (13:06 +0000)]
dnn(test): add extra IR models, more checks in IE testing code
Alexander Alekhin [Thu, 15 Jul 2021 20:06:22 +0000 (20:06 +0000)]
Merge pull request #20420 from berak:python_fix_trackbar_warning
berak [Thu, 15 Jul 2021 15:02:23 +0000 (17:02 +0200)]
python: fix trackbar warning
Alexander Alekhin [Fri, 9 Jul 2021 16:22:13 +0000 (16:22 +0000)]
dnn(test): backport test_ie_models.cpp from 4.5.3
Roland Meertens [Thu, 3 Jun 2021 18:59:22 +0000 (20:59 +0200)]
Updated grabcut example to show the background in a transparant way
Pablo Romero [Tue, 13 Jul 2021 19:40:15 +0000 (21:40 +0200)]
Merge pull request #20399 from pablorcum:3.4
Improves support for Unix non-Linux systems, including QNX
* Fixes #20395. Improves support for Unix non-Linux systems. Focus on QNX Neutrino.
Signed-off-by: promero <promero@mathworks.com>
* Update system.cpp
Dmitry Budnikov [Tue, 13 Jul 2021 19:33:13 +0000 (22:33 +0300)]
Merge pull request #20383 from dbudniko:dbudniko/mtcnn_1st_pnet_simplification
MTCNN 1st pnet simplification to ensure single graph input
* 1st pnet simplification to ensure single graph input
* address comment from Dmitry M regarding unused variable
Alexey Smirnov [Tue, 13 Jul 2021 19:31:46 +0000 (22:31 +0300)]
Merge pull request #20329 from smirnov-alexey:as/mediaframe_serialization
[G-API]: Add serialization mechanism for cv::MediaFrame
* Stub initial interface
* Fix templates for deserialization
* Fix tests
* Disable a warning on windows
* Address review comments
* Change enable_ifs to other template helpers
* Resolve ambiguous template
* Fix warnings in docs
Alexander Alekhin [Tue, 13 Jul 2021 10:18:43 +0000 (10:18 +0000)]
Merge pull request #20400 from alalek:cmake_fix_mode_vars
Alexander Alekhin [Tue, 13 Jul 2021 09:15:03 +0000 (09:15 +0000)]
cmake: use relative path for mode vars
Alexander Alekhin [Mon, 12 Jul 2021 21:14:22 +0000 (21:14 +0000)]
Merge pull request #20397 from alalek:fix_winpack_dldt_stale_sysroot
Alexander Alekhin [Mon, 12 Jul 2021 19:32:11 +0000 (19:32 +0000)]
build(winpack_dldt): avoid stale sysroot contents
Alexander Alekhin [Sat, 10 Jul 2021 13:01:03 +0000 (13:01 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 9 Jul 2021 22:42:29 +0000 (22:42 +0000)]
Merge pull request #20278 from joy2myself:rvv-0.10
Sergey Ivanov [Fri, 9 Jul 2021 18:46:38 +0000 (21:46 +0300)]
Merge pull request #20372 from sivanov-work:serialize
GAPI: Implement ConstValue serialize/deserialize
* Implement ConstValue ser/deser
* Fix MacOs compile issue
* Fix Docs compile
* Change uint32 -> uint64 for serialize tag
César Gouveia [Fri, 9 Jul 2021 18:21:56 +0000 (19:21 +0100)]
Merge pull request #20374 from cesarpgouveia:bugfix/fix_load_onnxModel_debug
* Fix bug while loading onnx model in debug
* dnn: fix other .at using
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Fri, 9 Jul 2021 18:15:10 +0000 (18:15 +0000)]
Merge pull request #20381 from berak:dnn_samples_fix_colorization_links
berak [Fri, 9 Jul 2021 11:21:44 +0000 (13:21 +0200)]
dnn: update links for the colorization samples
Alexander Alekhin [Thu, 8 Jul 2021 20:54:09 +0000 (20:54 +0000)]
Merge pull request #20368 from mightbxg:bugfix_imshowqt
Francesco Petrogalli [Thu, 8 Jul 2021 20:21:21 +0000 (21:21 +0100)]
Merge pull request #19985 from fpetrogalli:disable_threads
* [build][option] Introduce `OPENCV_DISABLE_THREAD_SUPPORT` option.
The option forces the library to build without thread support.
* update handling of OPENCV_DISABLE_THREAD_SUPPORT
- reduce amount of #if conditions
* [to squash] cmake: apply mode vars in toolchains too
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Smirnov Egor [Thu, 8 Jul 2021 07:42:44 +0000 (10:42 +0300)]
port base64 encoding from 3.4
Alexey Smirnov [Wed, 7 Jul 2021 19:07:59 +0000 (22:07 +0300)]
Merge pull request #20163 from smirnov-alexey:as/gapi_serialization_docs
G-API: add documentation on serialization functionality
* Add documentation on serialization/deserialization
* Add docs on bind() methods
* Fix typo
* Docs refactoring
* Fix s11n docs
* Fix deserialize() docs
* Change deserialize docs
* Fix warning
* Address review comments
* Fix sample
* Fix warnings and errors
* Fix docs warnings
* Fix warnings
* Address review comments
* Add prefixes to snippets and fix indentation
* Address review comments and move snippets to a single file
Alexander Alekhin [Wed, 7 Jul 2021 18:21:57 +0000 (18:21 +0000)]
Merge pull request #20373 from kikaxa:mjpeg-VideoInputStream-alignment-fix
kikaxa [Wed, 7 Jul 2021 15:31:53 +0000 (18:31 +0300)]
fix videoio/src/container_avi.cpp VideoInputStream alignment
Sergey Ivanov [Wed, 7 Jul 2021 12:33:40 +0000 (15:33 +0300)]
Merge pull request #20039 from sivanov-work:gapi_empty_input
G-API: Implement variant visit()
* Add variant visitor, use visitor for check compile args
* Fix GAPI UT: variant *compiler
* Aling apply_visior with std, fix indentations
* Fix compilation (included compiler_hints.hpp)
* Fix compilation (due gapi standalone)
* Fix compilation2 (Docs)
* Add Lambdas overload, Refactor visit()
* Add ReturnType auto deduction
* Fix comilation
* Fix compilation
* Fix warnings
* Try to fix MSVC14
* Fix docs
* Try fix Win compile
* Fix Docs again
* Revert GAPI empty input fix
* Apply comment for `tuple_element`
* Add std::decay for std::base_of to work arounf armv7 problem
* Apply review comments
* Apply review comments: added comment & removed unused args
* Fix docs compilation
Xinguang Bian [Wed, 7 Jul 2021 04:35:11 +0000 (12:35 +0800)]
fix scale problem in DefaultViewPort::controlImagePosition()
Maxim Pashchenkov [Tue, 6 Jul 2021 18:35:41 +0000 (21:35 +0300)]
Merge pull request #20359 from mpashchenkov:mp/onnx-tests
G-API: ONNX. Skip tests.
* imread for every test
* Changed name for Yolo function
Alexander Alekhin [Mon, 5 Jul 2021 21:48:22 +0000 (21:48 +0000)]
Merge tag '4.5.3'
Alexander Alekhin [Mon, 5 Jul 2021 12:03:22 +0000 (12:03 +0000)]
release: OpenCV 4.5.3
Alexander Alekhin [Sun, 4 Jul 2021 21:31:56 +0000 (21:31 +0000)]
Merge tag '3.4.15'
Alexander Alekhin [Sun, 4 Jul 2021 21:24:40 +0000 (21:24 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 4 Jul 2021 21:10:13 +0000 (21:10 +0000)]
release: OpenCV 3.4.15
Alexander Alekhin [Sun, 4 Jul 2021 21:07:02 +0000 (21:07 +0000)]
Merge pull request #20350 from alalek:issue_20285
Alexander Alekhin [Sun, 4 Jul 2021 20:54:03 +0000 (20:54 +0000)]
Merge pull request #20355 from alalek:issue_20352
Alexander Alekhin [Sun, 4 Jul 2021 18:41:34 +0000 (18:41 +0000)]
Merge pull request #20354 from alalek:issue_20353
Alexander Alekhin [Sun, 4 Jul 2021 14:33:18 +0000 (17:33 +0300)]
highgui: fix win32 backend behavior
Alexander Alekhin [Sun, 4 Jul 2021 10:07:34 +0000 (13:07 +0300)]
cmake: update Halide detection
Alexander Alekhin [Sat, 3 Jul 2021 20:42:17 +0000 (20:42 +0000)]
Merge pull request #20351 from alalek:issue_20320
Alexander Alekhin [Sat, 3 Jul 2021 11:36:29 +0000 (11:36 +0000)]
cmake(highgui): don't allow multiple builtin backends
Alexander Alekhin [Sat, 3 Jul 2021 10:57:18 +0000 (10:57 +0000)]
cmake: exclude -pthread from Emscripten default build
Alexander Alekhin [Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 3 Jul 2021 00:27:54 +0000 (00:27 +0000)]
Merge pull request #20346 from alalek:backport_20026
Alexander Alekhin [Fri, 2 Jul 2021 23:37:02 +0000 (23:37 +0000)]
Merge pull request #20345 from mitruska:update_ngraph_normalizel2
Alexander Alekhin [Fri, 2 Jul 2021 23:35:12 +0000 (23:35 +0000)]
Merge pull request #20344 from alalek:backport_20343
Alexander Alekhin [Fri, 2 Jul 2021 23:33:49 +0000 (23:33 +0000)]
Merge pull request #20343 from alalek:issue_19915
Alexander Alekhin [Fri, 2 Jul 2021 21:37:37 +0000 (21:37 +0000)]
cmake(IE): extract INF_ENGINE_RELEASE from InferenceEngine package
Alexander Alekhin [Fri, 2 Jul 2021 21:47:14 +0000 (21:47 +0000)]
Merge pull request #20337 from alalek:build_opencv_winpack_dldt_2021.4.0
mitruska [Fri, 2 Jul 2021 13:29:34 +0000 (15:29 +0200)]
Use explicit version of ngraph NormalizeL2
Alexander Alekhin [Fri, 2 Jul 2021 10:41:41 +0000 (10:41 +0000)]
java: force using of 'Ptr<>' for OpenCV classes
backport of commit:
e5841d3126527ff1151ab480ba8e291e29942e07
Alexander Alekhin [Fri, 2 Jul 2021 10:41:41 +0000 (10:41 +0000)]
java: force using of 'Ptr<>' for OpenCV classes
Alexander Alekhin [Wed, 30 Jun 2021 21:41:25 +0000 (21:41 +0000)]
build: winpack_dldt with dldt 2021.4.0
Alexander Alekhin [Thu, 1 Jul 2021 19:39:13 +0000 (19:39 +0000)]
Merge pull request #20341 from alalek:gapi_replace_ie_deprecated
Maxim Pashchenkov [Thu, 1 Jul 2021 19:06:35 +0000 (22:06 +0300)]
Merge pull request #20298 from mpashchenkov:mp/python-desync
G-API: Python. Desync.
* Desync. GMat.
* Alignment
Alexander Alekhin [Thu, 1 Jul 2021 18:30:19 +0000 (18:30 +0000)]
Merge pull request #20326 from APrigarina:fix_samples
APrigarina [Tue, 29 Jun 2021 19:15:37 +0000 (22:15 +0300)]
fix samples
Alexander Alekhin [Thu, 1 Jul 2021 13:48:11 +0000 (13:48 +0000)]
gapi(ie): replace deprecated calls
Alexander Alekhin [Thu, 1 Jul 2021 10:52:31 +0000 (10:52 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Maxim Pashchenkov [Thu, 1 Jul 2021 10:27:28 +0000 (13:27 +0300)]
Merge pull request #20144 from mpashchenkov:mp/python-ge
G-API: Python. Gaze Estimation sample.
* GE pep8
* Added function description, wrapped copy
* Applying review comments
* One more change
* Added gin
* Rstrt bb
Alexander Alekhin [Thu, 1 Jul 2021 10:25:35 +0000 (10:25 +0000)]
Merge pull request #20335 from SamFC10:concat-const-input
Alexander Alekhin [Thu, 1 Jul 2021 09:52:19 +0000 (09:52 +0000)]
Merge pull request #20336 from JoeHowse:refactor-cl_image-float16-conversions
Alexander Alekhin [Thu, 1 Jul 2021 09:41:56 +0000 (09:41 +0000)]
Merge pull request #20333 from APrigarina:fix_samples_3.4
Anatoliy Talamanov [Thu, 1 Jul 2021 09:36:19 +0000 (12:36 +0300)]
Merge pull request #20284 from TolyaTalamanov:at/wrap-render
G-API: Wrap render functionality to python
* Wrap render Rect prim
* Add all primitives and tests
* Cover mosaic and image
* Handle error in pyopencv_to(Prim)
* Move Mosaic and Rect ctors wrappers to shadow file
* Use GAPI_PROP_RW
* Fix indent
SamFC10 [Wed, 30 Jun 2021 16:25:42 +0000 (21:55 +0530)]
modified onnx importer to concat const input blobs
Alexander Alekhin [Wed, 30 Jun 2021 23:58:26 +0000 (23:58 +0000)]
Merge pull request #20325 from alalek:dnn_openvino_2021.4.0