platform/upstream/opencv.git
5 years agoMerge pull request #14308 from m000:master
Alexander Alekhin [Tue, 16 Apr 2019 11:58:21 +0000 (11:58 +0000)]
Merge pull request #14308 from m000:master

5 years agoMerge pull request #14347 from dkurt:dnn_samples
Alexander Alekhin [Tue, 16 Apr 2019 11:50:46 +0000 (11:50 +0000)]
Merge pull request #14347 from dkurt:dnn_samples

5 years agoRemove preprocessing parameters from README
Dmitry Kurtaev [Tue, 16 Apr 2019 10:10:31 +0000 (13:10 +0300)]
Remove preprocessing parameters from README

5 years agoMerge pull request #14328 from lainy:3.4
Alexander Alekhin [Mon, 15 Apr 2019 11:03:37 +0000 (11:03 +0000)]
Merge pull request #14328 from lainy:3.4

5 years agoFix OpenCVConfig.cmake for Arch Linux.
lain [Sun, 14 Apr 2019 19:22:57 +0000 (12:22 -0700)]
Fix OpenCVConfig.cmake for Arch Linux.

5 years agoMerge pull request #14318 from dkurt:fix_ie_github
Alexander Alekhin [Sun, 14 Apr 2019 17:33:11 +0000 (17:33 +0000)]
Merge pull request #14318 from dkurt:fix_ie_github

5 years agoFix compile error with external TBB and -DBUILD_SHARED_LIBS=OFF.
Manolis Stamatogiannakis [Fri, 12 Apr 2019 01:36:59 +0000 (02:36 +0100)]
Fix compile error with external TBB and -DBUILD_SHARED_LIBS=OFF.

Adds IMPORTED for the TBB::tbb alias target as otherwise cmake produces
the following error:

CMake Error: install(EXPORT "OpenCVModules" ...) includes target "opencv_core" which requires target "tbb" that is not in the export set.

This problem occurs with the defaults used by homebrew on macOS, which
compiles both static and shared versions of TBB and OpenCV.

5 years agoFix dnn with IE from GitHub
Dmitry Kurtaev [Sat, 13 Apr 2019 16:02:03 +0000 (19:02 +0300)]
Fix dnn with IE from GitHub

5 years agoMerge pull request #14297 from shxuy:patch-1
Nick Yang [Fri, 12 Apr 2019 16:32:08 +0000 (00:32 +0800)]
Merge pull request #14297 from shxuy:patch-1

