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 [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
Giles Payne [Tue, 19 Mar 2019 18:28:45 +0000 (03:28 +0900)]
Merge pull request #14005 from komakai:android-video-cap
* Add Android Media NDK video i/o file capture back-end
* Fix failing test
* Improve error handling/prevent resource leaks
* Add license text
* Modify default for WITH_ANDROID_MEDIANDK option
* Fix spelling of deleter_AMediaExtractor
Alexander Alekhin [Tue, 19 Mar 2019 15:15:52 +0000 (15:15 +0000)]
Merge pull request #14090 from andrey-golubev:gapi_unused_node_fluid_fix
Alexander Alekhin [Tue, 19 Mar 2019 14:59:58 +0000 (14:59 +0000)]
Merge pull request #14099 from seiko2plus:vsx_improvements_3
Alexander Alekhin [Tue, 19 Mar 2019 14:19:00 +0000 (14:19 +0000)]
Merge pull request #14103 from alalek:fixup_test_14089
Alexander Alekhin [Tue, 19 Mar 2019 13:50:08 +0000 (16:50 +0300)]
android: reduce memory consumption by gradle builds
Alexander Alekhin [Tue, 19 Mar 2019 12:18:43 +0000 (15:18 +0300)]
core: fix Core_EigenNonSymmetric.convergence test
Alexander Alekhin [Tue, 19 Mar 2019 10:33:36 +0000 (10:33 +0000)]
Merge pull request #14091 from alalek:core_cache_dir_version_update
Alexander Alekhin [Tue, 19 Mar 2019 10:33:03 +0000 (10:33 +0000)]
Merge pull request #14089 from alalek:fix_14088
Sayed Adel [Tue, 19 Mar 2019 07:18:12 +0000 (09:18 +0200)]
core:vsx Several improvements(3)
* optimize v_lut_deinterleave
* optimize v_interleave_/pairs/quads/triplets
* optimize v_lut, use vec_extract instead of aligned store
Alexander Alekhin [Tue, 19 Mar 2019 10:02:22 +0000 (13:02 +0300)]
core: fix fallback CV_CONSTEXPR definition
keep it empty to avoid failures of these declarations:
static CV_CONSTEXPR const int var = ...;
Otto Seiskari [Sun, 17 Mar 2019 15:32:43 +0000 (17:32 +0200)]
Remove fullscreen android:theme where it hides the menu
Many of the Android samples rely on an options menu to work properly
but, at least on newer devices, the menu is permanently hidden by the
Android theme "Theme.NoTitleBar.Fullscreen", which means that most
of the examples were dysfunctional.
Vitaly Tuzov [Wed, 19 Sep 2018 11:32:33 +0000 (14:32 +0300)]
transform() implementation updated to utilize wide universal intrinsics
Alexander Alekhin [Mon, 18 Mar 2019 16:14:06 +0000 (19:14 +0300)]
core: cache dir version update
Alexander Alekhin [Mon, 18 Mar 2019 15:40:03 +0000 (15:40 +0000)]
Merge pull request #14026 from Palmitoxico:android-ndk
Andrey Golubev [Mon, 18 Mar 2019 15:13:44 +0000 (18:13 +0300)]
[G-API] Allow unused nodes in Fluid backend
Allow nodes produced after some operation to be
"unused": not being an output and not being used
as inputs to other operations
Add fluid test to cover this case
Augusto Fraga Giachero [Mon, 18 Mar 2019 14:57:05 +0000 (11:57 -0300)]
Avoid unexpected line breaks in version_string.inc
The Android NDK 16b has a bug that sets the ANDROID_NDK_REVISION
variable incorrectly, generating an unexpected line break in the
middle of the string. This breaks the build as the generated
version_string.inc presents an invalid C string.
Remove leading and trailing line breaks, warns for line breaks in the
middle of 'msg' and escape them before appending to
OPENCV_BUILD_INFO_STR.
Alexander Alekhin [Mon, 18 Mar 2019 14:47:07 +0000 (17:47 +0300)]
core: add iterations limit check in eigenNonSymmetric()
Alexander Alekhin [Mon, 18 Mar 2019 13:13:40 +0000 (13:13 +0000)]
Merge pull request #14083 from PedroFerreiradaCosta:adding_quick_navigation_between_tutorials
Pedro Ferreira da Costa [Sun, 17 Mar 2019 15:35:14 +0000 (15:35 +0000)]
adding missing quick navigation to ImageProc module
Alexander Alekhin [Sat, 16 Mar 2019 16:54:11 +0000 (16:54 +0000)]
Merge pull request #14079 from npochhi:cmake_change
npochhi [Sat, 16 Mar 2019 14:54:06 +0000 (20:24 +0530)]
changes cmake_system_name matching condition
Alexander Alekhin [Fri, 15 Mar 2019 17:53:18 +0000 (17:53 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 15 Mar 2019 17:50:18 +0000 (17:50 +0000)]
Merge pull request #14071 from alalek:cmake_remove_unreferenced_functions
Alexander Alekhin [Fri, 15 Mar 2019 16:32:57 +0000 (16:32 +0000)]
Merge pull request #14059 from alalek:imgcodecs_disable_jasper
Alexander Alekhin [Fri, 15 Mar 2019 16:31:38 +0000 (16:31 +0000)]
Merge pull request #14057 from alalek:fix_libtiff_build
Alexander Alekhin [Fri, 15 Mar 2019 15:54:08 +0000 (18:54 +0300)]
cmake: clean unreferenced functions from OpenCV modules too
Alexander Alekhin [Fri, 15 Mar 2019 13:11:31 +0000 (13:11 +0000)]
Merge pull request #14070 from zuoshaobo:my3.4
zuoshaobo [Thu, 14 Mar 2019 07:08:58 +0000 (03:08 -0400)]
fix the region layer's output anchor size normalization error
Alexander Alekhin [Fri, 15 Mar 2019 11:33:08 +0000 (11:33 +0000)]
Merge pull request #14068 from alalek:fix_python_standalone_build
Alexander Alekhin [Fri, 15 Mar 2019 10:11:00 +0000 (13:11 +0300)]
python: update CMake install rules
Alexander Alekhin [Thu, 14 Mar 2019 20:52:30 +0000 (20:52 +0000)]
imgcodecs: OPENCV_IO_ENABLE_JASPER runtime parameter
Alexander Alekhin [Thu, 14 Mar 2019 19:32:45 +0000 (19:32 +0000)]
3rdparty: fix libtiff build
Keep `_FILE_OFFSET_BITS` undefined in Android builds.
Alexander Alekhin [Thu, 14 Mar 2019 13:36:57 +0000 (13:36 +0000)]
Merge pull request #14050 from npochhi:mlp_ann_eps_change
Alexander Alekhin [Thu, 14 Mar 2019 13:27:44 +0000 (13:27 +0000)]
Merge pull request #14051 from LaurentBerger:i14047
Alexander Alekhin [Thu, 14 Mar 2019 13:26:34 +0000 (13:26 +0000)]
Merge pull request #14048 from alalek:issue_13522
Alexander Alekhin [Thu, 14 Mar 2019 13:04:56 +0000 (13:04 +0000)]
Merge pull request #14054 from mshabunin:fix-dc1394
Alexander Alekhin [Thu, 14 Mar 2019 13:04:35 +0000 (13:04 +0000)]
Merge pull request #14040 from seiko2plus:issue13211
Maksim Shabunin [Thu, 14 Mar 2019 09:05:52 +0000 (12:05 +0300)]
Removed obsolete functions from cap_dc1394_v2.cpp
npochhi [Thu, 14 Mar 2019 08:31:34 +0000 (14:01 +0530)]
Changed eps checking condition
Sayed Adel [Wed, 13 Mar 2019 05:52:31 +0000 (07:52 +0200)]
core:vsx working around gcc aligned memory access bug
- allow cmake to check sanity of vsx aligned ld/st
- force universal intrinsics v_load_aligned/v_store_aligned
to failback to unaligned ld/st if cmake runtime vsx aligned test fail
LaurentBerger [Wed, 13 Mar 2019 21:28:02 +0000 (22:28 +0100)]
Issue 14047
Alexander Alekhin [Wed, 13 Mar 2019 19:08:43 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 13 Mar 2019 18:52:15 +0000 (18:52 +0000)]
android: don't install java/build.gradle
Alexander Alekhin [Wed, 13 Mar 2019 17:57:17 +0000 (17:57 +0000)]
Merge pull request #13655 from sturkmen72:update_doc_photo
Richard Veale [Wed, 13 Mar 2019 17:53:59 +0000 (02:53 +0900)]
Merge pull request #13695 from flyingfalling:3.4
* Fixed bug that made cuda::filter give corrupted output when different filters called in different threads. This was due to use of global texture variable shared by all filters.
* REV: fixed tab issue for opencv coding style...
Alexander Alekhin [Wed, 13 Mar 2019 16:17:43 +0000 (16:17 +0000)]
Merge pull request #14045 from rpici:fix_bug_in_test_tiff
Alexander Alekhin [Wed, 13 Mar 2019 16:09:21 +0000 (16:09 +0000)]
Merge pull request #14021 from dkurt:init_opencv_wasm
Alexander Alekhin [Wed, 13 Mar 2019 16:03:21 +0000 (16:03 +0000)]
Merge pull request #14046 from alalek:fix_static_analysis_issues_3.4
Alexander Alekhin [Wed, 13 Mar 2019 16:02:42 +0000 (16:02 +0000)]
Merge pull request #14043 from alalek:revert_13843
rpici [Wed, 13 Mar 2019 14:42:47 +0000 (09:42 -0500)]
Fix bug in test_tiff.cpp
The big endian data in the tiff_sample_data array was never being tested. This could be observed by e.g. changing the 9th byte in the big endian data from 0xde to something that should fail the test, e.g. 0xdd, and the test would still pass even though it should fail.
Alexander Alekhin [Wed, 13 Mar 2019 14:14:03 +0000 (17:14 +0300)]
fix static analysis issues
Alexander Alekhin [Wed, 13 Mar 2019 14:15:47 +0000 (14:15 +0000)]
Merge pull request #14041 from nglee:dev_cudaarithmLUTPtr
Alexander Alekhin [Wed, 13 Mar 2019 12:07:37 +0000 (15:07 +0300)]
imgproc: revert #13843
This reverts commit
00e8c7810fa83b1545d985601058a56e1c5bcd89
Namgoo Lee [Wed, 13 Mar 2019 09:52:11 +0000 (18:52 +0900)]
Move Ptr-related code from lut.cu to lut.cpp
Dmitry Kurtaev [Wed, 13 Mar 2019 10:30:04 +0000 (13:30 +0300)]
Backport commits from
https://github.com/opencv/opencv/pull/12601
https://github.com/opencv/opencv/pull/12622
Alexander Alekhin [Tue, 12 Mar 2019 14:46:15 +0000 (14:46 +0000)]
Merge pull request #14029 from LaurentBerger:creategrid
Alexander Alekhin [Tue, 12 Mar 2019 14:38:37 +0000 (14:38 +0000)]
Merge pull request #14036 from jveitchmichaelis:Y16_v4l_fix
Alexander Alekhin [Tue, 12 Mar 2019 12:43:01 +0000 (12:43 +0000)]
Merge pull request #14038 from alalek:update_version_3.4.6-pre
Alexander Alekhin [Tue, 12 Mar 2019 12:42:32 +0000 (12:42 +0000)]
Merge pull request #14037 from alalek:update_version_4.1.0-pre
Josh Veitch-Michaelis [Tue, 12 Mar 2019 05:26:51 +0000 (05:26 +0000)]
release frame after disabling convert rgb
Alexander Alekhin [Tue, 12 Mar 2019 10:29:42 +0000 (13:29 +0300)]
pre: OpenCV 3.4.6 (version++)