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
Alexander Alekhin [Wed, 26 Aug 2020 11:43:17 +0000 (11:43 +0000)]
Merge pull request #17919 from zhaoyue-zephyrus:flownet2_with_anysize
Sergei Slashchinin [Wed, 26 Aug 2020 10:15:59 +0000 (13:15 +0300)]
Merge pull request #17978 from sl-sergei:fix_17516_17531
* Fix ONNX loading in issues opencv#17516, opencv#17531
* Add tests for Linear and Matmul layers
* Disable tests for IE versions lower than 20.4
* Skip unstable tests with OpenCL FP16 on Intel GPU
* Add correct test filtering for OpenCL FP16 tests
jinyup100 [Tue, 25 Aug 2020 20:01:16 +0000 (05:01 +0900)]
Merge pull request #17647 from jinyup100:add-siamrpnpp
[GSoC] Add siamrpnpp.py
* Updated base branch with siamrpnpp.py
* Addition of Parsers
* Merged to using few ONNX files, Changes to Parsers, Links to Repo
* Deleted whitespace
* Adjusting flake8 error
* Fixes according to review
* Fix according to review
* Addition of OpenVINO backends and Computation target devices
* Fix on backend after review
* Fixes after review
* Remove extra white space
* Removed Repeated Varaibles
Alexander Alekhin [Tue, 25 Aug 2020 18:24:30 +0000 (18:24 +0000)]
Merge pull request #18171 from catree:fix_pnp_doc
Anastasiya(Asya) Pronina [Tue, 25 Aug 2020 13:51:43 +0000 (16:51 +0300)]
Merge pull request #17163 from AsyaPronina:gcompound_kernel_gmatp_coop
* Fixed cooperation of Compound kernel and GMatP type
* Added test for GCompound kernel + GMatP type cooperation
Alexander Alekhin [Tue, 25 Aug 2020 13:33:39 +0000 (13:33 +0000)]
Merge pull request #18178 from catree:improve_camera_matrix_doc
Alexander Alekhin [Tue, 25 Aug 2020 13:28:21 +0000 (13:28 +0000)]
Merge pull request #18165 from catree:fix_hand_eye_calibration_Andreff_NaN_3.4
Alexander Alekhin [Tue, 25 Aug 2020 07:29:42 +0000 (07:29 +0000)]
Merge pull request #18185 from VadimLevin:dev/vlevin/ffmpeg-versions-guard-fix
catree [Fri, 21 Aug 2020 23:44:40 +0000 (01:44 +0200)]
Fix cubic root computation to be able to handle negative values. Improve doc. Add regression test.
catree [Sat, 22 Aug 2020 21:27:39 +0000 (23:27 +0200)]
Add broken implementation note for DLS and UPnP.
Add CV_LOG_DEBUG.
Vadim Levin [Mon, 24 Aug 2020 20:12:49 +0000 (23:12 +0300)]
fix: libavcodec version check for AVDISCARD_NONINTRA
- AVDISCARD_NONINTRA flag is supported only for FFMPEG libraries pack
Vadim Levin [Mon, 24 Aug 2020 20:07:25 +0000 (23:07 +0300)]
fix: libavcodec version check for AV_CODEC_FLAG_GLOBAL_HEADER
Vadim Levin [Mon, 24 Aug 2020 18:39:05 +0000 (21:39 +0300)]
Merge pull request #18146 from VadimLevin:dev/vlevin/ffmpeg-remove-obsolte-versions-support
Remove obsolete FFMPEG versions support
* refactor: removed obsolete FFMPEG version support
- Oldest available version via official FFMPEG repository mirror has tag v.0.5
LIBAVFORMAT version for this tag is 52.31.0
* refactor: prefer std::min function to MIN macro
* refactor: use appropriate macro instead of manual version calculation
* refactor: remove macros for versions prior 0.5.15 release
* refactor: remove libavcodec macros for versions < 54.35.1 (default to Ubuntu 14.04)
* refactor: remove libavformat macro for versions < 54.20.4 (default ubuntu 14.04)
* refactor: remove libavutil macro for versions < 52.3.0 (default ubuntu 14.04)
* refactor: remove missed macros for libavcodec and libavformat
* refactor: remove unused _opencv_ffmpeg_free function
* build: add FFMPEG libraries versions checks
- Add verbose message about what FFMPEG libraries are missing.
- Add minimal versions check set to libav 9.20 release (default ubuntu 14.04) and FFMPEG 1.1.16 release.
If the check is failed CMake produces user-friendly message instead of build error.
* fix: libavcodec version guard for AVDISCARD_NONINTRA
* fix: libav check of libavcodec version guard for AVDISCARD_NONINTRA
* fix: version check for AV_CODEC_FLAG_GLOBAL_HEADER
* fix: missing FFMPEG libraries output
Alexander Alekhin [Mon, 24 Aug 2020 14:18:08 +0000 (14:18 +0000)]
Merge pull request #18181 from l-bat:onnx_pow
Orest Chura [Mon, 24 Aug 2020 11:46:32 +0000 (14:46 +0300)]
Merge pull request #18148 from OrestChura:oc/fluid_core_perf
[G-API]: Fluid Core kernels performance tests
* Add performance tests for a list of Fluid Core kernels
* Update gapi_core_perf_tests_fluid.cpp
Addressing a comment
Liubov Batanina [Mon, 24 Aug 2020 07:46:53 +0000 (10:46 +0300)]
Supported ONNX Pow op
catree [Mon, 24 Aug 2020 03:21:42 +0000 (05:21 +0200)]
Use camera intrinsic matrix everywhere. Add cameramatrix, distcoeffs and distcoeffsfisheye macros to avoid copy/paste errors.
Ian Maquignaz [Sun, 23 Aug 2020 22:32:58 +0000 (18:32 -0400)]
Merge pull request #18083 from IanMaquignaz:fix_gen_pattern_centering
* Fixed centering issue with make_cicle_pattern and make_acircle_pattern()
* Fixed issue where asymmetric circles were not at 45 degree angles. Also fixed support for inch measurement by converting parsing to usage of floating points for page size
* Fixed copy-paste error from experimental workspace
Alexander Alekhin [Sat, 22 Aug 2020 17:21:49 +0000 (20:21 +0300)]
Merge pull request #17675 from zihaomu:GSoC_digit_text_detect_and_recog
Alexander Alekhin [Fri, 21 Aug 2020 19:57:34 +0000 (19:57 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 21 Aug 2020 18:54:40 +0000 (18:54 +0000)]
Merge pull request #18151 from alalek:core_trace_fix_location
Alexander Alekhin [Fri, 21 Aug 2020 18:54:08 +0000 (18:54 +0000)]
Merge pull request #18150 from alalek:ocl_async_cleanup_no_warning
Zihao Mu [Sat, 27 Jun 2020 07:04:00 +0000 (15:04 +0800)]
add OpenCV sample for digit and text recongnition, and provide multiple OCR models.
Namgoo Lee [Fri, 21 Aug 2020 14:52:30 +0000 (23:52 +0900)]
Remove compiler warnings
Namgoo Lee [Wed, 19 Aug 2020 08:39:24 +0000 (17:39 +0900)]
bit-exact cuda::equalizeHist
Alexander Alekhin [Fri, 21 Aug 2020 13:07:26 +0000 (13:07 +0000)]
Merge pull request #18135 from AnnaPetrovicheva:logo_text
Anna Petrovicheva [Wed, 19 Aug 2020 12:46:55 +0000 (15:46 +0300)]
Added a note about OpenCV logo
Alexander Alekhin [Thu, 20 Aug 2020 21:43:14 +0000 (21:43 +0000)]
core(trace): lazy quering for OPENCV_TRACE_LOCATION
- fixes proper initialization of non-trivial variable
Alexander Alekhin [Thu, 20 Aug 2020 19:05:50 +0000 (19:05 +0000)]
ocl: silence warning in case of async cleanup
- OpenCL kernel cleanup processing is asynchronous and can be called even after forced clFinish()
- buffers are released later in asynchronous mode
- silence these false positive cases for asynchronous cleanup
Alexander Alekhin [Thu, 20 Aug 2020 13:26:02 +0000 (13:26 +0000)]
Merge pull request #18084 from pemmanuelviel:pev--add-DNA-distances
Alexander Alekhin [Thu, 20 Aug 2020 13:25:02 +0000 (13:25 +0000)]
Merge pull request #18085 from pemmanuelviel:pev--add-DbgAssert-checks
Alexander Alekhin [Thu, 20 Aug 2020 13:23:12 +0000 (13:23 +0000)]
Merge pull request #18121 from ivashmak:fixing_usac
Alexander Alekhin [Thu, 20 Aug 2020 13:21:58 +0000 (13:21 +0000)]
Merge pull request #18129 from pemmanuelviel:pev--update-stereo-sample
Pierre-Emmanuel Viel [Tue, 18 Aug 2020 14:10:56 +0000 (16:10 +0200)]
Update the stereo sample:
* add the HH4 mode
* option to display disparity with a color map
* display current settings in the title bar
* don't close app when wanting to take screenshots
Alexander Alekhin [Tue, 18 Aug 2020 20:06:17 +0000 (20:06 +0000)]
Merge pull request #18037 from danielenricocahall:improve-brisk-init-perf
Alexander Alekhin [Tue, 18 Aug 2020 13:19:18 +0000 (13:19 +0000)]
Merge pull request #18022 from SoheibKadi:Update_CornerSubPix_Documentation
danielenricocahall [Wed, 5 Aug 2020 02:18:32 +0000 (22:18 -0400)]
Improve initialization performance of Brisk
reformatting
Improve initialization performance of Brisk
fix formatting
Improve initialization performance of Brisk
formatting
Improve initialization performance of Brisk
make a lookup table for ring
use cosine/sine lookup table for theta in brisk and utilize trig identity
fix ring lookup table
use cosine/sine lookup table for theta in brisk and utilize trig identity
formatting
use cosine/sine lookup table for theta in brisk and utilize trig identity
move scale radius product to ring loop to ensure it's not recomputed for each rot
revert change
move scale radius product to ring loop to ensure it's not recomputed for each rot
remove rings lookup table
move scale radius product to ring loop to ensure it's not recomputed for each rot
fix formatting of for loop
move scale radius product to ring loop to ensure it's not recomputed for each rot
use sine/cosine approximations for brisk lookup table.
add documentation for sine/cosine lookup tables
Improve initialization performance of BRISK
Alexander Alekhin [Tue, 18 Aug 2020 10:22:25 +0000 (13:22 +0300)]
Merge pull request #17989 from Yikun:arm64-check-action
Alexander Alekhin [Mon, 17 Aug 2020 19:25:54 +0000 (19:25 +0000)]
Merge pull request #18119 from tomoaki0705:fixFfmpegBuildFailure
Alexander Alekhin [Mon, 17 Aug 2020 19:20:04 +0000 (19:20 +0000)]
Merge pull request #17993 from Maxim-Doronin:vpu/mdoronin/refactor_vpu_configs
Maksym Ivashechkin [Mon, 17 Aug 2020 19:15:19 +0000 (21:15 +0200)]
fix CV_Check warnings
Tomoaki Teshima [Mon, 17 Aug 2020 12:24:54 +0000 (21:24 +0900)]
fix build error on odroid-n2-plus
Vadim Pisarevsky [Mon, 17 Aug 2020 11:49:11 +0000 (14:49 +0300)]
Merge pull request #18073 from vpisarev:apache2_license
changed OpenCV license from BSD to Apache 2 license
* as discussed and announced earlier, changed OpenCV license from BSD to Apache 2. Many files still contain old-style copyrights though
* changed wording a bit; preserve the original OpenCV BSD license
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
Maksim Doronin [Thu, 30 Jul 2020 14:46:37 +0000 (17:46 +0300)]
[IE][VPU]: Refactor vpu configs
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
Pierre-Emmanuel Viel [Wed, 12 Aug 2020 21:07:35 +0000 (23:07 +0200)]
Add debug assert to check in FLANN the vectors size is multiple of the architecture word size
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
zhaoyue-zephyrus [Wed, 22 Jul 2020 15:07:17 +0000 (23:07 +0800)]
support flownet2 with arbitary input size
revise default proto to match the filename in documentations
fix a bug
beautify python codes
fix bug
beautify codes
add test samples with larger/smaller size
remove unless code
using bytearray without creating tmp file
remove useless codes
Yikun Jiang [Thu, 30 Jul 2020 03:46:49 +0000 (11:46 +0800)]
Add arm64-build-checks github action
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