Alexander Alekhin [Sat, 19 Sep 2020 17:03:08 +0000 (17:03 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 19 Sep 2020 16:53:34 +0000 (16:53 +0000)]
Merge pull request #18363 from alalek:issue_18349
Alexander Alekhin [Sat, 19 Sep 2020 16:53:15 +0000 (16:53 +0000)]
Merge pull request #18362 from alalek:ocl_async_kernel_reschedule_bug
Alexander Alekhin [Fri, 18 Sep 2020 15:20:45 +0000 (15:20 +0000)]
core: emit more clear messages in OutputArray::create()
Alexander Alekhin [Fri, 18 Sep 2020 03:45:27 +0000 (06:45 +0300)]
ocl: avoid rescheduling of async kernels
Orest Chura [Fri, 18 Sep 2020 14:24:34 +0000 (17:24 +0300)]
Merge pull request #18261 from OrestChura:oc/fluid_convert_mask
[G-API]: Fluid: add mask, extend convertTo for CV_16S
* Add Fluid `mask` kernel + Acc. and Perf. tests
- simple cycle implementation with restrictions on mask type and input/output type like in OCV/GPU kernels (mask - CV_8UC1 only, input/output - CV_8UC1, CV_16UC1, CV_16SC1)
* Added convertions from/to 16S
* `convertTo()` perf tests refactoring
- add testing of `alpha` and `beta` parameters
- fixed unreliable comparison
- added instances to OCV, Fluid and GPU tests according to the changes
* Addressing comments
- fixed multiple-channel mistake - prohibited multiple-channeling
* Reduced perf tests
Orest Chura [Fri, 18 Sep 2020 13:44:47 +0000 (16:44 +0300)]
Merge pull request #18257 from OrestChura:oc/fluid_operator_bitwise_and_scalar
[G-API]: Add Fluid bitwise operations implementation for (GMat, GScalar)
* Added Fluid `bitwise` with `Scalar` + acc.tests
- simple loop implementation for Fluid used (no `hal`);
- `Scalar` is casted to `int` in the beginning
- tests just modified to work with `Scalar`
- expected output in operators' tests fixed (operators can't change Mat's depth)
- `float` `Scalar` `RNG` added, `RNG` reworked (`time` is used now), initialization of test fixtures reworked
- if input or output is `float` Scalar is initialized by `float`
- some problems with Fluid/OCV floating-point comparison difference stashed by `AbsSimilarPoints()` usage, FIXME added
- divide-by-zero is now fixed differently and everywhere
* - Added perf_tests for bitwise_Scalar operations
- due to errors of Fluid floating-point comparison operations, added support of different validation in Cmp perf_tests; added FIXME
- reworked integral initialization of Scalar
* Addressing comments
- NULL -> nullptr
- Scalar convertion moved to the function
- avoid -> avoiding
* Addressing comments
* CV_assert -> GAPI_assert
* Addressed DM comments
- refactored convertScalarForBitwise()
- removed unnecessary braces for switch
* Changed the operators tests
- switch via `enum` implemented
- infrastructure for that refactored
Alexander Alekhin [Fri, 18 Sep 2020 13:38:37 +0000 (16:38 +0300)]
Merge pull request #18343 from TolyaTalamanov:at/support-return-tuple
[G-API] Support std::tuple for return type
Maxim Pashchenkov [Fri, 18 Sep 2020 13:31:16 +0000 (16:31 +0300)]
Merge pull request #18287 from mpashchenkov:mp/ocv-gapi-blue-branch
[G-API]: Add four kernels to parse NN outputs & provide information in Streaming scenarios
* Kernels from GL "blue" branch, acc and perf tests
* Code cleanup
* Output fix
* Comment fix
* Added new file for parsers, stylistic corrections
* Added end line
* Namespace fix
* Code cleanup
* nnparsers.hpp moved to gapi/infer/, nnparsers -> parsers
* Removed cv:: from parsers.hpp
Alexander Alekhin [Fri, 18 Sep 2020 13:10:36 +0000 (13:10 +0000)]
Merge pull request #18360 from tomoaki0705:fixClampFailure
Alexander Alekhin [Fri, 18 Sep 2020 13:10:10 +0000 (13:10 +0000)]
Merge pull request #18354 from takehirokj:fix_typo_in_doc
Maxim Pashchenkov [Fri, 18 Sep 2020 13:06:23 +0000 (16:06 +0300)]
Merge pull request #18196 from mpashchenkov:mp/garray-initialization
[G-API]: Add GArray initialization support
* Added GArray initialization (CONST_VALUE, GScalar analog) and test for this
* Whitespaces
* And one more space
* Trailing whitespace
* Test name changed. Build with magic commands.
* GArray works with rvalue initialization
* Code cleanup
* Ternary operator in the initialization list.
Liubov Batanina [Fri, 18 Sep 2020 13:01:14 +0000 (16:01 +0300)]
Merge pull request #18353 from l-bat:issue_18350
* Fixed bug in ONNX Mul op
* Replaced node
Tomoaki Teshima [Fri, 18 Sep 2020 12:04:24 +0000 (21:04 +0900)]
add explicit cast for half
Takehiro Kajihara [Thu, 17 Sep 2020 12:51:50 +0000 (21:51 +0900)]
Fix typo in videoio doc
Anatoliy Talamanov [Thu, 17 Sep 2020 19:00:03 +0000 (22:00 +0300)]
Merge pull request #18332 from TolyaTalamanov:at/wrap-GIn-GOut
[G-API] Wrap GIn & GOut
* Wrap GIn & GOut into python
* Remove extra brackets
* Use reinterpret_cast
Alexander Alekhin [Thu, 17 Sep 2020 13:56:17 +0000 (13:56 +0000)]
Merge pull request #18348 from tomoaki0705:fixNppFlipInplace
Ruslan Garnov [Thu, 17 Sep 2020 12:39:10 +0000 (15:39 +0300)]
Merge pull request #18213 from rgarnov:rg/rmat_api
Basic RMat implementation
* Added basic RMat implementation
* Fix typos in basic RMat implementation
Co-authored-by: Anton Potapov <anton.potapov@intel.com>
Sergei Slashchinin [Thu, 17 Sep 2020 11:05:22 +0000 (14:05 +0300)]
Merge pull request #18316 from sl-sergei:fix_18253
Fix loading of ONNX models with Resize operation with Opset 11 for newer versions of Pytorch
* Add reproducer for Resize operation from newer versions of Pytorch
* Fix loading of scales parameter for Resize layer
* Change check type for better diagnostic messages
Anatoliy Talamanov [Wed, 16 Sep 2020 14:59:19 +0000 (17:59 +0300)]
Change imports order for copytomask
Maksim Shabunin [Wed, 16 Sep 2020 21:00:05 +0000 (21:00 +0000)]
Merge pull request #18331 from or-toledano:3.4
Anatoliy Talamanov [Tue, 15 Sep 2020 11:49:35 +0000 (14:49 +0300)]
Support tuple for python bindings
Tomoaki Teshima [Wed, 16 Sep 2020 06:45:03 +0000 (15:45 +0900)]
use only even number for inplace flip
Alexander Alekhin [Tue, 15 Sep 2020 19:38:02 +0000 (19:38 +0000)]
Merge pull request #18294 from mshabunin:install-bin-samples
Alexander Alekhin [Mon, 14 Sep 2020 20:15:38 +0000 (20:15 +0000)]
Merge pull request #18314 from gilsho:components
Alexander Alekhin [Mon, 14 Sep 2020 18:17:58 +0000 (18:17 +0000)]
Merge pull request #18325 from alalek:issue_18166
or-toledano [Mon, 14 Sep 2020 11:23:38 +0000 (14:23 +0300)]
Fix np row,column to cv y,x
This explanation was created to avoid confusion, but it seems like the author was confused :D
Alexander Alekhin [Sun, 13 Sep 2020 13:30:56 +0000 (13:30 +0000)]
Merge pull request #18320 from choffmann:master
Alexander Alekhin [Sun, 13 Sep 2020 12:51:41 +0000 (12:51 +0000)]
Merge pull request #18317 from sl-sergei:restored_pr_17629
Gil Shotan [Thu, 10 Sep 2020 23:47:53 +0000 (02:47 +0300)]
Fix signed integer overflow in connected components
Alexander Alekhin [Sun, 13 Sep 2020 11:14:56 +0000 (11:14 +0000)]
imgcodecs: lazy on-demand codecs initialization
Alexander Alekhin [Sat, 12 Sep 2020 22:03:12 +0000 (22:03 +0000)]
Merge pull request #18310 from ShadyD45:patch-1
Anatoliy Talamanov [Sat, 12 Sep 2020 22:02:21 +0000 (01:02 +0300)]
Merge pull request #18309 from TolyaTalamanov:at/wrap-apply-overloads
[G-API] Wrap cv::gapi::mean kernel into python
* Wrap cv::gapi::mean kernel into python
* Fix test
Alexander Alekhin [Sat, 12 Sep 2020 22:01:09 +0000 (22:01 +0000)]
Merge pull request #18299 from l-bat:onnx_reduce_max
Christoph Gringmuth [Sat, 12 Sep 2020 20:28:11 +0000 (22:28 +0200)]
Fix implicitly-deleted default constructor
Shubham Singh [Tue, 23 Jun 2020 09:06:32 +0000 (14:36 +0530)]
fixes #17187 probably
Added Eltwise Layer Support
Shubham Dhumal [Thu, 10 Sep 2020 12:28:34 +0000 (17:58 +0530)]
Typo fix: CV.rabCutClasses to CV.grabCutClasses
Liubov Batanina [Wed, 9 Sep 2020 07:40:02 +0000 (10:40 +0300)]
Support global reduce ops
Maksim Shabunin [Tue, 8 Sep 2020 17:22:26 +0000 (20:22 +0300)]
Install: added prebuilt samples installation
Alexander Alekhin [Tue, 8 Sep 2020 11:30:10 +0000 (11:30 +0000)]
Merge pull request #18290 from alalek:update_ffmpeg_4.x
Alexander Alekhin [Tue, 8 Sep 2020 11:26:48 +0000 (11:26 +0000)]
Merge pull request #18284 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Tue, 8 Sep 2020 10:18:37 +0000 (10:18 +0000)]
ffmpeg/4.x: update FFmpeg wrapper
- FFmpeg 4.3.1
Alexander Alekhin [Tue, 8 Sep 2020 09:07:23 +0000 (09:07 +0000)]
Merge pull request #18288 from alalek:update_version_4.5.0-pre
Alexander Alekhin [Tue, 8 Sep 2020 06:08:58 +0000 (06:08 +0000)]
pre: OpenCV 4.5.0 (version++)
Alexander Alekhin [Tue, 8 Sep 2020 06:03:23 +0000 (06:03 +0000)]
Merge pull request #18286 from extrowerk:patch-1
extrowerk [Mon, 7 Sep 2020 19:07:38 +0000 (21:07 +0200)]
Haiku: build fix
Haiku is POSIX compatible
Alexander Alekhin [Mon, 7 Sep 2020 17:21:55 +0000 (17:21 +0000)]
ffmpeg/3.4: update FFmpeg wrapper
- FFmpeg 3.4.8
Alexander Alekhin [Mon, 7 Sep 2020 17:11:46 +0000 (17:11 +0000)]
Merge pull request #18281 from dtrodrigues:issue-template-typo
Alexander Alekhin [Mon, 7 Sep 2020 17:11:09 +0000 (17:11 +0000)]
Merge pull request #18280 from dtrodrigues:vtk-9
Alexey Smirnov [Mon, 7 Sep 2020 17:10:03 +0000 (20:10 +0300)]
Merge pull request #18127 from smirnov-alexey:as/gapi_serialization
[G-API]: Add GOpaque and GArray serialization support
* Add GOpaque and GArray serialization support
* Address review comments
* Remove holds() method
* Address review comments
* Remove comments
* Align streaming with kind changes
* Fix kind in kernel
* Address review comments
Alexander Alekhin [Mon, 7 Sep 2020 16:57:21 +0000 (16:57 +0000)]
Merge pull request #18282 from alalek:update_version_3.4.12-pre
Alexander Alekhin [Sun, 6 Sep 2020 22:26:32 +0000 (22:26 +0000)]
pre: OpenCV 3.4.12 (version++)
Dustin Rodrigues [Sun, 6 Sep 2020 20:53:25 +0000 (16:53 -0400)]
ISSUE_TEMPLATE: fix typo
Alexander Alekhin [Sun, 6 Sep 2020 20:12:15 +0000 (20:12 +0000)]
Merge pull request #18270 from komakai:swift-inout-arrays
Dustin Rodrigues [Sun, 6 Sep 2020 19:47:43 +0000 (15:47 -0400)]
don't use VTK_USE_FILE for VTK >= 8.90
Alexander Alekhin [Sat, 5 Sep 2020 18:53:51 +0000 (18:53 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Danny [Sat, 5 Sep 2020 18:52:10 +0000 (14:52 -0400)]
Merge pull request #18126 from danielenricocahall:add-oob-error-sample-weighting
Account for sample weights in calculating OOB Error
* account for sample weights in oob error calculation
* redefine oob error functions
* fix ABI compatibility
Alexander Alekhin [Fri, 4 Sep 2020 17:02:08 +0000 (17:02 +0000)]
Merge pull request #18265 from alalek:fixup_17489
Danny [Fri, 4 Sep 2020 17:01:05 +0000 (13:01 -0400)]
Merge pull request #18061 from danielenricocahall:fix-kd-tree
Fix KD Tree kNN Implementation
* Make KDTree mode in kNN functional
remove docs and revert change
Make KDTree mode in kNN functional
spacing
Make KDTree mode in kNN functional
fix window compilations warnings
Make KDTree mode in kNN functional
fix window compilations warnings
Make KDTree mode in kNN functional
casting
Make KDTree mode in kNN functional
formatting
Make KDTree mode in kNN functional
* test coding style
Alexander Alekhin [Fri, 4 Sep 2020 15:35:10 +0000 (15:35 +0000)]
videoio: repair build of FFmpeg windows wrapper
Alexander Alekhin [Thu, 3 Sep 2020 21:25:38 +0000 (21:25 +0000)]
Merge pull request #18260 from alalek:static_code_fixes_2
Alexander Alekhin [Thu, 3 Sep 2020 21:25:20 +0000 (21:25 +0000)]
Merge pull request #18258 from alalek:opencl_multiple_execution_contexts_fixup
Alexander Alekhin [Thu, 3 Sep 2020 07:41:03 +0000 (07:41 +0000)]
ocl: fixes for OpenCL multiple contexts support
Alexander Alekhin [Thu, 3 Sep 2020 18:01:38 +0000 (18:01 +0000)]
checks and fixes from static code analyzers results (2)
Giles Payne [Thu, 3 Sep 2020 12:31:11 +0000 (21:31 +0900)]
Swift native in/out array handling
Alexander Alekhin [Wed, 2 Sep 2020 22:50:21 +0000 (22:50 +0000)]
Merge pull request #18255 from alalek:backport_18243
Alexander Alekhin [Wed, 2 Sep 2020 22:50:00 +0000 (22:50 +0000)]
Merge pull request #18243 from alalek:static_code_fixes
Alexander Alekhin [Wed, 2 Sep 2020 22:49:13 +0000 (22:49 +0000)]
Merge pull request #18186 from alalek:opencl_multiple_execution_contexts
Alexander Alekhin [Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)]
Merge pull request #18194 from VadimLevin:dev/vlevin/openjpeg-source-intergration
Alexander Alekhin [Wed, 2 Sep 2020 21:15:19 +0000 (21:15 +0000)]
Merge pull request #18246 from YashasSamaga:dnn-permute-fix-unwanted-ocl-init
Vadim Levin [Tue, 25 Aug 2020 10:11:08 +0000 (13:11 +0300)]
3rdparty: integrate OpenJPEG build to the OpenCV CMake
- adopted build scripts
- OpenJPEG build warnings are suppressed
Vadim Levin [Tue, 25 Aug 2020 10:06:09 +0000 (13:06 +0300)]
3rdparty: add OpenJPEG library source code (tag v2.3.1)
- https://github.com/uclouvain/openjpeg/releases/tag/v2.3.1
- src/lib/openjp2
- readme files
Alexander Alekhin [Wed, 2 Sep 2020 19:31:22 +0000 (19:31 +0000)]
Merge pull request #18234 from l-bat:onnx_reshape
Orest Chura [Wed, 2 Sep 2020 19:28:10 +0000 (22:28 +0300)]
Merge pull request #18182 from OrestChura:oc/operators_to_cv
[G-API]: Relocation of operators' overloads
* Relocates overloaded operators for `cv::GMat` and `cv::GScalar` to `cv::` namespace
- adds test to check usage of operators compilation
* Add tests for all the operators
* Address comments
Alexander Alekhin [Tue, 1 Sep 2020 22:18:20 +0000 (22:18 +0000)]
backport: checks and fixes from static code analyzers results
original commit:
71f665bd8c3e39d6769aca1896237f836930f136
Alexander Alekhin [Tue, 1 Sep 2020 22:18:20 +0000 (22:18 +0000)]
checks and fixes from static code analyzers results
Liubov Batanina [Mon, 31 Aug 2020 09:52:55 +0000 (12:52 +0300)]
Support Reshape with zero dim
YashasSamaga [Wed, 2 Sep 2020 08:55:36 +0000 (14:25 +0530)]
fix typo in fusion tests
YashasSamaga [Wed, 2 Sep 2020 06:48:41 +0000 (12:18 +0530)]
do not allocate UMat in non-OpenCL targets
Alexander Alekhin [Tue, 11 Aug 2020 18:13:52 +0000 (18:13 +0000)]
core(OpenCL): thread-local OpenCL execution context
Alexander Alekhin [Tue, 1 Sep 2020 20:59:00 +0000 (20:59 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 1 Sep 2020 20:49:59 +0000 (20:49 +0000)]
Merge pull request #18225 from dmici:fix_missing_0.5_factor_in_anisotropic_segmentation_tutorial
pemmanuelviel [Tue, 1 Sep 2020 20:38:21 +0000 (22:38 +0200)]
Merge pull request #18211 from pemmanuelviel:pev--handle-dna-vectors
* DNA-mode: update miniflann to handle DNA
* DNA-mode: update hierarchical kmeans to handle DNA sequences
Yosshi999 [Tue, 1 Sep 2020 10:28:25 +0000 (19:28 +0900)]
Merge pull request #18167 from Yosshi999:bit-exact-gaussian
Bit exact gaussian blur for 16bit unsigned int
* bit-exact gaussian kernel for CV_16U
* SIMD optimization
* template GaussianBlurFixedPoint
* remove template specialization
* simd support for h3N121 uint16
* test for u16 gaussian blur
* remove unnecessary comments
* fix return type of raw()
* add typedef of native internal type in fixedpoint
* update return type of raw()
Alexander Alekhin [Mon, 31 Aug 2020 20:37:41 +0000 (20:37 +0000)]
Merge pull request #18235 from alalek:ocl_off_cleanup
Alexander Alekhin [Mon, 31 Aug 2020 09:30:06 +0000 (09:30 +0000)]
ocl: cleanup dead code in case of disabled OpenCL
dmici [Sun, 30 Aug 2020 08:17:50 +0000 (10:17 +0200)]
fix missing 0.5 factor in anisotropic segmentation tutorial
Giles Payne [Sat, 29 Aug 2020 22:41:54 +0000 (07:41 +0900)]
Merge pull request #18094 from komakai:macos-universal-binary
* Universal Build for Big Sur
* Refactor MacOS/iOS build to only ever build one architecture at a time + improve code readability
* Workaround for CMake issue 20989
Alexander Alekhin [Fri, 28 Aug 2020 18:29:44 +0000 (18:29 +0000)]
Merge pull request #18210 from VadimLevin:dev/vlevin/openjpeg-reduce-filesize
Yosshi999 [Fri, 28 Aug 2020 18:20:05 +0000 (03:20 +0900)]
Merge pull request #18053 from Yosshi999:bit-exact-resizeNN
Bit-exact Nearest Neighbor Resizing
* bit exact resizeNN
* change the value of method enum
* add bitexact-nn to ResizeExactTest
* test to compare with non-exact version
* add perf for bit-exact resizenn
* use cvFloor-equivalent
* 1/3 scaling is not stable for floating calculation
* stricter test
* bugfix: broken data in case of 6 or 12bytes elements
* bugfix: broken data in default pix_size
* stricter threshold
* use raw() for floor
* use double instead of int
* follow code reviews
* fewer cases in perf test
* center pixel convention
Alexander Alekhin [Thu, 27 Aug 2020 17:15:42 +0000 (17:15 +0000)]
Merge pull request #18208 from mshabunin:lower-ffmpeg-version
Alexander Alekhin [Thu, 27 Aug 2020 17:14:32 +0000 (17:14 +0000)]
Merge pull request #18203 from catree:feat_robot_world_hand_eye_calib
Alexander Alekhin [Thu, 27 Aug 2020 17:10:23 +0000 (17:10 +0000)]
Merge pull request #18207 from pemmanuelviel:pev--fix-memset
Vadim Levin [Thu, 27 Aug 2020 12:11:45 +0000 (15:11 +0300)]
feat: change OpenJPEG encoder to lossy with default parameters
Maksim Shabunin [Thu, 27 Aug 2020 10:25:04 +0000 (13:25 +0300)]
videoio: reduce min libavcodec version
Pierre-Emmanuel Viel [Thu, 27 Aug 2020 10:21:02 +0000 (12:21 +0200)]
bugfix
catree [Thu, 27 Aug 2020 05:24:07 +0000 (07:24 +0200)]
Add Robot-World/Hand-Eye calibration function.
Alessandro de Oliveira Faria (A.K.A.CABELO) [Wed, 26 Aug 2020 22:30:12 +0000 (19:30 -0300)]
Merge pull request #18184 from cabelo:yolov4-in-model
ADD yolov4 in models.yml
Alexander Alekhin [Wed, 26 Aug 2020 15:51:25 +0000 (15:51 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 26 Aug 2020 12:11:43 +0000 (12:11 +0000)]
Merge pull request #18136 from nglee:dev_cudaEqualizeHistBitExact