Alexander Alekhin [Thu, 18 Apr 2019 16:01:24 +0000 (16:01 +0000)]
Merge pull request #14315 from dkurt:tf_squeeze_and_slim_softmax_v2
Alexander Alekhin [Wed, 17 Apr 2019 19:09:14 +0000 (19:09 +0000)]
Merge pull request #14354 from alalek:workaround_apple_dyld_bug
Alexander Alekhin [Wed, 17 Apr 2019 19:04:33 +0000 (19:04 +0000)]
Merge pull request #13917 from sturkmen72:removed_c_api
Alexander Alekhin [Wed, 17 Apr 2019 19:02:27 +0000 (19:02 +0000)]
Merge pull request #14313 from alalek:cmake_pch_fix_defines_from_interface_targets
Alexander Alekhin [Wed, 17 Apr 2019 19:00:41 +0000 (19:00 +0000)]
Merge pull request #14332 from LaurentBerger:loadknearest
Alexander Alekhin [Wed, 17 Apr 2019 12:19:33 +0000 (15:19 +0300)]
tests: workaround for DYLD_LIBRARY_PATH on Apple MacOSX
Alexander Alekhin [Tue, 16 Apr 2019 19:18:48 +0000 (19:18 +0000)]
Merge pull request #14345 from dkurt:fix_dnn_ie_mac
Alexander Alekhin [Tue, 16 Apr 2019 19:04:06 +0000 (19:04 +0000)]
Merge pull request #14341 from alalek:cmake_fix_pkgconfig_libs
Alexander Alekhin [Tue, 16 Apr 2019 15:13:14 +0000 (18:13 +0300)]
dnn: force visibility(default) for IE headers
LaurentBerger [Mon, 15 Apr 2019 13:51:30 +0000 (15:51 +0200)]
Add Ptr KNearest::load and python binding
Alexander Alekhin [Tue, 16 Apr 2019 13:42:27 +0000 (13:42 +0000)]
Merge pull request #14338 from alalek:fix_13849
Alexander Alekhin [Tue, 16 Apr 2019 13:11:23 +0000 (13:11 +0000)]
Merge pull request #14343 from alalek:dnn_static_scans_namespace
Alexander Alekhin [Tue, 16 Apr 2019 13:08:40 +0000 (13:08 +0000)]
Merge pull request #14337 from alalek:ts_flush_stdout
Alexander Alekhin [Tue, 16 Apr 2019 11:58:21 +0000 (11:58 +0000)]
Merge pull request #14308 from m000:master
Alexander Alekhin [Tue, 16 Apr 2019 11:50:46 +0000 (11:50 +0000)]
Merge pull request #14347 from dkurt:dnn_samples
Dmitry Kurtaev [Tue, 16 Apr 2019 10:10:31 +0000 (13:10 +0300)]
Remove preprocessing parameters from README
Dmitry Kurtaev [Tue, 16 Apr 2019 08:41:50 +0000 (11:41 +0300)]
Fix Normalize layer for Mac
Alexander Alekhin [Tue, 16 Apr 2019 06:49:47 +0000 (06:49 +0000)]
static scans: preserve namespace name
Alexander Alekhin [Mon, 15 Apr 2019 21:29:17 +0000 (21:29 +0000)]
cmake: use absolute library paths from 'pkgconfig'
- drop legacy check_module() macro
- drop 'ALIASOF_'
Alexander Alekhin [Mon, 15 Apr 2019 18:59:51 +0000 (18:59 +0000)]
build: avoid highgui dependency
Alexander Alekhin [Mon, 15 Apr 2019 11:03:37 +0000 (11:03 +0000)]
Merge pull request #14328 from lainy:3.4
lain [Sun, 14 Apr 2019 19:22:57 +0000 (12:22 -0700)]
Fix OpenCVConfig.cmake for Arch Linux.
Alexander Alekhin [Sun, 14 Apr 2019 17:33:11 +0000 (17:33 +0000)]
Merge pull request #14318 from dkurt:fix_ie_github
Alexander Alekhin [Sat, 13 Apr 2019 21:08:06 +0000 (21:08 +0000)]
ts: flush stdout/stderr before test launch
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.
Dmitry Kurtaev [Sat, 13 Apr 2019 16:02:03 +0000 (19:02 +0300)]
Fix dnn with IE from GitHub
Dmitry Kurtaev [Fri, 12 Apr 2019 15:40:27 +0000 (18:40 +0300)]
Fix TensorFlow's Squeeze and a new fusion for SoftMax from slim backend
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)
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
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
Alexander Alekhin [Fri, 12 Apr 2019 15:35:41 +0000 (15:35 +0000)]
Merge pull request #12783 from alalek:test_tag
Alexander Alekhin [Fri, 12 Apr 2019 14:24:08 +0000 (17:24 +0300)]
cmake: fix PCH generation
process defines from INTERFACE targets
Alexander Alekhin [Fri, 12 Apr 2019 13:05:37 +0000 (13:05 +0000)]
Merge pull request #14284 from dkurt:fix_14236
Alexander Alekhin [Fri, 12 Apr 2019 13:05:19 +0000 (13:05 +0000)]
Merge pull request #14277 from dkurt:ie_enable_tests_2019r1
Dmitry Kurtaev [Mon, 8 Apr 2019 08:29:10 +0000 (11:29 +0300)]
Enable some tests for Inference Engine 2019R1
Alexander Alekhin [Fri, 12 Apr 2019 11:39:12 +0000 (11:39 +0000)]
Merge pull request #14078 from alalek:test_python_from_modules
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
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
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
Alexander Alekhin [Sat, 16 Mar 2019 11:50:23 +0000 (11:50 +0000)]
python: discover tests from module/misc/python/test paths
Dmitry Kurtaev [Tue, 9 Apr 2019 10:35:34 +0000 (13:35 +0300)]
Fix a bug in FusedBatchNorm (TensorFlow) layer importer
Alexander Alekhin [Mon, 8 Oct 2018 22:38:06 +0000 (22:38 +0000)]
dnn(test-tags): add time / memory tags
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)
Alexander Alekhin [Sun, 7 Apr 2019 11:02:40 +0000 (11:02 +0000)]
Merge tag '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
Alexander Alekhin [Sat, 6 Apr 2019 21:37:10 +0000 (21:37 +0000)]
Merge pull request #14271 from alalek:issue_14259
Alexander Alekhin [Sat, 6 Apr 2019 18:39:42 +0000 (18:39 +0000)]
calib3d: don't change input data
- estimateAffine2D/estimateAffinePartial2D() calls
Alexander Alekhin [Fri, 5 Apr 2019 18:56:19 +0000 (18:56 +0000)]
Merge pull request #14268 from alalek:fix_ossfuzz_13283
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
Alexander Alekhin [Fri, 5 Apr 2019 12:45:49 +0000 (12:45 +0000)]
Merge pull request #14256 from alalek:fix_docs_links_3.4
Alexander Alekhin [Fri, 5 Apr 2019 12:43:22 +0000 (12:43 +0000)]
Merge pull request #14251 from dkurt:dnn_tf_manage_switch
Dmitry Kurtaev [Wed, 3 Apr 2019 10:42:06 +0000 (13:42 +0300)]
Remove Switch and Merge nodes from TensorFlow networks
Alexander Alekhin [Thu, 4 Apr 2019 16:17:09 +0000 (16:17 +0000)]
Merge pull request #14249 from alalek:imgcodecs_tiff_update_3.4
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
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
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
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
Alexander Alekhin [Wed, 3 Apr 2019 19:30:47 +0000 (19:30 +0000)]
Merge pull request #14233 from alalek:cmake_fix_license_install
Alexander Alekhin [Wed, 3 Apr 2019 19:29:28 +0000 (19:29 +0000)]
Merge pull request #14229 from alalek:ffmpeg_downloader_elevated_run
Alexander Alekhin [Wed, 3 Apr 2019 19:26:46 +0000 (19:26 +0000)]
Merge pull request #14241 from alalek:openvino_2019R1
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
Alexander Alekhin [Wed, 3 Apr 2019 14:49:05 +0000 (17:49 +0300)]
dnn(test): skip 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
Alexander Alekhin [Mon, 1 Apr 2019 12:00:25 +0000 (15:00 +0300)]
dnn: use OpenVINO 2019R1 defines
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 14:47:03 +0000 (17:47 +0300)]
cmake: fix licenses install rules
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 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
Alexander Alekhin [Tue, 2 Apr 2019 13:38:28 +0000 (16:38 +0300)]
FFmpeg: try to download wrapper with elevated privileges
Dmitry Kurtaev [Tue, 2 Apr 2019 11:05:17 +0000 (14:05 +0300)]
Enable 1x1 convolution optimization
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 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 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 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
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
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
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 [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 [Wed, 27 Mar 2019 21:42:24 +0000 (21:42 +0000)]
cmake: hide helper modules
- bindings generators
- keep "ts" module