Dizhenin Vlad [Thu, 19 Mar 2020 21:39:54 +0000 (00:39 +0300)]
Merge pull request #16853 from SimpleVlad:note
Add link to article for sample "Intelligent scissors"
* Add link to article
* Add autors name
* Fix whitespace
Alexander Alekhin [Thu, 19 Mar 2020 16:43:43 +0000 (16:43 +0000)]
Merge pull request #16828 from paroj:nmspy
Alexander Alekhin [Thu, 19 Mar 2020 16:43:16 +0000 (16:43 +0000)]
Merge pull request #16846 from alalek:cmake_python_limited_api
Alexander Alekhin [Thu, 19 Mar 2020 16:42:55 +0000 (16:42 +0000)]
Merge pull request #16842 from mshabunin:ignore-vs-config
Pavel Rojtberg [Mon, 16 Mar 2020 17:05:07 +0000 (18:05 +0100)]
dnn: expose only float variant of NMSBoxes for bindings
the float variant was always shadowed by the int version as
Rect2d is implicitly convertible to Rect.
This swaps things which is fine, as the vector of boxes was always
copied and the computation was done in double.
Alexander Alekhin [Wed, 18 Mar 2020 23:05:03 +0000 (23:05 +0000)]
cmake(python): handle PYTHON3_LIMITED_API
- python-3.x => python-3
- config-3.x.py => config-3.py
Elizarov Ilya [Wed, 18 Mar 2020 15:46:43 +0000 (18:46 +0300)]
Merge pull request #16554 from ieliz:tracker
Added DaSiamRPN tracker
* added DaSiamRPN tracker
* whitespace trouble handled
* Fixes for PR
* Fixes for PR
* Fixes for PR
* added new line in the end of the file and x_crop fix
* removed cxy_wh_2_rect function
* removed loop from sofrmax function
* more detailed discription about absolute paths to onnx models
* removed nested while loop, initialization moved from main tracking loop
* added assert message for small init bb
* initial bounding box on videostream
* selection of initial bounding box improved
* created tracker class, fixed initializing bounding box
* fix round of value
* names fix
* private methods renamed
* names fixed, case for video WIP
* fix case with video
* removed hardcoded size of window
* whitespace fix
* links to models fixed
* bounding box drawing fix
* changes does not required
* code style fixes
* fixes
* frame checker added in tracking loop
* fixed import sys
iteal [Wed, 18 Mar 2020 08:45:09 +0000 (17:45 +0900)]
Merge pull request #16818 from iteal:master
Update template_matching.markdown
Fixed "template image" should be "source image" in two sentences explaining template matching.
Maksim Shabunin [Tue, 17 Mar 2020 18:12:54 +0000 (21:12 +0300)]
Ignore Visual Studio cmake configuration file
Alexander Alekhin [Tue, 17 Mar 2020 16:29:43 +0000 (16:29 +0000)]
Merge pull request #16836 from alalek:stitching_avoid_nonfree_by_default
Liubov Batanina [Tue, 17 Mar 2020 14:31:01 +0000 (17:31 +0300)]
Merge pull request #16715 from l-bat:slice_onnx
* Support Slice layer with multiple inputs
* Add test
* Supported Resize from PyTorch
* Rewrite test
* Remove Cast layer (supported in #16735)
* Support ConstantOfShape
* Fix tests
* Fix coments
* Remove useless condition
* Fixed failed tests
Alexander Alekhin [Tue, 17 Mar 2020 12:09:23 +0000 (15:09 +0300)]
stitching: don't use nonfree by default
Alexander Alekhin [Tue, 17 Mar 2020 10:12:47 +0000 (10:12 +0000)]
Merge pull request #16827 from alalek:update_buffer_area
Alexander Alekhin [Mon, 16 Mar 2020 18:52:15 +0000 (18:52 +0000)]
Merge pull request #16825 from mshabunin:fix-qrcode-tests
Alexander Alekhin [Mon, 16 Mar 2020 18:48:19 +0000 (18:48 +0000)]
Merge pull request #16826 from mshabunin:fix-kw-issues-34
Alexander Alekhin [Mon, 16 Mar 2020 16:34:08 +0000 (19:34 +0300)]
core(buffer_area): handle 'OPENCV_ENABLE_MEMORY_SANITIZER=ON' case
Maksim Shabunin [Mon, 16 Mar 2020 15:49:16 +0000 (18:49 +0300)]
objdetect: fix QRCode tests with disabled QUIRC
Maksim Shabunin [Mon, 16 Mar 2020 12:49:51 +0000 (15:49 +0300)]
Fixs several problems found by static analysis
Alexander Alekhin [Mon, 16 Mar 2020 15:04:49 +0000 (15:04 +0000)]
Merge pull request #16820 from dkurt:fix_16811
RAJKIRAN NATARAJAN [Mon, 16 Mar 2020 14:12:29 +0000 (07:12 -0700)]
Merge pull request #16779 from saskatchewancatch:issue-16777
* Fixes issue 16777.
* core: update Concurrency getNumThreads()
Dizhenin Vlad [Mon, 16 Mar 2020 14:10:25 +0000 (17:10 +0300)]
Merge pull request #16695 from SimpleVlad:intelligent_scissors
Intelligent scissors
* Start
* Remove whitespace
* Re onMouse
* replased double to float
* Draw contours
* CV_FILLED -> FILLED
* Remove line 210
* Change 'about'
* Remove M_PI
* Remove warning
* CP_PI
* double to float
* CV_PI to Float
* Add struct for data
* line 172, 191 whitespace
* Change name
* Fix Warnings
* Set const
* line 180
* rewrite keys
* &img = param->img
Dmitry Kurtaev [Mon, 16 Mar 2020 12:49:37 +0000 (15:49 +0300)]
Fix memory leak in Python custom dnn layers
Alexander Alekhin [Sun, 15 Mar 2020 19:49:50 +0000 (19:49 +0000)]
Merge pull request #16786 from alalek:issue_16398
Alexander Alekhin [Sat, 14 Mar 2020 22:00:18 +0000 (22:00 +0000)]
Merge pull request #16812 from seiko2plus:vsx_improve_broadcast
Sayed Adel [Sat, 14 Mar 2020 20:14:17 +0000 (22:14 +0200)]
core:vsx reimplement `v_broadcast_element()`
There's no need to use `vec_perm()` instead of `vec_splat()`,
since instruction `vperm` is quite heavy compared to `vsplt[b,h,w]`.
Alexander Alekhin [Sat, 14 Mar 2020 13:47:50 +0000 (13:47 +0000)]
Merge pull request #16809 from alalek:dnn_ie_separate_core_instances
Alexander Alekhin [Sat, 14 Mar 2020 13:38:05 +0000 (13:38 +0000)]
Merge pull request #16760 from dkurt:dnn_mobilenet_v3
Liubov Batanina [Sat, 14 Mar 2020 11:05:49 +0000 (14:05 +0300)]
Merge pull request #16735 from l-bat:flatten_const_onnx
* Supported Flatten for constant nodes
* Added default axis
* Refactoring
* Refactoring
* Added cast layer
* Fix comments
* Add Cast for layers
Alexander Alekhin [Sat, 14 Mar 2020 10:59:27 +0000 (10:59 +0000)]
Merge pull request #16798 from alalek:opencv_version_threads
Alexander Alekhin [Fri, 13 Mar 2020 18:02:50 +0000 (18:02 +0000)]
Merge pull request #16797 from alalek:cmake_warning_python_standalone
Alexander Alekhin [Fri, 13 Mar 2020 15:33:27 +0000 (18:33 +0300)]
dnn(ie): separate IECore for different devices
- HETERO plugin doesn't switch well between devices
Alexander Alekhin [Thu, 12 Mar 2020 13:35:14 +0000 (16:35 +0300)]
opencv_version: dump threads information
Alexander Alekhin [Thu, 12 Mar 2020 11:29:31 +0000 (14:29 +0300)]
cmake: fix missing project() warning in Python standalone builds
Alexander Alekhin [Tue, 21 Jan 2020 10:51:03 +0000 (13:51 +0300)]
core: adjust type of allocator_stats counter, allow to disable
Alexander Alekhin [Wed, 11 Mar 2020 12:38:45 +0000 (12:38 +0000)]
Merge pull request #16756 from alalek:cmake_opencv_test_extra_compile_options
Alexander Alekhin [Wed, 11 Mar 2020 12:35:33 +0000 (12:35 +0000)]
Merge pull request #16498 from etrulls:3.4.9-maxIters
Alexander Alekhin [Tue, 10 Mar 2020 22:39:30 +0000 (22:39 +0000)]
Merge pull request #16774 from alalek:core_update_cpus_detection
Alexander Alekhin [Tue, 10 Mar 2020 22:30:51 +0000 (22:30 +0000)]
Merge pull request #16773 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Tue, 10 Mar 2020 22:02:47 +0000 (22:02 +0000)]
Merge pull request #16744 from alalek:fix_mat_aug_operators_use_after_free
Alexander Alekhin [Tue, 25 Feb 2020 14:04:27 +0000 (17:04 +0300)]
core: update CPUs detection
- cache value, evaluate once
- better support for MINGW
- anything in 'cv' namespace
- test: dump number of active threads
Alexander Alekhin [Tue, 10 Mar 2020 19:01:01 +0000 (19:01 +0000)]
ffmpeg/3.4: update FFmpeg wrapper
- FFmpeg 3.4.7
Alexander Alekhin [Tue, 10 Mar 2020 18:34:39 +0000 (18:34 +0000)]
Merge pull request #16770 from alalek:update_version_3.4.10-pre
Alexander Alekhin [Tue, 10 Mar 2020 13:52:32 +0000 (13:52 +0000)]
Merge pull request #16746 from alalek:dnn_switch_ie_backend_ngraph
Vadim Levin [Tue, 10 Mar 2020 13:44:22 +0000 (16:44 +0300)]
Merge pull request #16713 from VadimLevin:dev/vlevin/ffmpeg_video_capture_bitrate
* feature: Add video capture bitrate read-only property for FFMPEG backend
* test: For WIN32 property should be either expected or 0.
Added `IsOneOf` helper function, enabled only for _WIN32.
Alexander Alekhin [Tue, 10 Mar 2020 11:53:43 +0000 (14:53 +0300)]
pre: OpenCV 3.4.10 (version++)
- Android Manager version is not increased (stuck on 3.49)
Alexander Alekhin [Fri, 6 Mar 2020 13:43:23 +0000 (13:43 +0000)]
dnn(ie): switch to nGraph backend by default
Yashas Samaga B L [Tue, 10 Mar 2020 09:45:19 +0000 (15:15 +0530)]
Merge pull request #16436 from YashasSamaga:feature-enetb0-yolo
dnn(darknet-importer): add grouped convolutions, sigmoid, swish, scale_channels
* update darknet importer to support enetb0-yolo
* remove dropout (pr16438) and fix formatting
* add test for scale_channels
* disable batch testing for scale channels
* do not set LayerParams::name
* merge all activations into setActivation
NesQl [Mon, 9 Mar 2020 14:59:23 +0000 (22:59 +0800)]
Merge pull request #16724 from liqi-c:3.4-tengine
* Add Tengine support .
* Modify printf to CV_LOG_WARNING
* a few minor fixes in the code
* Renew Tengine version
* Add header file for CV_LOG_WARNING
* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp
* remove trailing whitespace
* Remove trailing whitespace
* Modify for compile problem
* Modify some code style error
* remove whitespace
* Move some code style problem
* test
* add ios limit and build problem
* Modified as alalek suggested
* Add cmake 2.8 support
* modify cmake 3.5.1 problem
* test and set BUILD_ANDROID_PROJECTS OFF
* remove some compile error
* remove some extra code in tengine
* close test.
* Test again
* disable android.
* delete ndk version judgement
* Remove setenv() call . and add License information
* Set tengine default OFF. Close test .
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Dmitry Kurtaev [Sun, 8 Mar 2020 17:15:18 +0000 (20:15 +0300)]
Support for MobileNetV3-SSD from TensorFlow
Alexander Alekhin [Sat, 7 Mar 2020 19:07:17 +0000 (19:07 +0000)]
Merge pull request #16743 from alalek:ts_dump_exception_content
Alexander Alekhin [Sat, 7 Mar 2020 15:37:21 +0000 (15:37 +0000)]
cmake: allow extra compile options for tests
Eduard Trulls [Tue, 4 Feb 2020 07:28:07 +0000 (07:28 +0000)]
Expose maxIters in findFundamentalMat
Lets the user choose the maximum number of iterations the robust
estimator runs for, similary to findHomography. This can significantly
improve performance (at a computational cost).
Alexander Alekhin [Fri, 6 Mar 2020 19:07:21 +0000 (19:07 +0000)]
Merge pull request #16751 from alalek:core_coverity_issues
Alexander Alekhin [Fri, 6 Mar 2020 19:04:43 +0000 (19:04 +0000)]
Merge pull request #16738 from dkurt:onnx_broadcast
Alexander Alekhin [Fri, 6 Mar 2020 19:03:43 +0000 (19:03 +0000)]
Merge pull request #16697 from alalek:imgcodecs_jpeg_drop_unnecessary_code
Alexander Alekhin [Fri, 6 Mar 2020 18:01:55 +0000 (18:01 +0000)]
core: fix coverity issues
Alexander Alekhin [Fri, 6 Mar 2020 12:52:00 +0000 (12:52 +0000)]
core: don't allow reallocation in add/div/sub/bitwise aug operators
Alexander Alekhin [Fri, 6 Mar 2020 12:26:48 +0000 (12:26 +0000)]
Merge pull request #16719 from alalek:dnn_disable_nn_builder_api_3.4
Alexander Alekhin [Fri, 6 Mar 2020 12:08:43 +0000 (12:08 +0000)]
ts(gtest): dump exception message from EXPECT_NO_THROW()
Alexander Alekhin [Fri, 6 Mar 2020 09:02:25 +0000 (09:02 +0000)]
Merge pull request #16740 from m-gupta:header
Manoj Gupta [Thu, 5 Mar 2020 22:26:35 +0000 (14:26 -0800)]
Fix building with ToT libc++
ToT libc++ (LLVM) no longer includes <sstream>
as part of <complex> which breaks building opencv.
Include <sstream> header explcitly to fix this.
Dmitry Kurtaev [Thu, 5 Mar 2020 20:53:50 +0000 (23:53 +0300)]
Broadcasting from ONNX
Alexander Alekhin [Thu, 5 Mar 2020 12:25:20 +0000 (12:25 +0000)]
Merge pull request #16723 from jansol:master
Alexander Alekhin [Wed, 4 Mar 2020 20:42:41 +0000 (23:42 +0300)]
Merge pull request #16704 from alalek:core_log_once_log_if
* core(logger): add CV_LOG_ONCE_xxx() CV_LOG_IF_xxx() macros
* core(logger): keep tests disabled
Alexander Alekhin [Wed, 4 Mar 2020 19:28:04 +0000 (22:28 +0300)]
Merge pull request #16731 from alalek:issue_16708
* imgproc(integral): avoid OOB access
* imgproc(test): fix integral perf check
- FP32 computation is not accurate
* imgproc(integral): tune loop limits
Jan Solanti [Tue, 3 Mar 2020 12:16:32 +0000 (14:16 +0200)]
core(ocl): Don't query image formats when none exist
clGetSupportedImageFormats returns CL_INVALID_VALUE if called with
num_entries 0 and a non-NULL image_formats pointer so let's not do that.
Alexander Alekhin [Wed, 4 Mar 2020 08:42:31 +0000 (11:42 +0300)]
Merge pull request #15765 from zachlowry:patch-1
Use argument value for 'mat' in call to format for vector_mat and vector_mat_template
Liubov Batanina [Wed, 4 Mar 2020 08:27:10 +0000 (11:27 +0300)]
Merge pull request #16722 from l-bat:reshape_opset_11
* Supported Div op for constants
* Added Mul test
Vadim Levin [Tue, 3 Mar 2020 07:29:00 +0000 (10:29 +0300)]
test: Add test to verify correct mat substitution into the template in header parser
Zach Lowry [Wed, 23 Oct 2019 17:40:56 +0000 (12:40 -0500)]
Use argument value for 'mat' in call to format for vector_mat and vector_mat_template
The hard-coded string value "Mat" was used in the two format strings for vector_mat and vector_mat_template, preventing UMat arguments to functions that have these types from working correctly. as noted in #12231.
Alexander Alekhin [Tue, 3 Mar 2020 20:23:10 +0000 (20:23 +0000)]
Merge pull request #16709 from ashishkrshrivastava:cvonnx
Alexander Alekhin [Tue, 3 Mar 2020 15:41:53 +0000 (15:41 +0000)]
Merge pull request #16721 from mshabunin:fix-msmf-format
ashishiva3@gmail.com [Sun, 1 Mar 2020 09:39:15 +0000 (15:09 +0530)]
Gather-Cast, Mul-Cast fusion
Maksim Shabunin [Mon, 2 Mar 2020 12:33:42 +0000 (15:33 +0300)]
MSMF: fixed issue with camera format selection
Alexander Alekhin [Tue, 3 Mar 2020 08:01:44 +0000 (08:01 +0000)]
dnn(IE): use HAVE_DNN_IE_NN_BUILDER_2019 for NN Builder API code
- CMake option: OPENCV_DNN_IE_NN_BUILDER_2019
Alexander Alekhin [Mon, 2 Mar 2020 14:13:02 +0000 (17:13 +0300)]
Merge pull request #16700 from alalek:fix_core_matexpr_size_gemm
core: fix MatExpr::size() for gemm()
* core(test): MatExpr::size() test for gemm()
* core: fix MatExpr::size() for gemm()
Alexander Alekhin [Mon, 2 Mar 2020 14:07:32 +0000 (14:07 +0000)]
Merge pull request #16716 from l-bat:skip_resize_ie
Liubov Batanina [Mon, 2 Mar 2020 12:45:29 +0000 (15:45 +0300)]
Skipped ResizeUnfused test on Builder API
Alexander Alekhin [Sun, 1 Mar 2020 10:15:55 +0000 (10:15 +0000)]
Merge pull request #16652 from MoonChasing:master
Alexander Alekhin [Sat, 29 Feb 2020 18:20:40 +0000 (21:20 +0300)]
Merge pull request #16573 from ashishkrshrivastava:opencvonnx
ashishiva3@gmail.com [Thu, 13 Feb 2020 12:02:35 +0000 (17:32 +0530)]
ONNX: upsample subgraph fusion added
Peter Würtz [Fri, 28 Feb 2020 18:21:03 +0000 (19:21 +0100)]
Merge pull request #16684 from pwuertz:ignore_clang_mat_inl
* Ignore clang warnings for deprecated enum+enum operations in mat.inl.hpp
* build: added customization macros, cmake flags for OpenCV build
firebladed [Fri, 28 Feb 2020 18:17:30 +0000 (18:17 +0000)]
Merge pull request #16626 from firebladed:firebladed-v4l2_pix_fmt_y12
V4L2: Add V4L2_PIX_FMT_Y12 (12 bit grey) support
Chip Kerchner [Fri, 28 Feb 2020 16:34:06 +0000 (11:34 -0500)]
Merge pull request #16556 from ChipKerchner:vectorizeIntegralSumPixels
* Vectorize calculating integral for line for single and multiple channels
* Single vector processing for 4-channels - 25-30% faster
* Single vector processing for 4-channels - 25-30% faster
* Fixed AVX512 code for 4 channels
* Disable 3 channel 8UC1 to 32S for SSE2 and SSE3 (slower). Use new version of 8UC1 to 64F for AVX512.
Alexander Alekhin [Fri, 28 Feb 2020 16:31:59 +0000 (16:31 +0000)]
Merge pull request #16535 from jshiwam:exifbugfix
Alexander Alekhin [Fri, 28 Feb 2020 13:46:22 +0000 (16:46 +0300)]
imgcodecs(jpeg): drop unnecessary code
- standard huffman tables are handled by modern libjpeg-turbo
Alexander Alekhin [Fri, 28 Feb 2020 14:41:07 +0000 (14:41 +0000)]
Merge pull request #16677 from Bleach665:Qt_imshow_clipbrd
MoonChasing [Sun, 23 Feb 2020 13:38:04 +0000 (21:38 +0800)]
using argv[0] represent binary executable files' name in help() function
in sample codes instead of cpp files' name.
jshiwam [Thu, 20 Feb 2020 10:59:17 +0000 (16:29 +0530)]
bug fix to Inconsistent comment for EXIF issue id #15706 stream added final
removed all the changes occured while trying to resolve conflicts
Yuriy Obukh [Thu, 27 Feb 2020 22:03:38 +0000 (00:03 +0200)]
add "Copy to clipboard functional" to imshow wnd with Qt
Alexander Alekhin [Thu, 27 Feb 2020 19:52:02 +0000 (19:52 +0000)]
Merge pull request #16687 from dkurt:dnn_ngraph_hetero
Dmitry Kurtaev [Thu, 27 Feb 2020 14:45:28 +0000 (17:45 +0300)]
Track Hetero execution for nGraph networks using ngraph::Function
Alexander Alekhin [Wed, 26 Feb 2020 17:07:49 +0000 (17:07 +0000)]
Merge pull request #16675 from alalek:fix_js_build_getNumberOfCPUs
Alexander Alekhin [Wed, 26 Feb 2020 15:43:31 +0000 (18:43 +0300)]
core: fix build getNumberOfCPUs for JavaScript
Alexander Alekhin [Wed, 26 Feb 2020 14:54:57 +0000 (14:54 +0000)]
Merge pull request #16638 from mshabunin:use-safe-buffers
Dmitry Kurtaev [Wed, 26 Feb 2020 14:51:18 +0000 (17:51 +0300)]
Merge pull request #16628 from dkurt:dnn_ngraph_custom_layers
* Custom layers with nGraph
* nGraph: multiple outputs from nodes
Ganesh Kathiresan [Wed, 26 Feb 2020 14:48:50 +0000 (20:18 +0530)]
Merge pull request #16457 from ganesh-k13:bugfix/getCPUCount-fix
* Fixed getCPUCount
Minor new line changes
Android fix | efficient linux checks
Android fix 2
Fixed cpu logic for non linux platforms
Android fix 3
Android fix 4
* No v1 case handle | Refactor long lines
* Refined Cgroups logic | Combine Android and Linux
* Fixed directives
* Added support for --cpus | Fixed minor bug in Andriod | Change file read logic
* Added macro checks for apple errors
* Fixed macro to include android
* Addressed review comments
* Fixed android macro
* Refined return values
* Fixed apple warning
* Addressed review comments
* Fixed whitespace
* Android Fix try 1
* Android Fix try 2
* Android Fix try 3
* Removed unwanted endif
* Android Fix try 4
* Android Fix try 5
* Macro Restructure
* core: updates to CPUs detection (minor)
Alexander Alekhin [Wed, 26 Feb 2020 12:47:46 +0000 (12:47 +0000)]
Merge pull request #16656 from alalek:issue_16655
Alexander Alekhin [Wed, 26 Feb 2020 11:44:16 +0000 (11:44 +0000)]
Merge pull request #16670 from alalek:update_valgrind_suppressions
Maksim Shabunin [Thu, 13 Feb 2020 11:25:47 +0000 (14:25 +0300)]
Use BufferArea in more places