fix just a typo of the word 'word' (#14297)

5 years agoMerge pull request #14255 from l-bat:networks_visualization
Lubov Batanina [Fri, 12 Apr 2019 16:31:07 +0000 (19:31 +0300)]
Merge pull request #14255 from l-bat:networks_visualization

* Add networks visualization

* Disable CXX11

* Fixed multy inputs support

* Added output shapes

* Added color for DLIE/CPU

* Fixed graph colors

5 years agoMerge pull request #13709 from michal-kowalczyk:flush-processed-samples-number
michal-kowalczyk [Fri, 12 Apr 2019 15:51:35 +0000 (17:51 +0200)]
Merge pull request #13709 from michal-kowalczyk:flush-processed-samples-number

* Add flushing to printing number of processed positive/negative samples so that user is informed of updates quickly.

* use flush C api instead of C++ api

5 years agoMerge pull request #12783 from alalek:test_tag
Alexander Alekhin [Fri, 12 Apr 2019 15:35:41 +0000 (15:35 +0000)]
Merge pull request #12783 from alalek:test_tag

5 years agoMerge pull request #14284 from dkurt:fix_14236
Alexander Alekhin [Fri, 12 Apr 2019 13:05:37 +0000 (13:05 +0000)]
Merge pull request #14284 from dkurt:fix_14236

5 years agoMerge pull request #14277 from dkurt:ie_enable_tests_2019r1
Alexander Alekhin [Fri, 12 Apr 2019 13:05:19 +0000 (13:05 +0000)]
Merge pull request #14277 from dkurt:ie_enable_tests_2019r1

5 years agoEnable some tests for Inference Engine 2019R1
Dmitry Kurtaev [Mon, 8 Apr 2019 08:29:10 +0000 (11:29 +0300)]
Enable some tests for Inference Engine 2019R1

5 years agoMerge pull request #14078 from alalek:test_python_from_modules
Alexander Alekhin [Fri, 12 Apr 2019 11:39:12 +0000 (11:39 +0000)]
Merge pull request #14078 from alalek:test_python_from_modules

5 years agoMerge pull request #14294 from alalek:issue_14286
Alexander Alekhin [Thu, 11 Apr 2019 14:50:15 +0000 (17:50 +0300)]
Merge pull request #14294 from alalek:issue_14286

cmake: fix WITH_OPENCL_D3D11_NV check

5 years agoMerge pull request #14292 from alalek:issue_14291
Alexander Alekhin [Thu, 11 Apr 2019 14:46:28 +0000 (17:46 +0300)]
Merge pull request #14292 from alalek:issue_14291

* macosx: fix C++11 build

backporting commit c3cf35ab63c04fb1d7b2f6760128f42c20cac0e1

* macosx: eliminate build warning

5 years agoMerge pull request #14276 from kiwixz:pr/fix_compound
kiwixz [Thu, 11 Apr 2019 14:44:28 +0000 (15:44 +0100)]
Merge pull request #14276 from kiwixz:pr/fix_compound

Do not use compound literals (fix MSVC C4576) (#14276)

* do not use compound literals (compat cpp98)

* only fix msvc path

* remove unnecessary cplusplus check

5 years agopython: discover tests from module/misc/python/test paths
Alexander Alekhin [Sat, 16 Mar 2019 11:50:23 +0000 (11:50 +0000)]
python: discover tests from module/misc/python/test paths

5 years agoFix a bug in FusedBatchNorm (TensorFlow) layer importer
Dmitry Kurtaev [Tue, 9 Apr 2019 10:35:34 +0000 (13:35 +0300)]
Fix a bug in FusedBatchNorm (TensorFlow) layer importer

5 years agodnn(test-tags): add time / memory tags
Alexander Alekhin [Mon, 8 Oct 2018 22:38:06 +0000 (22:38 +0000)]
dnn(test-tags): add time / memory tags

5 years agots: test tags for flexible/reliable tests filtering
Alexander Alekhin [Mon, 1 Oct 2018 13:28:17 +0000 (16:28 +0300)]
ts: test tags for flexible/reliable tests filtering

- added functionality to collect memory usage of OpenCL sybsystem
- memory usage of fastMalloc() (disabled by default):
  * It is not accurate sometimes - external memory profiler is required.
- specify common `CV_TEST_TAG_` macros
- added applyTestTag() function
- write memory usage / enabled tags into Google Tests output file (.xml)

5 years agoMerge tag '3.4.6'
Alexander Alekhin [Sun, 7 Apr 2019 11:02:40 +0000 (11:02 +0000)]
Merge tag '3.4.6'

5 years agoOpenCV version++ (3.4.6)
Alexander Alekhin [Sat, 6 Apr 2019 21:43:23 +0000 (21:43 +0000)]
OpenCV version++ (3.4.6)

OpenCV 3.4.6

5 years agoMerge pull request #14271 from alalek:issue_14259
Alexander Alekhin [Sat, 6 Apr 2019 21:37:10 +0000 (21:37 +0000)]
Merge pull request #14271 from alalek:issue_14259

5 years agocalib3d: don't change input data
Alexander Alekhin [Sat, 6 Apr 2019 18:39:42 +0000 (18:39 +0000)]
calib3d: don't change input data

- estimateAffine2D/estimateAffinePartial2D() calls

5 years agoMerge pull request #14268 from alalek:fix_ossfuzz_13283
Alexander Alekhin [Fri, 5 Apr 2019 18:56:19 +0000 (18:56 +0000)]
Merge pull request #14268 from alalek:fix_ossfuzz_13283

5 years agoimgcodecs(tiff): check TIFF tile size
Alexander Alekhin [Fri, 5 Apr 2019 14:56:48 +0000 (17:56 +0300)]
imgcodecs(tiff): check TIFF tile size

oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13280
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13283

5 years agoMerge pull request #14256 from alalek:fix_docs_links_3.4
Alexander Alekhin [Fri, 5 Apr 2019 12:45:49 +0000 (12:45 +0000)]
Merge pull request #14256 from alalek:fix_docs_links_3.4

5 years agoMerge pull request #14251 from dkurt:dnn_tf_manage_switch
Alexander Alekhin [Fri, 5 Apr 2019 12:43:22 +0000 (12:43 +0000)]
Merge pull request #14251 from dkurt:dnn_tf_manage_switch

5 years agoRemove Switch and Merge nodes from TensorFlow networks
Dmitry Kurtaev [Wed, 3 Apr 2019 10:42:06 +0000 (13:42 +0300)]
Remove Switch and Merge nodes from TensorFlow networks

5 years agoMerge pull request #14249 from alalek:imgcodecs_tiff_update_3.4
Alexander Alekhin [Thu, 4 Apr 2019 16:17:09 +0000 (16:17 +0000)]
Merge pull request #14249 from alalek:imgcodecs_tiff_update_3.4

5 years agodocs: fix links
Alexander Alekhin [Thu, 4 Apr 2019 15:57:22 +0000 (18:57 +0300)]
docs: fix links

- replace tutorial links via docs.opencv.org
- remove link on OpenCV 2.4
- avoid links on outdated packages

5 years agoMerge pull request #14245 from mehlukas:3.4-fixtutorial
mehlukas [Thu, 4 Apr 2019 14:44:03 +0000 (16:44 +0200)]
Merge pull request #14245 from mehlukas:3.4-fixtutorial

* improve thresholding tutorial, fix grammar issues and incorrections

* keep full list of simple thresholding types

5 years agoMerge pull request #14252 from balachandarsv:master-mac-openvino-support
BALACHANDAR S [Thu, 4 Apr 2019 14:37:45 +0000 (20:07 +0530)]
Merge pull request #14252 from balachandarsv:master-mac-openvino-support

* Mac support for op inference engine

Adding condition to check for mac and add corresponding libraries

* Adding mac support in test cases

5 years agoimgcodecs(tiff): sanitize tiff decoder
Alexander Alekhin [Thu, 4 Apr 2019 00:35:08 +0000 (00:35 +0000)]
imgcodecs(tiff): sanitize tiff decoder

- more checks
- drop separate branches for 32FC1/32FC3(read) handling
- added for 32F/64F non-compressed
- added tests for 32FC3 (RAW + hdr SGILOG compression)
- added test 64FC1
- dump tiff errors on stderr

5 years agoMerge pull request #14233 from alalek:cmake_fix_license_install
Alexander Alekhin [Wed, 3 Apr 2019 19:30:47 +0000 (19:30 +0000)]
Merge pull request #14233 from alalek:cmake_fix_license_install

5 years agoMerge pull request #14229 from alalek:ffmpeg_downloader_elevated_run
Alexander Alekhin [Wed, 3 Apr 2019 19:29:28 +0000 (19:29 +0000)]
Merge pull request #14229 from alalek:ffmpeg_downloader_elevated_run

5 years agoMerge pull request #14241 from alalek:openvino_2019R1
Alexander Alekhin [Wed, 3 Apr 2019 19:26:46 +0000 (19:26 +0000)]
Merge pull request #14241 from alalek:openvino_2019R1

5 years agoMerge pull request #14117 from 103yiran:103yiran-patch-dnn
103yiran [Wed, 3 Apr 2019 19:13:11 +0000 (03:13 +0800)]
Merge pull request #14117 from 103yiran:103yiran-patch-dnn

* Postpone variable definitions

* dnn: reduce scope of 'Mat image' variable

5 years agodnn(test): skip tests
Alexander Alekhin [Wed, 3 Apr 2019 14:49:05 +0000 (17:49 +0300)]
dnn(test): skip tests

5 years agodnn: update DNNTestOpenVINO.models tests
Alexander Alekhin [Tue, 2 Apr 2019 12:03:32 +0000 (15:03 +0300)]
dnn: update DNNTestOpenVINO.models tests

- models are moved out from OpenVINO package
- need to download them separatelly

5 years agodnn: use OpenVINO 2019R1 defines
Alexander Alekhin [Mon, 1 Apr 2019 12:00:25 +0000 (15:00 +0300)]
dnn: use OpenVINO 2019R1 defines

5 years agoMerge pull request #14234 from alalek:backport_14203
Alexander Alekhin [Tue, 2 Apr 2019 16:34:41 +0000 (16:34 +0000)]
Merge pull request #14234 from alalek:backport_14203

5 years agocmake: fix licenses install rules
Alexander Alekhin [Tue, 2 Apr 2019 14:47:03 +0000 (17:47 +0300)]
cmake: fix licenses install rules

5 years agoimgcodecs(sunras): avoid undefined shift
Alexander Alekhin [Sun, 31 Mar 2019 12:14:42 +0000 (12:14 +0000)]
imgcodecs(sunras): avoid undefined shift

backporting of commit: f2803aba07c1c522b409cce5390e757f54d7794d

5 years agoMerge pull request #14228 from dkurt:conv_1x1
Alexander Alekhin [Tue, 2 Apr 2019 14:35:50 +0000 (14:35 +0000)]
Merge pull request #14228 from dkurt:conv_1x1

5 years agoMerge pull request #14222 from alalek:cmake_remove_test_include_dirs
Alexander Alekhin [Tue, 2 Apr 2019 14:34:36 +0000 (14:34 +0000)]
Merge pull request #14222 from alalek:cmake_remove_test_include_dirs

5 years agoMerge pull request #14223 from alalek:backport_14201
Alexander Alekhin [Tue, 2 Apr 2019 14:33:57 +0000 (14:33 +0000)]
Merge pull request #14223 from alalek:backport_14201

5 years agoFFmpeg: try to download wrapper with elevated privileges
Alexander Alekhin [Tue, 2 Apr 2019 13:38:28 +0000 (16:38 +0300)]
FFmpeg: try to download wrapper with elevated privileges

5 years agoEnable 1x1 convolution optimization
Dmitry Kurtaev [Tue, 2 Apr 2019 11:05:17 +0000 (14:05 +0300)]
Enable 1x1 convolution optimization

5 years agoMerge pull request #14225 from zuoshaobo:my3.4
Alexander Alekhin [Tue, 2 Apr 2019 09:57:26 +0000 (09:57 +0000)]
Merge pull request #14225 from zuoshaobo:my3.4

5 years agoMerge pull request #14227 from dkurt:fix_build_with_ie
Alexander Alekhin [Tue, 2 Apr 2019 09:38:05 +0000 (09:38 +0000)]
Merge pull request #14227 from dkurt:fix_build_with_ie

5 years agocmake: don't add tests dirs as include directories
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)

5 years agoFix build with IE > 2018R5
Dmitry Kurtaev [Tue, 2 Apr 2019 08:54:50 +0000 (11:54 +0300)]
Fix build with IE > 2018R5

5 years agoadd support for tf.add_n operation
zuoshaobo [Tue, 2 Apr 2019 07:20:53 +0000 (03:20 -0400)]
add support for   tf.add_n operation

5 years agoMerge pull request #14214 from alalek:backport_14202
Alexander Alekhin [Mon, 1 Apr 2019 14:39:25 +0000 (14:39 +0000)]
Merge pull request #14214 from alalek:backport_14202

5 years agoMerge pull request #14212 from dkurt:reduce_ie_models_tests
Alexander Alekhin [Mon, 1 Apr 2019 14:38:07 +0000 (14:38 +0000)]
Merge pull request #14212 from dkurt:reduce_ie_models_tests

5 years agoMerge pull request #14207 from alalek:fix_leak_eigenvalue_decomposition
Alexander Alekhin [Mon, 1 Apr 2019 14:17:37 +0000 (14:17 +0000)]
Merge pull request #14207 from alalek:fix_leak_eigenvalue_decomposition

5 years agoimgcodecs(tiff): avoid leak of helper struct on malformed inputs
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

5 years agoMerge pull request #14194 from alalek:backport_14193
Alexander Alekhin [Mon, 1 Apr 2019 14:03:13 +0000 (14:03 +0000)]
Merge pull request #14194 from alalek:backport_14193

5 years agoReduce number of tested models from OpenVINO
Dmitry Kurtaev [Mon, 1 Apr 2019 12:15:00 +0000 (15:15 +0300)]
Reduce number of tested models from OpenVINO

5 years agoMerge pull request #14200 from alalek:fix_imgcodecs_stream_set_pos
Alexander Alekhin [Mon, 1 Apr 2019 11:04:20 +0000 (11:04 +0000)]
Merge pull request #14200 from alalek:fix_imgcodecs_stream_set_pos

5 years agocore(lda): don't perform calculations in constructor
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

5 years agoMerge pull request #14198 from alalek:issue_14195
Alexander Alekhin [Sun, 31 Mar 2019 12:56:57 +0000 (12:56 +0000)]
Merge pull request #14198 from alalek:issue_14195

5 years agoimgcodecs: fix RBaseStream::setPos() outside of current block
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.

5 years agoMerge pull request #14199 from devnexen:openbsd_build_fix
Alexander Alekhin [Sun, 31 Mar 2019 11:14:42 +0000 (11:14 +0000)]
Merge pull request #14199 from devnexen:openbsd_build_fix

5 years agoimgcodecs(bmp): limit size of processed images
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

5 years agoOpenBSD build fix
David Carlier [Sun, 31 Mar 2019 09:38:35 +0000 (10:38 +0100)]
OpenBSD build fix

required for close calls.

5 years agocmake: fix build of dnn tests with shared common code
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)

