Alexander Alekhin [Wed, 3 Apr 2019 14:35:54 +0000 (14:35 +0000)]
Merge pull request #14144 from alalek:issue_14143
Alexander Alekhin [Tue, 2 Apr 2019 20:54:41 +0000 (20:54 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 2 Apr 2019 16:34:41 +0000 (16:34 +0000)]
Merge pull request #14234 from alalek:backport_14203
Alexander Alekhin [Tue, 2 Apr 2019 16:27:12 +0000 (16:27 +0000)]
Merge pull request #14217 from alalek:fix_world_gapi_tests
Alexander Alekhin [Tue, 2 Apr 2019 16:17:59 +0000 (16:17 +0000)]
Merge pull request #14175 from paroj:copyto
Alexander Alekhin [Sun, 31 Mar 2019 12:14:42 +0000 (12:14 +0000)]
imgcodecs(sunras): avoid undefined shift
backporting of commit:
f2803aba07c1c522b409cce5390e757f54d7794d
Alexander Alekhin [Tue, 2 Apr 2019 15:15:13 +0000 (15:15 +0000)]
Merge pull request #14203 from alalek:fix_ossfuzz_13292
Alexander Alekhin [Tue, 2 Apr 2019 14:35:50 +0000 (14:35 +0000)]
Merge pull request #14228 from dkurt:conv_1x1
Alexander Alekhin [Tue, 2 Apr 2019 14:34:36 +0000 (14:34 +0000)]
Merge pull request #14222 from alalek:cmake_remove_test_include_dirs
Alexander Alekhin [Tue, 2 Apr 2019 14:33:57 +0000 (14:33 +0000)]
Merge pull request #14223 from alalek:backport_14201
Dmitry Kurtaev [Tue, 2 Apr 2019 11:05:17 +0000 (14:05 +0300)]
Enable 1x1 convolution optimization
Alexander Alekhin [Mon, 1 Apr 2019 14:31:03 +0000 (17:31 +0300)]
gapi: fix tests build
Alexander Alekhin [Mon, 1 Apr 2019 14:30:10 +0000 (17:30 +0300)]
cmake: don't add tests dirs as include directories
- use relative paths for includes
- fix PCH generation with GCC (dummy file has been used)
Alexander Alekhin [Tue, 2 Apr 2019 09:57:26 +0000 (09:57 +0000)]
Merge pull request #14225 from zuoshaobo:my3.4
Alexander Alekhin [Tue, 2 Apr 2019 09:38:05 +0000 (09:38 +0000)]
Merge pull request #14227 from dkurt:fix_build_with_ie
Alexander Alekhin [Mon, 1 Apr 2019 14:30:10 +0000 (17:30 +0300)]
cmake: don't add tests dirs as include directories
- use relative paths for includes
- fix PCH generation with GCC (dummy file has been used)
Dmitry Kurtaev [Tue, 2 Apr 2019 08:54:50 +0000 (11:54 +0300)]
Fix build with IE > 2018R5
zuoshaobo [Tue, 2 Apr 2019 07:20:53 +0000 (03:20 -0400)]
add support for tf.add_n operation
Alexander Alekhin [Mon, 1 Apr 2019 18:47:00 +0000 (18:47 +0000)]
Merge pull request #14201 from alalek:fix_ossfuzz_13295
Alexander Alekhin [Mon, 1 Apr 2019 15:11:10 +0000 (18:11 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 1 Apr 2019 14:39:25 +0000 (14:39 +0000)]
Merge pull request #14214 from alalek:backport_14202
Alexander Alekhin [Mon, 1 Apr 2019 14:38:07 +0000 (14:38 +0000)]
Merge pull request #14212 from dkurt:reduce_ie_models_tests
Alexander Alekhin [Mon, 1 Apr 2019 14:17:37 +0000 (14:17 +0000)]
Merge pull request #14207 from alalek:fix_leak_eigenvalue_decomposition
Alexander Alekhin [Sun, 31 Mar 2019 11:50:33 +0000 (11:50 +0000)]
imgcodecs(tiff): avoid leak of helper struct on malformed inputs
backporting of commit:
45428b897fa718ca44ac7834d6a1ee6f6b64a3f6
Alexander Alekhin [Mon, 1 Apr 2019 14:03:13 +0000 (14:03 +0000)]
Merge pull request #14194 from alalek:backport_14193
Dmitry Kurtaev [Mon, 1 Apr 2019 12:15:00 +0000 (15:15 +0300)]
Reduce number of tested models from OpenVINO
Alexander Alekhin [Mon, 1 Apr 2019 11:04:20 +0000 (11:04 +0000)]
Merge pull request #14200 from alalek:fix_imgcodecs_stream_set_pos
Alexander Alekhin [Sun, 31 Mar 2019 21:48:44 +0000 (21:48 +0000)]
core(lda): don't perform calculations in constructor
- exceptions from constructor will not cause destructor calls
Alexander Alekhin [Sun, 31 Mar 2019 20:58:17 +0000 (20:58 +0000)]
Merge pull request #14206 from alalek:issue_14205
Alexander Alekhin [Sun, 31 Mar 2019 19:54:13 +0000 (19:54 +0000)]
cmake: fix CUDA world build
Alexander Alekhin [Sun, 31 Mar 2019 14:39:20 +0000 (14:39 +0000)]
Merge pull request #14202 from alalek:fix_ossfuzz_13285
Alexander Alekhin [Sun, 31 Mar 2019 12:56:57 +0000 (12:56 +0000)]
Merge pull request #14198 from alalek:issue_14195
Alexander Alekhin [Sun, 31 Mar 2019 10:16:49 +0000 (10:16 +0000)]
imgcodecs: fix RBaseStream::setPos() outside of current block
Seeking outside of the current block doesn't update actual data,
so getByte()/etc will get wrong data from stalled buffer.
Alexander Alekhin [Sun, 31 Mar 2019 12:14:42 +0000 (12:14 +0000)]
imgcodecs(sunras): avoid undefined shift
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13292
Alexander Alekhin [Sun, 31 Mar 2019 11:50:33 +0000 (11:50 +0000)]
imgcodecs(tiff): avoid leak of helper struct on malformed inputs
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13285
Alexander Alekhin [Sun, 31 Mar 2019 11:14:42 +0000 (11:14 +0000)]
Merge pull request #14199 from devnexen:openbsd_build_fix
Alexander Alekhin [Sun, 31 Mar 2019 10:43:30 +0000 (10:43 +0000)]
imgcodecs(bmp): limit size of processed images
2Gb+ images can't be handled properly by current implementation
backporting of commit:
50a6f9d251bfe9c3aec6c977391f38a7b790fe4c
Alexander Alekhin [Sun, 31 Mar 2019 10:43:30 +0000 (10:43 +0000)]
imgcodecs(bmp): limit size of processed images
2Gb+ images can't be handled properly by current implementation
ozz-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13295
David Carlier [Sun, 31 Mar 2019 09:38:35 +0000 (10:38 +0100)]
OpenBSD build fix
required for close calls.
Alexander Alekhin [Sun, 31 Mar 2019 08:51:09 +0000 (08:51 +0000)]
cmake: fix build of dnn tests with shared common code
- don't share .cpp files (PCH support is broken)
Alexander Alekhin [Sun, 31 Mar 2019 08:18:55 +0000 (08:18 +0000)]
Merge pull request #14196 from seiko2plus:issue14195
Sayed Adel [Sun, 31 Mar 2019 01:28:33 +0000 (03:28 +0200)]
dnn:perf add missing definition __OPENCV_TEST to fix pch
Alexander Alekhin [Sat, 30 Mar 2019 18:19:41 +0000 (18:19 +0000)]
3rdparty(zlib): prevent uninitialized use of state->check
backporting of commit:
8afb2f0cb7a712d03dd58a2873fc449215df153d
Alexander Alekhin [Sat, 30 Mar 2019 20:26:15 +0000 (20:26 +0000)]
Merge pull request #14193 from alalek:fix_ossfuzz_13317
Alexander Alekhin [Sat, 30 Mar 2019 18:19:41 +0000 (18:19 +0000)]
3rdparty(zlib): prevent uninitialized use of state->check
ozz-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13317
PR: https://github.com/opencv/opencv/pull/14193
zlib upstream bug: madler/zlib#245
Ported fix: https://chromium.googlesource.com/chromium/src/+/
ee376c65abdd5afe787bfb63af9f2e82fdc35c2e
Alexander Alekhin [Fri, 29 Mar 2019 19:21:47 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Maksim Shabunin [Fri, 29 Mar 2019 14:52:22 +0000 (17:52 +0300)]
Merge pull request #14156 from mshabunin:videowriter-bad-test
* videoio: added bad parameters handling to VideoWriter
* AVFoundation/Writer: support UTF-8, check input parameters
Lubov Batanina [Fri, 29 Mar 2019 13:42:58 +0000 (16:42 +0300)]
Merge pull request #13932 from l-bat:MyriadX_master_dldt
* Fix precision in tests for MyriadX
* Fix ONNX tests
* Add output range in ONNX tests
* Skip tests on Myriad OpenVINO 2018R5
* Add detect MyriadX
* Add detect MyriadX on OpenVINO R5
* Skip tests on Myriad next version of OpenVINO
* dnn(ie): VPU type from environment variable
* dnn(test): validate VPU type
* dnn(test): update DLIE test skip conditions
Pavel Rojtberg [Thu, 28 Mar 2019 11:08:36 +0000 (12:08 +0100)]
core: python - test cv::copyTo with pre-allocated dst
George Wilson [Thu, 28 Mar 2019 19:31:38 +0000 (19:31 +0000)]
Merge pull request #14154 from GeorgeWilson96:bugfix/14148
* Fixed #14148 Broken Documentation Link
* fixup: use 3.4 branch
Alexander Alekhin [Mon, 25 Mar 2019 14:56:55 +0000 (17:56 +0300)]
gapi: fix build with Intel Compiler 2019
Alexander Alekhin [Thu, 28 Mar 2019 14:57:07 +0000 (14:57 +0000)]
Merge pull request #14177 from alalek:fix_14173
Alexander Alekhin [Thu, 28 Mar 2019 14:37:35 +0000 (14:37 +0000)]
Merge pull request #14166 from dkurt:fix_slim_mobilenet_v2
Alexander Alekhin [Thu, 28 Mar 2019 14:25:27 +0000 (14:25 +0000)]
Merge pull request #14170 from alalek:cmake_hide_helper_modules
Alexander Alekhin [Thu, 28 Mar 2019 14:23:39 +0000 (14:23 +0000)]
Merge pull request #14168 from alalek:dnn_fix_drop_IE_2018R2
Alexander Alekhin [Thu, 28 Mar 2019 13:51:11 +0000 (16:51 +0300)]
cmake: emit error if CUDA is enabled without opencv_contrib
Alexander Alekhin [Thu, 28 Mar 2019 13:45:45 +0000 (13:45 +0000)]
Merge pull request #14172 from smirnov-alexey:gapi_fix_nv12_valgrind
smirnov-alexey [Thu, 28 Mar 2019 09:59:51 +0000 (12:59 +0300)]
Fix valgrind issue in NV12 test
Alexander Alekhin [Wed, 27 Mar 2019 21:42:24 +0000 (21:42 +0000)]
cmake: hide helper modules
- bindings generators
- keep "ts" module
Alexander Alekhin [Wed, 27 Mar 2019 18:29:24 +0000 (18:29 +0000)]
dnn: fix support drop for IE<2018R3
- fix build with IE 2018R3
Alexander Alekhin [Wed, 27 Mar 2019 12:48:00 +0000 (15:48 +0300)]
Merge pull request #14162 from alalek:eliminate_coverity_scan_issues
core: eliminate coverity scan issues (#14162)
* core(hal): avoid using of r,g,b,a parameters in interleave/deinterleave
- static analysis tools blame on possible parameters reordering
- align AVX parameters with corresponding SSE/NEO/VSX/cpp code
* core: avoid "i,j" parameters in Matx methods
- static analysis tools blame on possible parameters reordering
* core: resolve coverity scan issues
Alexander Alekhin [Wed, 27 Mar 2019 12:46:50 +0000 (12:46 +0000)]
Merge pull request #14102 from alalek:core_refactor_eigenvalues
Dmitry Kurtaev [Wed, 27 Mar 2019 12:10:57 +0000 (15:10 +0300)]
Fix Mobilenet v2 from TensorFlow slim
Alexander Alekhin [Tue, 26 Mar 2019 18:55:53 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 26 Mar 2019 17:16:58 +0000 (17:16 +0000)]
Merge pull request #14146 from alalek:cmake_cmp0068
Alexander Alekhin [Tue, 26 Mar 2019 17:04:52 +0000 (17:04 +0000)]
Merge pull request #13989 from kohei-us:onnx-conv-transpose-output-shape
Alexander Alekhin [Tue, 26 Mar 2019 15:34:49 +0000 (15:34 +0000)]
Merge pull request #14155 from alalek:fix_macos_ocl_warnings_3.4
Kohei Yoshida [Thu, 7 Mar 2019 16:42:57 +0000 (11:42 -0500)]
Add a test case for handling output_shape property for deconvolution layer.
Kohei Yoshida [Thu, 28 Feb 2019 19:16:27 +0000 (14:16 -0500)]
Make use of explicit output shape for the de-convolution layer.
This is relevant to cases where the net is loaded from an ONNX model
containing ConvTranspose layers, which may include the output_shape
attribute.
c.f. https://github.com/onnx/onnx/blob/master/docs/Operators.md#ConvTranspose
Alexander Alekhin [Tue, 26 Mar 2019 10:11:53 +0000 (13:11 +0300)]
ocl: define CL_SILENCE_DEPRECATION on MacOSX
Alexander Alekhin [Mon, 25 Mar 2019 18:58:28 +0000 (18:58 +0000)]
Merge pull request #14142 from mshabunin:fix-c-api-3.4
Alexander Alekhin [Mon, 25 Mar 2019 16:24:49 +0000 (19:24 +0300)]
cmake: set CMP0068 => NEW
Alexander Alekhin [Mon, 25 Mar 2019 13:45:25 +0000 (13:45 +0000)]
Merge pull request #14141 from dkurt:dnn_ie_relax_lrn
Maksim Shabunin [Mon, 25 Mar 2019 13:44:08 +0000 (16:44 +0300)]
Fixed cvdef.h for MSVC C users
Dmitry Kurtaev [Mon, 25 Mar 2019 09:49:02 +0000 (12:49 +0300)]
Extend LRN layer support with IE backend
iPanda [Sun, 24 Mar 2019 15:34:09 +0000 (23:34 +0800)]
Merge pull request #13972 from Mainvooid:add_cuda_support_for_D3D11_interop
* Add CUDA support for D3D11 interop. #13888
color_detail.hpp: fixed build error : dynamic initialization is not supported for a __constant__ variable.
directx.cpp: Add CUDA support(cl_nv_d3d11_sharing) for D3D11 interop. #13888
Update directx.cpp
Format adjustment.
Update directx.cpp
fix error.
Update directx.cpp
Format adjustment
Update directx.cpp
fix trailing whitespace.
fix format errors
convert indentation to spaces .
Trim trailing whitespace.
Add information about source of cl_d3d11_ext.h
Avoid unrelated changes.
Increase compile-time conditional judgment.
Increase the judgment of whether the OCL device has the required extensions at compile time.
Add compilation option `HAVE_CLNVEXT`.Check CL support in runtime.
Check result of `clGetExtensionFunctionAddressForPlatform` for KHR is invalid.It always can get the address(from OpenCL.dll),So I check NV support(from nvopencl64.dll) before KHR when `HAVE_CLNVEXT` is enabled.
Delete cl_d3d11_ext.h
Modified parameter list
fix "cannot open include file: 'CL/cl_d3d11_ext.h'"
remove not referenced var
fix C2143: syntax error
Improve compile-time judgment.
dlrectx.cpp Modify the detection order.
initializeContextFromD3D11Device:
```
// try with NV(Need to check it first)
// try with KHR
```
fix warnig C4100
Revert "fix warnig C4100"
This reverts commit
76e5becb67780071d0cbde61cc4f5f807ad7c5ac.
fix warning C4100
fix warning C4505
Format alignment
Format adjustment and automatically detect header files.
Automatically detect header files when users are not configured or configuration errors occur.
avoid unrelated changes.
Update .cmake
Update .cmake
* fix build errors
* fix warning:defined but not used
* Revert "fix warning:defined but not used"
This reverts commit
7ab3537cd070f89b15bc2926e4ac9ec74c84a122.
* fix warning:defined but not used
* fix build error for mac
* fix build error for win
* optimizing branch judgment
* Revert "optimizing branch judgment"
This reverts commit
88b72b870ec13fd26f64a5ac374484c5cfe80854.
* fix warning C4702: unreachable code
* remove unused code
* Fix problems that may lead to undefined behavior
* Add status check
* fix error C2664,C2665 : cannot convert argument
* Format adjustment
VSCODE will automatically format the indentation to 4 spaces in some situation.
* fix error C2440
* fix error C2440
* add cl_d3d11_ext.h
* Format adjustment
* remove unnecessary checks
Alexander Alekhin [Sat, 23 Mar 2019 12:09:46 +0000 (12:09 +0000)]
Merge pull request #14126 from brad-kelly:integral_avx512_cn1
Brad Kelly [Sat, 23 Feb 2019 00:57:50 +0000 (16:57 -0800)]
Implementing AVX512 Support for 1 channel mats for CV_64F format
Alexander Alekhin [Fri, 22 Mar 2019 16:31:31 +0000 (19:31 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 22 Mar 2019 15:10:46 +0000 (15:10 +0000)]
Merge pull request #14124 from alalek:fix_python_samples
Alexander Alekhin [Fri, 22 Mar 2019 15:10:25 +0000 (15:10 +0000)]
Merge pull request #14125 from alalek:cmake_ie_env_vars
Alexander Alekhin [Fri, 22 Mar 2019 10:34:19 +0000 (10:34 +0000)]
Merge pull request #14101 from alalek:core_fix_constexpt_fallback
Alexander Alekhin [Thu, 21 Mar 2019 15:58:22 +0000 (18:58 +0300)]
cmake: support OpenVINO env variable: INTEL_OPENVINO_DIR
Pedro Ferreira da Costa [Thu, 21 Mar 2019 19:53:12 +0000 (19:53 +0000)]
Merge pull request #14109 from PedroFerreiradaCosta:adding_python_version_to_anisotropic_tutorial
* Created python version of the code for the anisotropic image segmentation tutorial. Created python/cpp toggles for the markdown file.
* fix doxygen warnings
Alexander Alekhin [Thu, 21 Mar 2019 15:34:55 +0000 (18:34 +0300)]
samples: fix python samples compatibility with demo.py
Alexander Alekhin [Thu, 21 Mar 2019 13:25:39 +0000 (13:25 +0000)]
Merge pull request #14121 from seiko2plus:cmake_vsx_fix_aligned_test
Alexander Alekhin [Thu, 21 Mar 2019 13:23:11 +0000 (13:23 +0000)]
Merge pull request #14112 from alalek:android_pack_default_api21
Alexander Alekhin [Thu, 21 Mar 2019 13:22:55 +0000 (13:22 +0000)]
Merge pull request #14108 from alalek:fix_python_samples_3.4
Alexander Alekhin [Thu, 21 Mar 2019 09:55:31 +0000 (09:55 +0000)]
Merge pull request #14113 from Bharat123rox:calibration
Sayed Adel [Thu, 21 Mar 2019 09:19:15 +0000 (11:19 +0200)]
cmake:vsx Fix compilation fail on aligned runtime test when c++11 enabled
Bharat123Rox [Wed, 20 Mar 2019 16:48:29 +0000 (22:18 +0530)]
Remove dead link in calib3d.hpp
Alexander Alekhin [Wed, 20 Mar 2019 21:58:49 +0000 (21:58 +0000)]
Merge pull request #14096 from oseiskar:fix-android-sample-menus
Alexander Alekhin [Wed, 20 Mar 2019 16:07:59 +0000 (19:07 +0300)]
android: build package with API 21
enables Video I/O backend via Media NDK
Alexander Alekhin [Wed, 20 Mar 2019 16:20:46 +0000 (16:20 +0000)]
Merge pull request #14092 from mattismyname:fix-kmeans
Alexander Alekhin [Wed, 20 Mar 2019 16:04:20 +0000 (16:04 +0000)]
Merge pull request #14110 from seiko2plus:core_vsx_fp16
Matthew K. Gumbel [Tue, 19 Mar 2019 22:59:35 +0000 (15:59 -0700)]
flann/kmeans: Fix non-determinism of KMeans index
When running with >1 OpenCV thread, KMeans index generation was
non-deterministic because of a RWW race. Issue is resolved by removing
the offending logic from the parallel section.
Alexander Alekhin [Wed, 20 Mar 2019 15:39:40 +0000 (15:39 +0000)]
Merge pull request #14069 from terfendail:transform_wintr
Alexander Alekhin [Wed, 20 Mar 2019 15:35:05 +0000 (15:35 +0000)]
Merge pull request #14104 from alalek:android_build_sdk_reduce_mem_usage
Alexander Alekhin [Tue, 19 Mar 2019 18:03:58 +0000 (21:03 +0300)]
samples: fix python samples compatibility with demo.py
Sayed Adel [Wed, 20 Mar 2019 05:51:32 +0000 (07:51 +0200)]
core:vsx Add support for VSX3 half precision conversions