c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
3abae3c511
Merge pull request #14366 from alalek:win32_fix_pdb
2019-04-19 12:42:16 +00:00
2e4d771005
cmake: fix PDB handling
2019-04-19 14:53:35 +03:00
4f764b812e
Merge pull request #14315 from dkurt:tf_squeeze_and_slim_softmax_v2
2019-04-18 16:01:24 +00:00
f7b6e30156
Merge pull request #14354 from alalek:workaround_apple_dyld_bug
2019-04-17 19:09:15 +00:00
9dccfe2a96
Merge pull request #13917 from sturkmen72:removed_c_api
2019-04-17 19:04:33 +00:00
2b84039a16
Merge pull request #14313 from alalek:cmake_pch_fix_defines_from_interface_targets
2019-04-17 19:02:28 +00:00
96610c7ee1
Merge pull request #14332 from LaurentBerger:loadknearest
2019-04-17 19:00:42 +00:00
1f517b8a02
Merge pull request #13943 from rgarnov:export_headers_for_backend_development
...
G-API external backend development (#13943 )
* Moved HostCtor and ConstVal from gapi_priv.hpp to objref.hpp
* Added gmodel_priv.hpp, added export of symbols from gmodel.hpp
* Added export of binInArg and bindOutArg
* Renamed gapi_priv.*pp -> gorigin.*pp
* Added a fixme on collecting exports inside one class
2019-04-17 21:54:47 +03:00
52f16e0f55
tests: workaround for DYLD_LIBRARY_PATH on Apple MacOSX
2019-04-17 15:19:33 +03:00
dedd966002
Merge pull request #14345 from dkurt:fix_dnn_ie_mac
2019-04-16 19:18:49 +00:00
6d3ae8d4ca
Merge pull request #14341 from alalek:cmake_fix_pkgconfig_libs
2019-04-16 19:04:07 +00:00
c667de9b68
dnn: force visibility(default) for IE headers
2019-04-16 18:18:31 +03:00
621e3eaed8
Add Ptr KNearest::load and python binding
2019-04-16 16:32:37 +02:00
3ef046b6c9
Merge pull request #14338 from alalek:fix_13849
2019-04-16 13:42:27 +00:00
74d5cdb6d8
Merge pull request #14343 from alalek:dnn_static_scans_namespace
2019-04-16 13:11:23 +00:00
7ad5d21900
Merge pull request #14339 from alalek:cmake_fix_std_cxx11
2019-04-16 13:10:24 +00:00
ebe13a9613
Merge pull request #14337 from alalek:ts_flush_stdout
2019-04-16 13:08:40 +00:00
7c1d9fea8b
Merge pull request #14308 from m000:master
2019-04-16 11:58:21 +00:00
59e4f85898
Merge pull request #14347 from dkurt:dnn_samples
2019-04-16 11:50:46 +00:00
a304069687
Remove preprocessing parameters from README
2019-04-16 13:29:33 +03:00
62d079fa69
Fix Normalize layer for Mac
2019-04-16 12:39:04 +03:00
3902694075
static scans: preserve namespace name
2019-04-16 06:49:47 +00:00
0d747daf47
cmake: use absolute library paths from 'pkgconfig'
...
- drop legacy check_module() macro
- drop 'ALIASOF_'
2019-04-15 22:11:49 +00:00
78384d8923
build: avoid highgui dependency
2019-04-15 18:59:51 +00:00
a56c12278e
cmake: fix C++11 flags (ENABLE_CXX11 is not required)
2019-04-15 20:00:55 +03:00
c9a76ede94
Merge pull request #14328 from lainy:3.4
2019-04-15 11:03:37 +00:00
246733382f
Fix OpenCVConfig.cmake for Arch Linux.
2019-04-14 12:22:57 -07:00
d1387b25eb
Merge pull request #14318 from dkurt:fix_ie_github
2019-04-14 17:33:11 +00:00
64fd1c95a5
ts: flush stdout/stderr before test launch
2019-04-13 21:08:06 +00:00
4635356435
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:54 +00:00
ef16e4203e
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.
2019-04-13 21:53:04 +02:00
92cbec6fb1
Fix dnn with IE from GitHub
2019-04-13 19:02:03 +03:00
0cfd95c097
Fix TensorFlow's Squeeze and a new fusion for SoftMax from slim backend
2019-04-13 17:04:31 +03:00
169dc9c311
Merge pull request #14297 from shxuy:patch-1
...
fix just a typo of the word 'word' (#14297 )
2019-04-12 19:32:08 +03:00
60a841c797
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
2019-04-12 19:31:07 +03:00
a246d8d8e9
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
2019-04-12 18:51:35 +03:00
64629cb94e
Merge pull request #12783 from alalek:test_tag
2019-04-12 15:35:41 +00:00
9515137cb2
cmake: fix PCH generation
...
process defines from INTERFACE targets
2019-04-12 17:39:02 +03:00
5f500692f1
Merge pull request #14284 from dkurt:fix_14236
2019-04-12 13:05:38 +00:00
227ec19929
Merge pull request #14277 from dkurt:ie_enable_tests_2019r1
2019-04-12 13:05:19 +00:00
a2bbfa1db5
Enable some tests for Inference Engine 2019R1
2019-04-12 15:21:42 +03:00
a9ddf12187
Merge pull request #14078 from alalek:test_python_from_modules
2019-04-12 11:39:12 +00:00
d68e722b71
Merge pull request #11748 from paroj:cap_except
2019-04-12 11:36:17 +00:00
5cb0eded64
Merge pull request #14278 from mshabunin:fix-osx-camera-auth-rt
...
* AVFoundation: Use runtime check for camera authorization
2019-04-11 19:16:50 +03:00
39630e076a
Merge pull request #14294 from alalek:issue_14286
...
cmake: fix WITH_OPENCL_D3D11_NV check
2019-04-11 17:50:15 +03:00
7621b91769
Merge pull request #14292 from alalek:issue_14291
...
* macosx: fix C++11 build
backporting commit c3cf35ab63
2019-04-11 17:46:28 +03:00
c8056b3e27
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
2019-04-11 17:44:28 +03:00
a0a1fb5fec
python: discover tests from module/misc/python/test paths
2019-04-10 18:35:35 +00:00
15bb0b86ce
VideoCapture: add exception error mode similar to fstream + test
2019-04-10 13:41:57 +02:00
Alexander Alekhin