Anton Potapov [Tue, 3 Mar 2020 08:37:40 +0000 (11:37 +0300)]
KW: G-API tests - fixes for uninitialized variables
Yashas Samaga B L [Sat, 29 Feb 2020 08:46:14 +0000 (14:16 +0530)]
Merge pull request #16658 from YashasSamaga:cuda4dnn-refactor-activations
cuda4dnn(activations, eltwise, scale_shift): refactor to reduce code duplication
* refactor activations
* refactor eltwise kernels
* move all functors to functors.hpp
* remove bias1 and scale1 kernels
Alexander Alekhin [Fri, 28 Feb 2020 18:34:37 +0000 (18:34 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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 14:41:07 +0000 (14:41 +0000)]
Merge pull request #16677 from Bleach665:Qt_imshow_clipbrd
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 20:55:49 +0000 (20:55 +0000)]
Merge pull request #16688 from alalek:issue_16679
Alexander Alekhin [Thu, 27 Feb 2020 20:42:45 +0000 (20:42 +0000)]
Merge pull request #16685 from YashasSamaga:cuda4dnn-fix-tests-pr16595
YashasSamaga [Fri, 28 Feb 2020 10:14:37 +0000 (15:44 +0530)]
disable MaskRCNN test for CUDA_FP16
Alexander Alekhin [Thu, 27 Feb 2020 19:52:02 +0000 (19:52 +0000)]
Merge pull request #16687 from dkurt:dnn_ngraph_hetero
Alexander Alekhin [Thu, 27 Feb 2020 19:43:06 +0000 (19:43 +0000)]
gapi(test): fix check
Alexander Alekhin [Thu, 27 Feb 2020 19:04:28 +0000 (19:04 +0000)]
Merge pull request #16682 from alalek:dnn_test_keypoints_face_myriad
Alexander Alekhin [Thu, 27 Feb 2020 17:05:27 +0000 (17:05 +0000)]
Merge pull request #16683 from saskatchewancatch:issue-16680
Alexander Alekhin [Thu, 27 Feb 2020 05:36:59 +0000 (05:36 +0000)]
dnn(test): adjust check tolerance in Keypoints_face
Dmitry Kurtaev [Thu, 27 Feb 2020 14:45:28 +0000 (17:45 +0300)]
Track Hetero execution for nGraph networks using ngraph::Function
Rajkiran Natarajan [Thu, 27 Feb 2020 06:59:02 +0000 (22:59 -0800)]
Fix annoying compiler warning.
Alexander Alekhin [Wed, 26 Feb 2020 17:09:03 +0000 (20:09 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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 14:36:08 +0000 (14:36 +0000)]
Merge pull request #16657 from alalek:issue_16655_master
Alexander Alekhin [Wed, 26 Feb 2020 14:03:52 +0000 (14:03 +0000)]
Merge pull request #16673 from alalek:exclude_contrib_modules_4.x
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 12:10:30 +0000 (15:10 +0300)]
exclude opencv_contrib modules
Alexander Alekhin [Wed, 26 Feb 2020 11:44:16 +0000 (11:44 +0000)]
Merge pull request #16670 from alalek:update_valgrind_suppressions
Alexander Alekhin [Sun, 23 Feb 2020 17:49:50 +0000 (17:49 +0000)]
gapi(test): ban and get rid of countNonZero() checks
Maksim Shabunin [Thu, 13 Feb 2020 11:25:47 +0000 (14:25 +0300)]
Use BufferArea in more places
Alexander Alekhin [Fri, 21 Feb 2020 20:52:01 +0000 (20:52 +0000)]
valgrind: update suppression rules
Ivan Galanin [Tue, 25 Feb 2020 19:04:11 +0000 (22:04 +0300)]
Merge pull request #16639 from iigalanin:patch-1
* Update to new ICV packages
MacOS ia32 ICV package is no longer built.
* cmake(ippicv): add Apple 32-bit check
* Updated commit hash
Alexander Alekhin [Tue, 25 Feb 2020 12:57:11 +0000 (12:57 +0000)]
Merge pull request #16650 from ashishkrshrivastava:cvdarknet
Alexander Alekhin [Mon, 24 Feb 2020 20:53:14 +0000 (20:53 +0000)]
Merge pull request #16661 from alalek:dnn_test_32bit_part2
Alexander Alekhin [Mon, 24 Feb 2020 18:22:06 +0000 (18:22 +0000)]
Merge pull request #16648 from YashasSamaga:cuda4dnn-hotfix-i16467
Alexander Alekhin [Mon, 24 Feb 2020 18:18:33 +0000 (18:18 +0000)]
dnn(test): configure filtering for 32-bit systems (part 2)
YashasSamaga [Mon, 24 Feb 2020 05:15:59 +0000 (10:45 +0530)]
resize tensor on reuse if required
Alexander Alekhin [Sun, 23 Feb 2020 17:09:31 +0000 (17:09 +0000)]
Merge pull request #16629 from alalek:dnn_test_32bit
Alexander Alekhin [Sun, 23 Feb 2020 17:05:05 +0000 (17:05 +0000)]
core(MatExpr): fix .type() bug
ashishiva3@gmail.com [Sun, 23 Feb 2020 06:16:12 +0000 (11:46 +0530)]
Darknet_io: Parsing for cost layer added
Alexander Alekhin [Sat, 22 Feb 2020 22:21:56 +0000 (22:21 +0000)]
Merge pull request #16647 from YashasSamaga:cuda4dnn-hotfix-i16568
Alexander Alekhin [Thu, 20 Feb 2020 20:23:19 +0000 (20:23 +0000)]
dnn(test): configure filtering for 32-bit systems
Gourav Roy [Sat, 22 Feb 2020 11:42:26 +0000 (17:12 +0530)]
Merge pull request #16586 from themechanicalcoder:video-psnr
* add python version of video-input-psnr-ssim
* remove ret
* documentation changes
* added link for python file
* command line argument
YashasSamaga [Sat, 22 Feb 2020 11:29:09 +0000 (16:59 +0530)]
fix weights rank assertion in InnerProductOp
Alexander Alekhin [Fri, 21 Feb 2020 19:50:09 +0000 (19:50 +0000)]
Merge pull request #16641 from alalek:fix_build_msvs2019
Alexander Alekhin [Fri, 21 Feb 2020 19:39:54 +0000 (22:39 +0300)]
Merge pull request #16616 from alalek:dnn_fix_input_shape
* dnn: fix processing of input shapes
- importer: avoid using of .setInput() => .setInputShape()
- setInput: shape limitation check (partial)
* dnn(test): test .setInput() in readNet()
Alexander Alekhin [Fri, 21 Feb 2020 19:37:23 +0000 (22:37 +0300)]
Merge pull request #16225 from berak:dnn_pose_estimation
dnn: small fix in pose estimation model
Alexander Alekhin [Fri, 21 Feb 2020 19:35:03 +0000 (22:35 +0300)]
Merge pull request #13928 from catree:add_matx_div_operations
Vadim Pisarevsky [Fri, 21 Feb 2020 15:18:24 +0000 (18:18 +0300)]
Merge pull request #16594 from vpisarev:hull_ordering_fix
fixed the ordering of contour convex hull points
* partially fixed the issue #4539
* fixed warnings and test failures
* fixed integer overflow (issue #14521)
* added comment to force buildbot to re-run
* extended the test for the issue 4539. Check the expected behaviour on the original contour as well
* added comment; fixed typo, renamed another variable for a little better clarity
* added yet another part to the test for issue #4539, where we run convexHull and convexityDetects on the original contour, without any manipulations. the rest of the test stays the same
Alexander Alekhin [Fri, 21 Feb 2020 14:48:28 +0000 (17:48 +0300)]
3rdparty(openexr): fix compilation with MSVS2019
Alexander Alekhin [Fri, 21 Feb 2020 13:15:40 +0000 (13:15 +0000)]
Merge pull request #16635 from mshabunin:fix-avx512-cvt
Vadim Pisarevsky [Fri, 21 Feb 2020 13:13:41 +0000 (16:13 +0300)]
Merge pull request #16608 from vpisarev:fix_mac_ocl_tests
* fixed several problems when running tests on Mac:
* OCL_pyrUp
* OCL_flip
* some basic UMat tests
* histogram badarg test (out of range access)
* retained the storepix fix in ocl_flip only for 16U/16S datatype, where the OpenCL compiler on Mac generates incorrect code
* moved deletion of ACCESS_FAST flag to non-SVM branch (where SVM is shared virtual memory (in OpenCL 2.x), not support vector machine)
* force OpenCL to use read/write for GPU<=>CPU memory transfers on machines with discrete video only on Macs. On Windows/Linux the drivers are seemingly smart enough to implement map/unmap properly (and maybe more efficiently than explicit read/write)
Maksim Shabunin [Fri, 21 Feb 2020 12:17:34 +0000 (15:17 +0300)]
intrin: fixed int64->double conversion for AVX-512
Alexander Smorkalov [Fri, 21 Feb 2020 06:57:37 +0000 (09:57 +0300)]
Added test for new MatX division.
Alexander Alekhin [Thu, 20 Feb 2020 16:45:21 +0000 (19:45 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
berak [Mon, 27 Jan 2020 16:17:11 +0000 (17:17 +0100)]
dnn: small fix in pose estimation model
Alexander Alekhin [Thu, 20 Feb 2020 15:31:57 +0000 (15:31 +0000)]
Merge pull request #16610 from AbsorbedInThought:patch-1
Muhammad Taha [Tue, 18 Feb 2020 05:22:41 +0000 (10:22 +0500)]
Minor update in grabcut.py
Alexander Alekhin [Thu, 20 Feb 2020 12:50:27 +0000 (12:50 +0000)]
Merge pull request #16595 from dkurt:dnn_ie_mask_rcnn
Yashas Samaga B L [Thu, 20 Feb 2020 12:43:05 +0000 (18:13 +0530)]
Merge pull request #16161 from YashasSamaga:cuda4dnn-concat-fusion
cuda4dnn(concat): write outputs from previous layers directly into concat's output
* eliminate concat by directly writing to its output buffer
* fix concat fusion not happening sometimes
* use a whitelist instead of a blacklist
Aditya Kumar [Thu, 20 Feb 2020 12:41:55 +0000 (18:11 +0530)]
Merge pull request #14107 from adityak2920:aditya
Adding python codes to samples/python
* Python version of samples:
- laplace.py
- drawing.py
* Update drawing.py
* Update drawing.py
* Update drawing.py
* Update laplace.py
* Update laplace.py
* Update drawing.py
* Update drawing.py
* Update laplace.py
* samples
* drawing
* drawing
* drawing.py
Alexander Alekhin [Thu, 20 Feb 2020 11:18:43 +0000 (14:18 +0300)]
Merge pull request #16619 from alalek:cmake_custom_cxx_standard_master
* cmake: allow customization of CMAKE_CXX_STANDARD value
* cmake: extra skip flag OPENCV_SKIP_CMAKE_CXX_STANDARD
* cmake: dump CMAKE_CXX_STANDARD value
- compiler option is missing in dumped flags
Dmitry Kurtaev [Sun, 16 Feb 2020 19:12:14 +0000 (22:12 +0300)]
Enable Mask R-CNN with Inference Engine. Full coverage with nGraph
Alexander Alekhin [Thu, 20 Feb 2020 06:47:55 +0000 (06:47 +0000)]
Merge pull request #16503 from cyyever:fix_16500
cyy [Thu, 20 Feb 2020 03:08:04 +0000 (11:08 +0800)]
fixes #16500
Alexander Alekhin [Wed, 19 Feb 2020 10:57:27 +0000 (10:57 +0000)]
Merge pull request #16617 from alalek:dnn_fix_caffe_importer
Alexander Alekhin [Wed, 19 Feb 2020 07:08:01 +0000 (07:08 +0000)]
dnn(caffe): fix net.input_dim handling in Caffe importer
Alexander Alekhin [Tue, 18 Feb 2020 19:31:38 +0000 (19:31 +0000)]
Merge pull request #16612 from rabbull:master
Karl Liu [Tue, 18 Feb 2020 12:21:24 +0000 (20:21 +0800)]
transplant 8p's normalization to 7p
use const instead of constexpr
Alexander Alekhin [Tue, 18 Feb 2020 14:57:46 +0000 (17:57 +0300)]
Merge pull request #16572 from alalek:dnn_test_dldt_ir_v10
* dnn(test): test DLDT IRv10 model, drop old models
* dnn(test): don't expect bitexact results in DLDT IR tests
Dmitry Matveev [Tue, 18 Feb 2020 12:11:44 +0000 (15:11 +0300)]
Merge pull request #16555 from dmatveev:dm/ocv_blog_sample
* G-API/Samples: Added a simple "privacy masking camera" sample
The main idea is to host this code for an opencv.org blog post only
* G-API/Samples: Modified privacy masking camera code to look better for the post
* G-API/Samples: fix Windows (MSVC) support in Privacy Masking Camera
* G-API/Samples: Addressed the majority of review comments in PMC
* G-API/Samples: Use TickMeter to measure time + more info in cmd options
* G-API/Samples: fix yet another Windows warning in PMC
* G-API/Samples: Fix wording in PMC cmd arg parameters
* Fix wording, again
* G-API/Samples: Fix PMC cmd-line arguments, again
Anatoliy Talamanov [Mon, 17 Feb 2020 20:29:55 +0000 (23:29 +0300)]
Merge pull request #16213 from TolyaTalamanov:at/lambdas-for-kernels
G-API: Using functors as kernel implementation
* Implement ability to create kernel impls from functors
* Clean up
* Replace make_ocv_functor to ocv_kernel
* Clean up
* Replace GCPUFunctor -> GOCVFunctor
* Move GOCVFunctor to cv::gapi::cpu namespace
* Implement override for rvalue and lvalue cases
* Fix comments to review
* Remove GAPI_EXPORT for template functions
* Fix indentation
Liubov Batanina [Mon, 17 Feb 2020 19:29:37 +0000 (22:29 +0300)]
Merge pull request #16472 from l-bat:cp_vton
Add CP-VTON sample
* Support resize from PyTorch
* Add CP-VTON sample
* Fix downsampling
* Fix test
* Add model links
* Add default args
* Speed up resize
* Fix TOM link
* Add default args
* Fix comments
* Set aspect ratio for input
* Update links
* Check files exist
Alexander Alekhin [Mon, 17 Feb 2020 13:17:35 +0000 (13:17 +0000)]
Merge pull request #16600 from alalek:revert_16497
Alexander Alekhin [Mon, 17 Feb 2020 12:23:59 +0000 (15:23 +0300)]
imgproc: revert resize changes from PR 16497
Vadim Pisarevsky [Mon, 17 Feb 2020 11:54:36 +0000 (14:54 +0300)]
Merge pull request #16588 from vpisarev:fix_macos_move_window
fixed cv::moveWindow() on mac
* fixed cv::moveWindow() on mac (issue #16343). Thanks to cwreynolds and saskatchewancatch for the help!
* fixed warnings about _x0 and _y0
* fixed warnings about _x0 and _y0
keeper121 [Sun, 16 Feb 2020 16:33:25 +0000 (19:33 +0300)]
Merge pull request #16497 from keeper121:master
* Fix NN resize with dimentions > 4
* add test check for nn resize with channels > 4
* Change types from float to double
* Del unnecessary test file. Move nn test to test_imgwarp. Add 5 channels test only.
atinfinity [Sun, 16 Feb 2020 16:16:33 +0000 (01:16 +0900)]
Merge pull request #16445 from atinfinity:fixed-typo
* fixed typo
* add compatibility code to handle migration
Gagandeep Singh [Sat, 15 Feb 2020 11:12:20 +0000 (16:42 +0530)]
Merge pull request #16424 from czgdp1807:issue-16370
* fixed Split layer in ONNXImporter
* added test for fix of split layer
* fixed tests for Split layer
* applied reviews
* updated tests
* fixed paths in tests
Alexander Alekhin [Fri, 14 Feb 2020 16:25:45 +0000 (19:25 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vadim Pisarevsky [Fri, 14 Feb 2020 16:16:41 +0000 (19:16 +0300)]
Merge pull request #16561 from vpisarev:better_hough_circles
* improved version of HoughCircles (HOUGH_GRADIENT_ALT method)
* trying to fix build problems on Windows
* fixed typo
* * fixed warnings on Windows
* make use of param2. make it minCos2 (minimal value of squared cosine between the gradient at the pixel edge and the vector connecting it with circle center). with minCos2=0.85 we can detect some more eyes :)
* * added description of HOUGH_GRADIENT_ALT
* cleaned up the implementation; added comments, replaced built-in numeic constants with symbolic constants
* rewrote circle_popcount() to use built-in popcount() if possible
* modified some of HoughCircles tests to use method parameter instead of the built-in loop
* fixed warnings on Windows
Alexander Alekhin [Fri, 14 Feb 2020 16:11:36 +0000 (16:11 +0000)]
Merge pull request #16580 from dkurt:fix_14566
Dmitry Kurtaev [Thu, 13 Feb 2020 21:21:38 +0000 (00:21 +0300)]
Resolve #14566
Alexander Alekhin [Thu, 13 Feb 2020 19:28:56 +0000 (19:28 +0000)]
Merge pull request #16559 from alalek:cmake_msvc_mp_customize
Alexander Alekhin [Wed, 12 Feb 2020 18:17:44 +0000 (18:17 +0000)]
Merge pull request #16567 from alalek:dnn_updates_from_openvino_2020.1
Alexander Alekhin [Wed, 12 Feb 2020 14:22:44 +0000 (17:22 +0300)]
dnn: turn off visibility workaround for OpenVINO 2020.1
Alexander Alekhin [Tue, 14 Jan 2020 13:20:12 +0000 (16:20 +0300)]
dnn: use OpenVINO 2020.1 defines
Alexander Alekhin [Tue, 11 Feb 2020 14:24:52 +0000 (17:24 +0300)]
cmake: update handling of MSVC /MP flag
Alexander Alekhin [Tue, 11 Feb 2020 16:22:32 +0000 (16:22 +0000)]
Merge pull request #16516 from alalek:dnn_dump_network
Vadim Pisarevsky [Tue, 11 Feb 2020 15:46:15 +0000 (18:46 +0300)]
Merge pull request #16488 from vpisarev:filestorage_longlines
trying to fix handling file storages with extremely long lines
* trying to fix handling of file storages with extremely long lines: https://github.com/opencv/opencv/issues/11061
* * fixed errorneous pointer access in JSON parser.
* it's now crash-test time! temporarily set the initial parser buffer size to just 40 bytes. let's run all the test and check if the buffer is always correctly resized and handled
* fixed pointer use in JSON parser; added the proper test to catch this case
* fixed the test to make it more challenging. generate test json with
*
**
***
etc. shape
Alexander Alekhin [Tue, 11 Feb 2020 10:03:12 +0000 (10:03 +0000)]
Merge pull request #16552 from dkurt:3.4_docs
Alexander Alekhin [Tue, 11 Feb 2020 10:02:52 +0000 (10:02 +0000)]
Merge pull request #16549 from rayonnant14:objdetect_QRCode_issue_memory_allocation
Dmitry Kurtaev [Tue, 11 Feb 2020 06:31:16 +0000 (09:31 +0300)]
3.4 docs for 3.4 branch
rayonnant14 [Mon, 10 Feb 2020 17:21:58 +0000 (20:21 +0300)]
fix wrong memory allocation
Alexander Alekhin [Mon, 10 Feb 2020 16:40:29 +0000 (19:40 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 10 Feb 2020 16:28:55 +0000 (16:28 +0000)]
Merge pull request #16542 from asmorkalov:asmorkal/base64_json
Alexander Alekhin [Mon, 10 Feb 2020 16:28:31 +0000 (16:28 +0000)]
Merge pull request #16539 from baka-gori:bugfix_cudacodec