5 years agoMerge pull request #14196 from seiko2plus:issue14195
Alexander Alekhin [Sun, 31 Mar 2019 08:18:55 +0000 (08:18 +0000)]
Merge pull request #14196 from seiko2plus:issue14195

5 years agodnn:perf add missing definition __OPENCV_TEST to fix pch
Sayed Adel [Sun, 31 Mar 2019 01:28:33 +0000 (03:28 +0200)]
dnn:perf add missing definition __OPENCV_TEST to fix pch

5 years ago3rdparty(zlib): prevent uninitialized use of state->check
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

5 years agoMerge pull request #13932 from l-bat:MyriadX_master_dldt
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

5 years agoMerge pull request #14154 from GeorgeWilson96:bugfix/14148
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

5 years agoMerge pull request #14166 from dkurt:fix_slim_mobilenet_v2
Alexander Alekhin [Thu, 28 Mar 2019 14:37:35 +0000 (14:37 +0000)]
Merge pull request #14166 from dkurt:fix_slim_mobilenet_v2

5 years agoMerge pull request #14170 from alalek:cmake_hide_helper_modules
Alexander Alekhin [Thu, 28 Mar 2019 14:25:27 +0000 (14:25 +0000)]
Merge pull request #14170 from alalek:cmake_hide_helper_modules

