Manolis Stamatogiannakis
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
Dmitry Kurtaev
92cbec6fb1
Fix dnn with IE from GitHub
2019-04-13 19:02:03 +03:00
Dmitry Kurtaev
0cfd95c097
Fix TensorFlow's Squeeze and a new fusion for SoftMax from slim backend
2019-04-13 17:04:31 +03:00
Nick Yang
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
Lubov Batanina
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
michal-kowalczyk
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
Alexander Alekhin
64629cb94e
Merge pull request #12783 from alalek:test_tag
2019-04-12 15:35:41 +00:00
Alexander Alekhin
9515137cb2
cmake: fix PCH generation
...
process defines from INTERFACE targets
2019-04-12 17:39:02 +03:00
Alexander Alekhin
5f500692f1
Merge pull request #14284 from dkurt:fix_14236
2019-04-12 13:05:38 +00:00
Alexander Alekhin
227ec19929
Merge pull request #14277 from dkurt:ie_enable_tests_2019r1
2019-04-12 13:05:19 +00:00
Dmitry Kurtaev
a2bbfa1db5
Enable some tests for Inference Engine 2019R1
2019-04-12 15:21:42 +03:00
Alexander Alekhin
a9ddf12187
Merge pull request #14078 from alalek:test_python_from_modules
2019-04-12 11:39:12 +00:00
Alexander Alekhin
d68e722b71
Merge pull request #11748 from paroj:cap_except
2019-04-12 11:36:17 +00:00
Maksim Shabunin
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
Alexander Alekhin
39630e076a
Merge pull request #14294 from alalek:issue_14286
...
cmake: fix WITH_OPENCL_D3D11_NV check
2019-04-11 17:50:15 +03:00
Alexander Alekhin
7621b91769
Merge pull request #14292 from alalek:issue_14291
...
* macosx: fix C++11 build
backporting commit c3cf35ab63
* macosx: eliminate build warning
2019-04-11 17:46:28 +03:00
kiwixz
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
Alexander Alekhin
a0a1fb5fec
python: discover tests from module/misc/python/test paths
2019-04-10 18:35:35 +00:00
Pavel Rojtberg
15bb0b86ce
VideoCapture: add exception error mode similar to fstream + test
2019-04-10 13:41:57 +02:00
Dmitry Kurtaev
7ce2397b62
Fix a bug in FusedBatchNorm (TensorFlow) layer importer
2019-04-09 13:35:34 +03:00
Alexander Alekhin
e0841f3d6e
dnn(test-tags): add time / memory tags
2019-04-08 19:18:25 +00:00
Alexander Alekhin
b38de57f9a
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)
2019-04-08 19:12:49 +00:00
Alexander Alekhin
64168fc20a
'-dev' version
2019-04-08 14:34:32 +03:00
Alexander Alekhin
072b524e02
Merge tag '4.1.0'
2019-04-08 08:10:29 +00:00
Alexander Alekhin
371bba8f54
release: OpenCV 4.1.0
...
OpenCV 4.1.0
2019-04-07 17:09:10 +00:00
Alexander Alekhin
2eaf35eb63
Merge tag '4.1.0-openvino'
2019-04-07 17:07:27 +00:00
Alexander Alekhin
0b9d53829f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-07 12:35:15 +00:00
Alexander Alekhin
dad2247b56
Merge tag '3.4.6'
2019-04-07 11:02:40 +00:00
Alexander Alekhin
33b765d797
OpenCV version++ (3.4.6)
...
OpenCV 3.4.6
2019-04-06 21:43:23 +00:00
Alexander Alekhin
4368f04afa
Merge pull request #14271 from alalek:issue_14259
2019-04-06 21:37:10 +00:00
Alexander Alekhin
b5961cc5d1
calib3d: don't change input data
...
- estimateAffine2D/estimateAffinePartial2D() calls
2019-04-06 19:28:41 +00:00
Alexander Alekhin
c9fc27b337
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-05 19:08:23 +00:00
Maksim Shabunin
aa1359dc19
Merge pull request #14267 from mshabunin:fix-osx-camera-auth
...
* Added authorization request to AVFoundation camera backend (OSX 10.14+)
2019-04-05 21:58:01 +03:00
Alexander Alekhin
28925572f6
Merge pull request #14268 from alalek:fix_ossfuzz_13283
2019-04-05 18:56:19 +00:00
Alexander Alekhin
0c490accae
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
2019-04-05 18:13:15 +03:00
Dmitry Kurtaev
4c2100e02c
Merge pull request #14266 from dkurt:fix_qrcode_decode_java
...
* Fix decode and detectAndDecode Java wrappers for QRCodeDetector
* revert changes in objdetect
* java: fix wrapping of std::string type
2019-04-05 17:15:51 +03:00
Alexander Alekhin
1b5a9c9718
Merge pull request #14256 from alalek:fix_docs_links_3.4
2019-04-05 12:45:50 +00:00
Alexander Alekhin
bd43e4f28b
Merge pull request #14251 from dkurt:dnn_tf_manage_switch
2019-04-05 12:43:22 +00:00
Dmitry Kurtaev
ec41a4897a
Remove Switch and Merge nodes from TensorFlow networks
2019-04-05 12:32:35 +03:00
Alexander Alekhin
473941c341
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-04 18:09:24 +00:00
Alexander Alekhin
1fb93b62c0
Merge pull request #14249 from alalek:imgcodecs_tiff_update_3.4
2019-04-04 16:17:09 +00:00
Alexander Alekhin
d38869eb76
docs: fix links
...
- replace tutorial links via docs.opencv.org
- remove link on OpenCV 2.4
- avoid links on outdated packages
2019-04-04 18:57:22 +03:00
mehlukas
ab21dc6d47
Merge pull request #14245 from mehlukas:3.4-fixtutorial
...
* improve thresholding tutorial, fix grammar issues and incorrections
* keep full list of simple thresholding types
2019-04-04 17:44:03 +03:00
BALACHANDAR S
aa167434e6
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
2019-04-04 17:37:45 +03:00
Alexander Alekhin
ba5ddd6499
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
2019-04-04 14:16:53 +03:00
Alexander Alekhin
4001346a30
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-03 19:33:52 +00:00
Alexander Alekhin
d8b8c3b145
Merge pull request #14233 from alalek:cmake_fix_license_install
2019-04-03 19:30:47 +00:00
Alexander Alekhin
ba6c2df15d
Merge pull request #14229 from alalek:ffmpeg_downloader_elevated_run
2019-04-03 19:29:28 +00:00
Alexander Alekhin
c300070b8a
Merge pull request #14241 from alalek:openvino_2019R1
2019-04-03 19:26:46 +00:00
103yiran
4bb6edf176
Merge pull request #14117 from 103yiran:103yiran-patch-dnn
...
* Postpone variable definitions
* dnn: reduce scope of 'Mat image' variable
2019-04-03 22:13:11 +03:00