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 [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>
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
Alexander Alekhin [Tue, 29 Jun 2021 21:55:18 +0000 (21:55 +0000)]
dnn(ie): replace deprecated calls
Alexander Alekhin [Tue, 29 Jun 2021 20:25:22 +0000 (20:25 +0000)]
dnn(test): update tests for OpenVINO 2021.4
Rafael H Tibães [Wed, 30 Jun 2021 22:08:24 +0000 (19:08 -0300)]
Merge pull request #20327 from tibaes:MSMF-Slow-Webcam-Startup
* fixes MSMF slow webcam startup
* add variable to change MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS at runtime
Alexander Alekhin [Wed, 30 Jun 2021 20:51:49 +0000 (20:51 +0000)]
Merge pull request #20328 from alalek:backport_20321
Joe Howse [Mon, 21 Jun 2021 03:46:32 +0000 (00:46 -0300)]
OpenCL: core support for FP16, more channel orders
* Support cl_image conversion for CL_HALF_FLOAT (float16)
* Support cl_image conversion for additional channel orders:
CL_A, CL_INTENSITY, CL_LUMINANCE, CL_RG, CL_RA
* Comment on why cl_image conversion is unsupported for CL_RGB
* Predict optimal vector width for float16
* ocl::kernelToStr: support float16
* ocl::Device::halfFPConfig: drop artificial requirement for OpenCL
version >= 1.2. Even OpenCL 1.0 supports the underlying config
property, CL_DEVICE_HALF_FP_CONFIG.
* dumpOpenCLInformation: provide info on OpenCL half-float support
and preferred half-float vector width
* randu: support default range [-1.0, 1.0] for float16
* TestBase::warmup: support float16
Alexander Alekhin [Wed, 30 Jun 2021 14:59:22 +0000 (14:59 +0000)]
Merge pull request #20330 from Wovchena:fix-arg-for-calcHist-in-demos
Vladimir [Wed, 30 Jun 2021 07:15:58 +0000 (10:15 +0300)]
Fix an arg for calcHist() in demos
`float* histRange = { range };` doesn't make much sense. `histRange` is
an array of array(s), so it should have a type of ptr to ptr. Strangely
some domos are correct as well as the example for the function
https://docs.opencv.org/master/d6/dc7/group__imgproc__hist.html#ga4b2b5fd75503ff9e6844cc4dcdaed35d
APrigarina [Wed, 30 Jun 2021 09:50:21 +0000 (12:50 +0300)]
fix samples 3.4
Anatoliy Talamanov [Wed, 30 Jun 2021 09:04:09 +0000 (12:04 +0300)]
Merge pull request #20271 from TolyaTalamanov:at/extend-python-bindings
G-API: Extend python bindings
* Extend G-API bindings
* Wrap timestamp, seqNo, seq_id
* Wrap copy
* Wrap parseSSD, parseYolo
* Rewrap cv.gapi.networks
* Add test for metabackend in pytnon
* Remove int64 pyopencv_to
Alexander Alekhin [Tue, 29 Jun 2021 09:00:10 +0000 (09:00 +0000)]
core(persistence): fix types format handling
partial backport of
4eac198270783d8924ed26ecfb82f8aa54d9e67d
Alexander Alekhin [Tue, 29 Jun 2021 21:13:19 +0000 (21:13 +0000)]
Merge pull request #20321 from alalek:issue_20279
Alexander Alekhin [Tue, 29 Jun 2021 18:48:21 +0000 (18:48 +0000)]
dnn: use OpenVINO 2021.4 defines
Alexander Alekhin [Tue, 29 Jun 2021 09:00:10 +0000 (09:00 +0000)]
core(persistence): fix types format handling, fix 16F support
Alexander Alekhin [Mon, 28 Jun 2021 20:54:44 +0000 (20:54 +0000)]
Merge pull request #20302 from rogday:tf_import_diag
Alexander Alekhin [Mon, 28 Jun 2021 20:52:32 +0000 (20:52 +0000)]
Merge pull request #20318 from komakai:better-unsigned-type-support
Giles Payne [Sun, 27 Jun 2021 12:08:25 +0000 (21:08 +0900)]
Improvements/fixes for unsigned type handling in Swift/Kotlin
xzvno [Sat, 26 Jun 2021 21:01:31 +0000 (05:01 +0800)]
Merge pull request #20293 from endjkv:fix-mem-leak-when-throw
* fix memory leak when exception is thrown
Alexey Smirnov [Fri, 25 Jun 2021 21:09:33 +0000 (00:09 +0300)]
Merge pull request #20156 from smirnov-alexey:as/gapi_remote_infer
G-API: Support remote inference
* Extend MediaFrame to be able to extract additional info besides access
* Add API for remote inference
* Add default implementation for blobParams()
* Add default implementation for blobParams()
* Address review comments
* Fix any_cast usage
* Add comment on the default blobParams()
* Address review comments
* Add missing rctx
* Minor fix
* Fix indentation and comment
* Address review comments
* Add documentation
Smirnov Egor [Mon, 21 Jun 2021 08:11:14 +0000 (11:11 +0300)]
skipping missing layers and layer failures
Alexander Alekhin [Thu, 24 Jun 2021 09:51:36 +0000 (09:51 +0000)]
Merge pull request #20304 from vrabaud:master
Vincent Rabaud [Wed, 23 Jun 2021 19:27:54 +0000 (21:27 +0200)]
Do not use = 0 for a cv::Mat.
There are several operator= overloads and some compilers can be confused.
Alexander Alekhin [Wed, 23 Jun 2021 18:15:14 +0000 (18:15 +0000)]
Merge pull request #20295 from diablodale:umat_factory_usageflags
Dale Phurrough [Tue, 22 Jun 2021 03:32:54 +0000 (05:32 +0200)]
add usageFlags to UMat static factories
- add abi compatible overloads
- add test case
Alexander Alekhin [Tue, 22 Jun 2021 22:58:51 +0000 (22:58 +0000)]
Merge pull request #20204 from Developer-Ecosystem-Engineering:improve-sift
Alexander Alekhin [Mon, 21 Jun 2021 21:52:17 +0000 (21:52 +0000)]
Merge pull request #20128 from kikaxa:master
Alexander Alekhin [Mon, 21 Jun 2021 11:27:12 +0000 (11:27 +0000)]
Merge pull request #20283 from SamFC10:fix-batchnorm
kikaxa [Thu, 20 May 2021 13:01:36 +0000 (16:01 +0300)]
Reenable filesystem for ios builds
Alexander Alekhin [Sun, 20 Jun 2021 16:27:47 +0000 (16:27 +0000)]
Merge pull request #20259 from IanMaquignaz:inverseRectification_newUnitTest
Alexander Alekhin [Sun, 20 Jun 2021 16:25:20 +0000 (16:25 +0000)]
Merge pull request #20281 from alalek:highgui_win32ui_plugin
SamFC10 [Sun, 20 Jun 2021 07:49:29 +0000 (13:19 +0530)]
Fix BatchNorm reinitialization
Alexander Alekhin [Sat, 19 Jun 2021 18:36:27 +0000 (18:36 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 19 Jun 2021 09:16:23 +0000 (09:16 +0000)]
highgui: win32ui plugin
Alexander Alekhin [Fri, 18 Jun 2021 19:47:52 +0000 (19:47 +0000)]
Merge pull request #20232 from gasparitiago:drawMatches3.4
Anatoliy Talamanov [Fri, 18 Jun 2021 17:16:07 +0000 (20:16 +0300)]
Merge pull request #20196 from TolyaTalamanov:at/support-vaargs-compile-args
G-API: Support vaargs for cv.compile_args
* Support cv.compile_args to work with variadic number of inputs
* Disable python2.x G-API
* Move compile_args to gapi pkg
Alexander Alekhin [Fri, 18 Jun 2021 15:46:43 +0000 (15:46 +0000)]
Merge pull request #20253 from rogday:gtk_modifiers
Zhang Yin [Thu, 10 Jun 2021 08:08:20 +0000 (08:08 +0000)]
Update RISC-V back-end to RVV 0.10
Developer-Ecosystem-Engineering [Thu, 17 Jun 2021 17:14:48 +0000 (10:14 -0700)]
Improve SIFT for arm64/Apple silicon
- Reduce branch density by collapsing compares.
- Fix windows build errors
- Use OpenCV universal intrinsics
- Use v_check_any and v_signmask as requested
Ian Maquignaz [Fri, 11 Jun 2021 00:13:06 +0000 (20:13 -0400)]
Added new unit test for initInverseRectificationMap()
Function is validated. Included an update to DISABLED_Calib3d_InitInverseRectificationMap.
Includes updates per input from @alalek and unit test regression # to reflect PR #
Alexander Alekhin [Thu, 17 Jun 2021 11:01:37 +0000 (11:01 +0000)]
Merge pull request #20272 from rogday:pollKey_link
Alexander Alekhin [Wed, 16 Jun 2021 15:06:04 +0000 (15:06 +0000)]
Merge pull request #20238 from dmatveev:dm/gframe_docs
Smirnov Egor [Wed, 16 Jun 2021 08:36:13 +0000 (11:36 +0300)]
reorder defined checks according to cmake file
Dmitry Matveev [Mon, 31 May 2021 19:02:05 +0000 (22:02 +0300)]
G-API: Documentation updates
1) Document GFrame/MediaFrame (and also other G-API types)
- Added doxygen comments for GMat, GScalar, GArray<T>, GOpaque classes;
- Documented GFrame and its host-side counterpart MediaFrame;
- Added some more notes to the data type classes.
2) Give @brief descriptions to most of the cv::gapi::* namespaces
3) Make some symbols private
- These structures are mainly internal and shouldn't be used directly
Maxim Pashchenkov [Tue, 15 Jun 2021 19:02:17 +0000 (22:02 +0300)]
Merge pull request #19341 from mpashchenkov:mp/ocv-gapi-parsessd-fix
G-API: Removing ParseSSD overload.
* Removed specialization.
* Removed united
Alexander Alekhin [Tue, 15 Jun 2021 18:20:21 +0000 (18:20 +0000)]
Merge pull request #20263 from vrabaud:3.4
Vincent Rabaud [Fri, 11 Jun 2021 20:03:33 +0000 (22:03 +0200)]
Fix potential NaN in cv::norm.
There can be an int overflow.
cv::norm( InputArray _src, int normType, InputArray _mask ) is fine,
not cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _mask ).