5 years agoMerge pull request #14168 from alalek:dnn_fix_drop_IE_2018R2
Alexander Alekhin [Thu, 28 Mar 2019 14:23:39 +0000 (14:23 +0000)]
Merge pull request #14168 from alalek:dnn_fix_drop_IE_2018R2

5 years agocmake: hide helper modules
Alexander Alekhin [Wed, 27 Mar 2019 21:42:24 +0000 (21:42 +0000)]
cmake: hide helper modules

- bindings generators
- keep "ts" module

5 years agodnn: fix support drop for IE<2018R3
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

5 years agoMerge pull request #14162 from alalek:eliminate_coverity_scan_issues
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

5 years agoMerge pull request #14102 from alalek:core_refactor_eigenvalues
Alexander Alekhin [Wed, 27 Mar 2019 12:46:50 +0000 (12:46 +0000)]
Merge pull request #14102 from alalek:core_refactor_eigenvalues

5 years agoFix Mobilenet v2 from TensorFlow slim
Dmitry Kurtaev [Wed, 27 Mar 2019 12:10:57 +0000 (15:10 +0300)]
Fix Mobilenet v2 from TensorFlow slim

5 years agoMerge pull request #14146 from alalek:cmake_cmp0068
Alexander Alekhin [Tue, 26 Mar 2019 17:16:58 +0000 (17:16 +0000)]
Merge pull request #14146 from alalek:cmake_cmp0068

