Alexander Alekhin [Mon, 9 Mar 2020 19:50:00 +0000 (19:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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>
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 19:06:47 +0000 (22:06 +0300)]
Merge pull request #16754 from alalek:issue_16752
* core(test): FP16 norm test
* core: norm()-FP16 disable OpenCL
* core(norm): fix 16f32f local buffer size
Alexander Alekhin [Fri, 6 Mar 2020 20:00:55 +0000 (20:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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 13:18:41 +0000 (13:18 +0000)]
Merge pull request #16694 from alalek:dnn_disable_nn_builder_api
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 11:30:48 +0000 (14:30 +0300)]
Merge pull request #16690 from asmorkalov:bug_template
Added checklist and recommendations to issue template
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 [Thu, 5 Mar 2020 11:56:07 +0000 (11:56 +0000)]
Merge pull request #16513 from pwuertz:cuda_py_interop
Alexander Alekhin [Thu, 5 Mar 2020 10:58:51 +0000 (10:58 +0000)]
Merge pull request #16577 from Volskig:mp/ocv-gapi-work
Alexander Alekhin [Thu, 5 Mar 2020 10:53:23 +0000 (10:53 +0000)]
Merge pull request #16693 from Volskig:mp/ocv-gapi-add-include
Maxim Pashchenkov [Thu, 5 Mar 2020 08:52:10 +0000 (11:52 +0300)]
Added assert for create Mat with negative dims, added tets for this case
Maxim Pashchenkov [Thu, 5 Mar 2020 08:41:36 +0000 (11:41 +0300)]
Rm imgproc from render.cpp
Alexander Alekhin [Wed, 4 Mar 2020 20:49:09 +0000 (20:49 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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
Alexander Alekhin [Tue, 3 Mar 2020 11:45:24 +0000 (11:45 +0000)]
Merge pull request #16720 from anton-potapov:kw_fixes
Maksim Shabunin [Mon, 2 Mar 2020 12:33:42 +0000 (15:33 +0300)]
MSMF: fixed issue with camera format selection
Anton Potapov [Tue, 3 Mar 2020 08:37:40 +0000 (11:37 +0300)]
KW: G-API tests - fixes for uninitialized variables
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 [Thu, 27 Feb 2020 13:02:32 +0000 (16:02 +0300)]
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
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 Smorkalov [Fri, 28 Feb 2020 07:01:24 +0000 (10:01 +0300)]
Added checklist and recommendations to issue template.
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 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 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
Peter Würtz [Tue, 4 Feb 2020 17:25:48 +0000 (18:25 +0100)]
Allow access to CUDA memory and stream pointers for interoperability.
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