Alexander Alekhin [Mon, 17 Aug 2020 10:29:12 +0000 (10:29 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Yosshi999 [Mon, 17 Aug 2020 10:28:44 +0000 (19:28 +0900)]
Merge pull request #18001 from Yosshi999:sift-8bit-descr
* 8-bit SIFT descriptors
* use clearer parameter
* update docs
* propagate type info
* overload function for avoiding ABI-break
* bugfix: some values are undefined when CV_SIMD is absent
Alexander Alekhin [Mon, 17 Aug 2020 08:52:01 +0000 (08:52 +0000)]
Merge pull request #18105 from alalek:highgui_gtk_dont_terminate
Alexander Alekhin [Sat, 15 Aug 2020 22:17:33 +0000 (22:17 +0000)]
highgui: don't terminate if we can't initialize GTK backend
- allow Users to handle such case
- exception will be thrown instead
Maksym Ivashechkin [Fri, 14 Aug 2020 22:42:26 +0000 (00:42 +0200)]
Merge pull request #17683 from ivashmak:homography
[GSoC] New RANSAC. Homography part
* change enum and squash commits
* add small improvements
* change function to static, update magsac
* remove path from samples, remove license, small updates
* update pnp solver, small improvements
* fix warnings
* add tutorial, comments
* fix markdown warnings
* fix markdown warnings
* fix markdown warnings
Alexander Alekhin [Fri, 14 Aug 2020 17:23:24 +0000 (17:23 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
nhlsm [Fri, 14 Aug 2020 17:21:23 +0000 (02:21 +0900)]
Merge pull request #18080 from nhlsm:improve-mat-operator-assign-scalar
* improve Mat::operator=(Scalar)
* touch
* remove trailing whitespace
* TEST: check if old code pass test or not
* remove CV_Error
* remove warning
* fix: is -> Scalar
* 1) Mat *mat -> Mat &mat 2) return bool, add output param
* add comment
Alexander Alekhin [Fri, 14 Aug 2020 17:10:36 +0000 (17:10 +0000)]
Merge pull request #18092 from alalek:ocl_fix_image_format
Liubov Batanina [Fri, 14 Aug 2020 16:49:42 +0000 (19:49 +0300)]
Merge pull request #18096 from l-bat:update_onnx_importer
* Added ReduceSum to ONNX importer
* Fix comments
* Fix Mul
Alexander Alekhin [Fri, 14 Aug 2020 13:46:46 +0000 (13:46 +0000)]
Merge pull request #18078 from l-bat:fix_matmul
Liubov Batanina [Wed, 12 Aug 2020 12:03:46 +0000 (15:03 +0300)]
Fix MatMul and Add axes
Alexander Alekhin [Thu, 13 Aug 2020 18:33:18 +0000 (18:33 +0000)]
core(ocl): fix ocl::Image2d::isFormatSupported()
in case of OPENCV_OPENCL_DEVICE=disabled
Yashas Samaga B L [Thu, 13 Aug 2020 10:55:41 +0000 (16:25 +0530)]
Merge pull request #17976 from YashasSamaga:dnn-fusion-tests-fix-ocl
dnn: add exhaustive fusion tests, enable more eltwise fusions
* add eltwise fusion tests, enable more eltwise fusions
* merge weighted eltwise tests with eltwise tests
Liubov Batanina [Wed, 12 Aug 2020 14:32:16 +0000 (17:32 +0300)]
Merge pull request #18077 from l-bat:reduce_sum
* Supported ReduceSum op
* Skip test
Alexander Alekhin [Wed, 12 Aug 2020 13:18:20 +0000 (13:18 +0000)]
Merge pull request #18074 from pemmanuelviel:pev--kmeans-refactoring
Pierre-Emmanuel Viel [Fri, 26 Jun 2020 21:08:04 +0000 (23:08 +0200)]
Refactoring to prepare for other vector types while mutualizing some methods
Elizarov Ilya [Tue, 11 Aug 2020 08:46:47 +0000 (11:46 +0300)]
Merge pull request #18033 from ieliz:dasiamrpn
Improving DaSiamRPN tracker sample
* changed layerBlobs in dnn.cpp and added DaSiamRPN tracker
* Improving DaSiamRPN tracker sample
* Docs fix
* Removed outdated changes
* Trying to reinitialize tracker without reloading models. Worked with LaSOT-based benchmark with reinit rate=250 frames
* Trying to reverse changes
* Moving the model in the constructor
* Fixing some issues with names
* Variable name changed
* Reverse parser arguments changes
Alexander Alekhin [Mon, 10 Aug 2020 20:28:41 +0000 (20:28 +0000)]
Merge pull request #18059 from komakai:improve-swift-docs
Alexander Alekhin [Mon, 10 Aug 2020 20:26:50 +0000 (20:26 +0000)]
Merge pull request #18060 from YashasSamaga:cuda4dnn-fix-detection-output-cterr
Alexander Alekhin [Mon, 10 Aug 2020 20:25:49 +0000 (20:25 +0000)]
Merge pull request #18062 from pemmanuelviel:pev-multiple-kmeans-trees
Alexander Alekhin [Mon, 10 Aug 2020 20:24:54 +0000 (20:24 +0000)]
Merge pull request #18065 from komakai:fix-converter
Alexander Alekhin [Mon, 10 Aug 2020 17:36:58 +0000 (17:36 +0000)]
Merge pull request #18031 from ilyachur:feature/ichuraev/remove_goe
pemmanuelviel [Mon, 10 Aug 2020 13:26:40 +0000 (15:26 +0200)]
Merge pull request #17643 from pemmanuelviel:pev--new-flann-demo
* Add a FLANN example showing how to search a query image in a dataset
* Clean: remove warning
* Replace dependency to boost::filesystem by calls to core/utils/filesystem
* Wait for escape key to exit
* Add an example of binary descriptors support
* Add program options for saving and loading the flann structure
* Fix warnings on Win64
* Fix warnings on 3.4 branch still relying on C++03
* Add ctor to img_info structure
* Comments modification
* * Demo file of FLANN moved and renamed
* Fix distances type when using binary vectors in the FLANN example
* Rename FLANN example file
* Remove dependency of the flann example to opencv_contrib's SURF.
* Remove mention of FLANN and other descriptors that aimed at giving hint on the other options
* Cleaner program options management
* Make waitKey usage minimal in FLANN example
* Fix the conditions order
* Use cv::Ptr
Giles Payne [Mon, 10 Aug 2020 11:32:42 +0000 (20:32 +0900)]
Fix Objective-C declaration of Mat_to_vector_Point2d
Alexander Alekhin [Sun, 9 Aug 2020 20:21:17 +0000 (20:21 +0000)]
Merge pull request #17982 from nglee:dev_cudaGpuMatConvertToInplaceFix
Pierre-Emmanuel Viel [Sun, 9 Aug 2020 19:56:21 +0000 (21:56 +0200)]
Merge the two KMeansIndexParams ctor on master
YashasSamaga [Sun, 9 Aug 2020 09:13:20 +0000 (14:43 +0530)]
fix compile-time errors, disable unsupported tests
Giles Payne [Sun, 9 Aug 2020 07:39:24 +0000 (16:39 +0900)]
Obj-C/Swift docs improvements
Alexander Alekhin [Fri, 7 Aug 2020 10:34:22 +0000 (10:34 +0000)]
Merge pull request #18039 from peters:master
Peter Rekdal Sunde [Thu, 6 Aug 2020 21:43:47 +0000 (23:43 +0200)]
Add support for using new ffmpeg encoding API when writing a video.
Alexander Alekhin [Thu, 6 Aug 2020 20:21:47 +0000 (20:21 +0000)]
Merge pull request #18048 from l-bat:onnx_torchvision
Alexander Alekhin [Thu, 6 Aug 2020 14:15:52 +0000 (14:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Liubov Batanina [Thu, 6 Aug 2020 12:47:34 +0000 (15:47 +0300)]
Fix bug in ONNX Gather op
Alexander Alekhin [Thu, 6 Aug 2020 05:34:04 +0000 (08:34 +0300)]
Merge pull request #18043 from opencv:garybradski-patch-1
Gary Bradski [Thu, 6 Aug 2020 00:00:56 +0000 (17:00 -0700)]
Update README.md
I think there should be something under ### Resources for example:
* Additional OpenCV functionality: <https://github.com/opencv/opencv_contrib>
Alexander Alekhin [Tue, 4 Aug 2020 20:16:22 +0000 (20:16 +0000)]
Merge pull request #18036 from alalek:backport_17858
Vadim Pisarevsky [Sat, 1 Aug 2020 12:05:05 +0000 (15:05 +0300)]
* added depth-wise convolution; gives ~20-30% performance improvement in MobileSSD networks
* hopefully, eliminated compile warnings, errors, as well as failure in one test
* * fixed a few typos
* decreased buffer size in some cases
* added more optimal im2row branch in the case of 1x1 convolutions
* tuned fastConv to reduce the number of passes over arrays
backport of commit
77b01deb805b7166e938bbd17d393f051aad88c1
Alexander Alekhin [Tue, 4 Aug 2020 16:24:11 +0000 (16:24 +0000)]
Merge pull request #18027 from dkurt:dnn_backport_ngraph
Alexander Alekhin [Tue, 4 Aug 2020 16:17:07 +0000 (16:17 +0000)]
Merge pull request #18017 from danielenricocahall:add-relu-to-darknet
Alexander Alekhin [Tue, 4 Aug 2020 16:15:53 +0000 (16:15 +0000)]
Merge pull request #18008 from gsmatos:document-patchnans
Alexander Alekhin [Tue, 4 Aug 2020 09:45:32 +0000 (09:45 +0000)]
Merge pull request #17922 from joy2myself:build_riscv_with_c++_intrin
Ilya Churaev [Tue, 4 Aug 2020 05:18:38 +0000 (08:18 +0300)]
Removed get_output_as_single_output_node method
Gabriel [Sat, 1 Aug 2020 23:00:49 +0000 (20:00 -0300)]
Document PatchNANs input type
danielenricocahall [Sun, 2 Aug 2020 16:46:05 +0000 (12:46 -0400)]
add relu as activation option in darknet
add relu option
add relu as activation option in darknet
simplify the setParams if-else ladder
add relu as activation option in darknet
correct activation_param type
format
format
add relu as activation option in darknet
spacing
spacing
add relu as activation option in darknet
Ilya Churaev [Mon, 20 Jul 2020 12:43:00 +0000 (15:43 +0300)]
Replaced copy_with_new_args to clone_with_new_inputs
Ilya Churaev [Fri, 17 Jul 2020 11:34:06 +0000 (14:34 +0300)]
Fixed removing is_parameter, is_constant, is_output
pemmanuelviel [Mon, 3 Aug 2020 18:29:57 +0000 (20:29 +0200)]
Merge pull request #18019 from pemmanuelviel:pev--multiple-kmeans-trees
* Possibility to set more than one tree for the hierarchical KMeans (default is still 1 tree).
This particularly improves NN retrieval results with binary vectors, allowing better quality
compared to LSH for similar processing time when speed is the criterium.
* Add explanations on the FLANN's hierarchical KMeans for binary data.
Alexander Alekhin [Mon, 3 Aug 2020 18:28:18 +0000 (18:28 +0000)]
Merge pull request #18018 from danielenricocahall:add-compose-panorama-python-binding
Alexander Alekhin [Mon, 3 Aug 2020 18:27:11 +0000 (18:27 +0000)]
Merge pull request #18016 from pemmanuelviel:pev--cleaner-hierarchical-clustering
Alexander Alekhin [Mon, 3 Aug 2020 18:26:53 +0000 (18:26 +0000)]
Merge pull request #18014 from lpea:fix_build_with_aravis
Alexander Alekhin [Mon, 3 Aug 2020 18:26:12 +0000 (18:26 +0000)]
Merge pull request #18012 from sturkmen72:update_doc_and_sample
Alexander Alekhin [Mon, 3 Aug 2020 18:25:14 +0000 (18:25 +0000)]
Merge pull request #18011 from YashasSamaga:cuda4dnn-feature-mvn
Alexander Alekhin [Mon, 3 Aug 2020 18:23:11 +0000 (18:23 +0000)]
Merge pull request #17998 from dkurt:dnn_fix_ngraph
Liubov Batanina [Mon, 3 Aug 2020 18:02:49 +0000 (21:02 +0300)]
Merge pull request #17967 from l-bat:non_const_weights_for_conv
* Supported convolution with non-const weights
* Fix opencl blobs
* Update tests
pemmanuelviel [Mon, 3 Aug 2020 18:00:59 +0000 (20:00 +0200)]
Merge pull request #17735 from pemmanuelviel:pev-fix-trees-descent
* Fix trees parsing behavior in hierarchical_clustering_index:
Before, when maxCheck was reached in the first descent of a tree, time was still wasted parsing
the next trees till their best leaf, just to skip the points stored there.
Now we can choose either to keep this behavior, and so we skip parsing other trees after reaching
maxCheck, or we choose to do one descent in each tree, even if in one tree we reach maxCheck.
* Apply the same change to kdtree.
As each leaf contains only 1 point (unlike hierarchical_clustering), difference is visible if trees > maxCheck
* Add the new explore_all_trees parameters to miniflann
* Adapt the FlannBasedMatcher read_write test to the additional search parameter
* Adapt java tests to the additional parameter in SearchParams
* Fix the ABI dumps failure on SearchParams interface change
* Support of ctor calling another ctor of the class is only fully supported from C+11
Alexander Alekhin [Mon, 3 Aug 2020 14:17:04 +0000 (17:17 +0300)]
Merge pull request #17742 from SoheibKadi/DetectionOutput_layer_doc
Adding comment from source code to DetectionOutputLayer class documentation
Alexander Alekhin [Mon, 3 Aug 2020 14:13:34 +0000 (17:13 +0300)]
Merge pull request #17885 from alalek:dnn_ocl_slice_update
DNN: OpenCL/slice update
* dnn(ocl/slice): make slice kernel VTune friendly
- more unique names
- inline code of copy functions
* dnn(ocl/slice): prefer to spawn more work groups
- even in case with 1D copy
- perf improvement up to 2x of kernel time (due to changed configuration 128x1x1 => 128x32x1)
* dnn(ocl/slice): cache kernel exec info
Yosshi999 [Mon, 3 Aug 2020 14:11:55 +0000 (23:11 +0900)]
Merge pull request #17907 from Yosshi999:gsoc_asift-py2cpp
* Implement ASIFT in C++
* '>>' should be '> >' within a nested template
* add a sample for asift usage
* bugfix empty keypoints cause crash
* simpler initialization for mask
* suppress the number of lines
* correct tex document
* type casting
* add descriptorsize for asift
* smaller testdata for asift
* more smaller test data
* add OpenCV short license header
Alexander Alekhin [Mon, 3 Aug 2020 13:00:41 +0000 (13:00 +0000)]
Merge pull request #17478 from tomoaki0705:dropOldCC
Zhangyin [Mon, 29 Jun 2020 07:50:24 +0000 (15:50 +0800)]
Added cmake toolchain for RISC-V with clang.
- Added cross compile cmake file for target riscv64-clang
- Extended cmake for RISC-V and added instruction checks
- Created intrin_rvv.hpp with C++ version universal intrinsics
Alexander Alekhin [Mon, 3 Aug 2020 11:10:37 +0000 (11:10 +0000)]
Merge pull request #17882 from komakai:objc-contrib-wrappers
Suleyman TURKMEN [Sun, 2 Aug 2020 10:33:23 +0000 (13:33 +0300)]
Update warpPerspective_demo.cpp
danielenricocahall [Sun, 2 Aug 2020 20:12:13 +0000 (16:12 -0400)]
add python binding and tests for composePanorama
fix tests
pick
54039c2afd add python binding and tests for composePanorama
Dmitry Kurtaev [Thu, 30 Jul 2020 15:04:22 +0000 (18:04 +0300)]
Do not use size_t for nGraph layers
Pierre-Emmanuel Viel [Sun, 2 Aug 2020 16:05:20 +0000 (18:05 +0200)]
Cleaner code for hierarchical_clustering
lpea [Sun, 2 Aug 2020 12:26:48 +0000 (14:26 +0200)]
videoio: fix compilation with Aravis enabled
YashasSamaga [Sun, 2 Aug 2020 07:14:35 +0000 (12:44 +0530)]
add MVNOp
Vadim Pisarevsky [Sat, 1 Aug 2020 12:05:05 +0000 (15:05 +0300)]
Merge pull request #17858 from vpisarev:dnn_depthwise_conv
* added depth-wise convolution; gives ~20-30% performance improvement in MobileSSD networks
* hopefully, eliminated compile warnings, errors, as well as failure in one test
* * fixed a few typos
* decreased buffer size in some cases
* added more optimal im2row branch in the case of 1x1 convolutions
* tuned fastConv to reduce the number of passes over arrays
Yashas Samaga B L [Sat, 1 Aug 2020 12:03:07 +0000 (17:33 +0530)]
Merge pull request #17939 from YashasSamaga:cuda4dnn-fix-eltwise-fusion
* fix eltwise fusion segfault, more eltwise fusions, fix power fusion
* add assertion
kadi soheib [Fri, 31 Jul 2020 20:43:38 +0000 (23:43 +0300)]
Corrected Comment as requested by reviewer.
Maksim Shabunin [Fri, 31 Jul 2020 15:21:22 +0000 (15:21 +0000)]
Merge pull request #17301 from YashasSamaga:cuda4dnn-detection-output
Maksim Shabunin [Fri, 31 Jul 2020 09:08:10 +0000 (09:08 +0000)]
Merge pull request #17987 from mshabunin:fix-xcode-carotene
Maksim Shabunin [Fri, 31 Jul 2020 09:07:35 +0000 (09:07 +0000)]
Merge pull request #17983 from Windfisch:Windfisch-patch-jpeg2000
Pavel Rojtberg [Thu, 30 Jul 2020 19:59:15 +0000 (21:59 +0200)]
Merge pull request #17977 from paroj:hervec
* calib3d: calibrateHandEye - allow using Rodrigues vectors for rotation
* calib3d: calibrateHandEye - test rvec representation
Maksim Shabunin [Thu, 30 Jul 2020 19:56:31 +0000 (19:56 +0000)]
Merge pull request #17957 from AnnaPetrovicheva:ap/update-logo
Maksim Shabunin [Wed, 29 Jul 2020 22:03:55 +0000 (01:03 +0300)]
Fix Carotene compilation with XCode
Florian Jung [Wed, 29 Jul 2020 16:51:55 +0000 (18:51 +0200)]
Fix build of grfmt_jpeg2000.cpp
libjasper has recently changed `jas_matrix_get` from a macro to an inline function
(
389951d071 in https://github.com/jasper-software/jasper), causing the build to fail.
Namgoo Lee [Wed, 29 Jul 2020 16:24:25 +0000 (01:24 +0900)]
test code
Namgoo Lee [Wed, 29 Jul 2020 16:03:34 +0000 (01:03 +0900)]
Use "src" not "*this" for source GpuMat
Vadim Pisarevsky [Wed, 29 Jul 2020 13:28:01 +0000 (16:28 +0300)]
Merge pull request #17816 from vpisarev:essential_2cameras
* add findEssentialMat for two different cameras
* added smoke test for the newly added variant of findEssentialMatrix
Co-authored-by: tompollok <tom.pollok@gmail.com>
Anatoliy Talamanov [Wed, 29 Jul 2020 13:18:52 +0000 (16:18 +0300)]
Merge pull request #17493 from TolyaTalamanov:at/python-bindings-gapi
* Implement G-API python bindings
* Fix hdr_parser
* Drop initlization with brackets using regexp
* Handle bracket initilization another way
* Add test for core operations
* Declaration and definition of View constructor now in different files
* Refactor tests
* Remove combine decorator from tests
* Fix comment to review
* Fix test
* Fix comments to review
* Remove GCompilerArgs implementation from python
Co-authored-by: Pinaev <danil.pinaev@intel.com>
Tomoaki Teshima [Wed, 29 Jul 2020 08:31:39 +0000 (17:31 +0900)]
* stop showing old generations
* keep it possible to build for old CC
* make sure old generations don't come up for the choice
* remove related version check of old one
YashasSamaga [Wed, 1 Jul 2020 18:17:57 +0000 (23:47 +0530)]
add DetectionOutputOp
Alexander Alekhin [Tue, 28 Jul 2020 17:15:02 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 28 Jul 2020 17:05:58 +0000 (17:05 +0000)]
Merge pull request #17916 from SinM9:mish_functor_sin
Anna Petrovicheva [Mon, 27 Jul 2020 14:42:15 +0000 (17:42 +0300)]
Updated the OpenCV logo
Maksim Shabunin [Tue, 28 Jul 2020 13:18:15 +0000 (13:18 +0000)]
Merge pull request #17925 from sturkmen72:patch-2
Orest Chura [Tue, 28 Jul 2020 11:20:36 +0000 (14:20 +0300)]
Merge pull request #17871 from OrestChura:oc/typed_GArray_GMat
* Added overload for `GArray<GMat>` ProtoParam in `gtyped.hpp`
* Tests+compile_args
- added tests for GArray<GMat> as an input and an output of GComputationT
- added possibility to give the compile_args to GComputationT.apply()
* Fix win errors
Orest Chura [Tue, 28 Jul 2020 10:25:56 +0000 (13:25 +0300)]
Merge pull request #17896 from OrestChura:oc/fix_kw_videotests
* - fix numeric overflow due to incorrect type casting
- remove unnecessary default constructor
* Drop the cast
Maksim Shabunin [Mon, 27 Jul 2020 08:32:25 +0000 (08:32 +0000)]
Merge pull request #17928 from sturkmen72:update_samples
Maksim Shabunin [Mon, 27 Jul 2020 08:32:02 +0000 (08:32 +0000)]
Merge pull request #17943 from tomoaki0705:fixPolarToCartRounding
Tomoaki Teshima [Sat, 25 Jul 2020 14:45:51 +0000 (23:45 +0900)]
let the test pass on Jetson
Suleyman TURKMEN [Thu, 23 Jul 2020 11:39:40 +0000 (14:39 +0300)]
Update train_HOG.cpp
Suleyman TURKMEN [Wed, 22 Jul 2020 04:29:56 +0000 (07:29 +0300)]
Update samples
Maksim Shabunin [Thu, 23 Jul 2020 08:35:50 +0000 (08:35 +0000)]
Merge pull request #17489 from Lapshin:ffmpeg_cap_consider_rotation_metadata_3.4
Alexander Smorkalov [Mon, 8 Jun 2020 14:31:18 +0000 (17:31 +0300)]
MP4 autorotation tests and various fixes for Windows
- Added test for automated rotation for MP4 videos with metadata
- Fix 180 degrees rotation bug
- Moved rotation logic to cv::VideoCapture implementation for FFmpeg and restore binary compatibility with FFmpeg wrapper.
Alexey Lapshin [Tue, 2 Jun 2020 15:34:52 +0000 (18:34 +0300)]
Autorotation for mp4 streams with metadata
- Add VideoCapture camera orientation property for mp4 videos with camera orientation meta.
- Add auto rotation for 90, 180, 270 degrees using cv::rotate
Sinitsina [Wed, 22 Jul 2020 18:26:27 +0000 (21:26 +0300)]
mish_functor_update
Maksim Shabunin [Wed, 22 Jul 2020 16:06:23 +0000 (16:06 +0000)]
Merge pull request #17913 from asmorkalov:as/connected_components_ref
Maksim Shabunin [Wed, 22 Jul 2020 08:19:31 +0000 (08:19 +0000)]
Merge pull request #17863 from nglee:dev_cudaDetachOutput