5 years agoMerge pull request #13989 from kohei-us:onnx-conv-transpose-output-shape
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

5 years agoMerge pull request #14155 from alalek:fix_macos_ocl_warnings_3.4
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

5 years agoAdd a test case for handling output_shape property for deconvolution layer.
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.

5 years agoMake use of explicit output shape for the de-convolution 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

5 years agoocl: define CL_SILENCE_DEPRECATION on MacOSX
Alexander Alekhin [Tue, 26 Mar 2019 10:11:53 +0000 (13:11 +0300)]
ocl: define CL_SILENCE_DEPRECATION on MacOSX

5 years agoMerge pull request #14142 from mshabunin:fix-c-api-3.4
Alexander Alekhin [Mon, 25 Mar 2019 18:58:28 +0000 (18:58 +0000)]
Merge pull request #14142 from mshabunin:fix-c-api-3.4

5 years agocmake: set CMP0068 => NEW
Alexander Alekhin [Mon, 25 Mar 2019 16:24:49 +0000 (19:24 +0300)]
cmake: set CMP0068 => NEW

5 years agoMerge pull request #14141 from dkurt:dnn_ie_relax_lrn
Alexander Alekhin [Mon, 25 Mar 2019 13:45:25 +0000 (13:45 +0000)]
Merge pull request #14141 from dkurt:dnn_ie_relax_lrn

5 years agoFixed cvdef.h for MSVC C users
Maksim Shabunin [Mon, 25 Mar 2019 13:44:08 +0000 (16:44 +0300)]
Fixed cvdef.h for MSVC C users

5 years agoExtend LRN layer support with IE backend
Dmitry Kurtaev [Mon, 25 Mar 2019 09:49:02 +0000 (12:49 +0300)]
Extend LRN layer support with IE backend

5 years agoMerge pull request #13972 from Mainvooid:add_cuda_support_for_D3D11_interop
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

5 years agoMerge pull request #14126 from brad-kelly:integral_avx512_cn1
Alexander Alekhin [Sat, 23 Mar 2019 12:09:46 +0000 (12:09 +0000)]
Merge pull request #14126 from brad-kelly:integral_avx512_cn1

5 years agoImplementing AVX512 Support for 1 channel mats for CV_64F format
Brad Kelly [Sat, 23 Feb 2019 00:57:50 +0000 (16:57 -0800)]
Implementing AVX512 Support for 1 channel mats for CV_64F format

5 years agoMerge pull request #14125 from alalek:cmake_ie_env_vars
Alexander Alekhin [Fri, 22 Mar 2019 15:10:25 +0000 (15:10 +0000)]
Merge pull request #14125 from alalek:cmake_ie_env_vars

5 years agocmake: support OpenVINO env variable: INTEL_OPENVINO_DIR
Alexander Alekhin [Thu, 21 Mar 2019 15:58:22 +0000 (18:58 +0300)]
cmake: support OpenVINO env variable: INTEL_OPENVINO_DIR