Alexander Alekhin [Tue, 30 Apr 2019 16:48:34 +0000 (16:48 +0000)]
Merge pull request #14448 from rgarnov:gapi_gmatp
Ruslan Garnov [Mon, 29 Apr 2019 16:21:14 +0000 (19:21 +0300)]
Added GMatP type
anton-potapov [Tue, 30 Apr 2019 10:11:56 +0000 (13:11 +0300)]
Merge pull request #14346 from anton-potapov:gapi_async
* Async API for GAPI
- naive implementation as a starting point
* Fix namespace comment in header
Alexander Alekhin [Mon, 29 Apr 2019 15:08:11 +0000 (15:08 +0000)]
Merge pull request #14429 from rgarnov:gapi_fluid_fix_small_rois
Alexander Alekhin [Fri, 26 Apr 2019 20:18:38 +0000 (20:18 +0000)]
Merge pull request #14426 from alalek:cmake_fix_include_pkgconfig
Alexander Alekhin [Fri, 26 Apr 2019 12:13:16 +0000 (15:13 +0300)]
cmake: fix pkg-config handling
Avoid non-intentional call of "include(FindPkgConfig)"
It should be handled in the root CMakeLists.txt (safely for cross-compiling)
Alexander Alekhin [Fri, 26 Apr 2019 14:59:12 +0000 (14:59 +0000)]
Merge pull request #14402 from rgarnov:gapi_planar_mats
Ruslan Garnov [Fri, 26 Apr 2019 14:34:44 +0000 (17:34 +0300)]
Fixed incorrect first window setting for fluid FilterAgent
Ruslan Garnov [Fri, 26 Apr 2019 14:33:50 +0000 (17:33 +0300)]
Added a reproducer
Ruslan Garnov [Mon, 22 Apr 2019 14:36:10 +0000 (17:36 +0300)]
Added planar flag to GMatDesc, intergated into framework, added tests
Alexander Alekhin [Mon, 22 Apr 2019 16:08:11 +0000 (19:08 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 22 Apr 2019 15:55:19 +0000 (15:55 +0000)]
Merge pull request #14390 from dkurt:dnn_onnx_const_reshape
Alexander Alekhin [Mon, 22 Apr 2019 15:54:08 +0000 (15:54 +0000)]
Merge pull request #14389 from alalek:cmake_fix_pch_build_with_vtk
Alexander Alekhin [Mon, 22 Apr 2019 15:53:13 +0000 (15:53 +0000)]
Merge pull request #14387 from alalek:fix_winpack_build
Alexander Alekhin [Mon, 22 Apr 2019 15:52:53 +0000 (15:52 +0000)]
Merge pull request #14384 from terfendail:fp16_depint
Alexander Alekhin [Mon, 22 Apr 2019 15:52:10 +0000 (15:52 +0000)]
Merge pull request #14382 from alalek:backport_14373
Alexander Alekhin [Mon, 22 Apr 2019 15:51:46 +0000 (15:51 +0000)]
Merge pull request #14379 from sturkmen72:upd_GeneralizedHough
masa-iwm [Mon, 22 Apr 2019 15:50:31 +0000 (00:50 +0900)]
Merge pull request #14376 from masa-iwm:3.4
* fix getting platformIDs in initializeContextFromD3D11Device
Dmitry Kurtaev [Mon, 22 Apr 2019 14:55:04 +0000 (17:55 +0300)]
Run Reshape layer for const input from ONNX models
Alexander Alekhin [Mon, 22 Apr 2019 14:42:10 +0000 (17:42 +0300)]
cmake: guard macro definitions in PCH scripts
fixes build with VTK
Alexander Alekhin [Mon, 22 Apr 2019 12:41:27 +0000 (15:41 +0300)]
build: reduce usage of constexpr
some compilers has lack of proper support for that
Vitaly Tuzov [Mon, 22 Apr 2019 07:35:37 +0000 (10:35 +0300)]
Cleared up deprecated intrinsics for FP16
Suleyman TURKMEN [Sun, 21 Apr 2019 06:39:35 +0000 (09:39 +0300)]
Update imgproc.hpp
Ryan Wong [Sun, 21 Apr 2019 21:01:10 +0000 (14:01 -0700)]
Merge pull request #13909 from kinchungwong:logging_20190220
OE-11 Logging revamp (#13909)
* Initial commit for log tag support.
Part of #11003, incomplete. Should pass build.
Moved LogLevel enum to logger.defines.hpp
LogTag struct used to convey both name and log level threshold as
one argument to the new logging macro. See logtag.hpp file, and
CV_LOG_WITH_TAG macro.
Global log level is now associated with a global log tag, when a
logging statement doesn't specify any log tag. See getLogLevel and
getGlobalLogTag functions.
A macro CV_LOGTAG_FALLBACK is allowed to be re-defined by other modules
or compilation units, internally, so that logging statements inside
that unit that specify NULL as tag will fall back to the re-defined tag.
Line-of-code information (file name, line number, function name),
together with tag name, are passed into the new log message sink.
See writeLogMessageEx function.
Fixed old incorrect CV_LOG_VERBOSE usage in ocl4dnn_conv_spatial.cpp.
* Implemented tag-based log filtering
Added LogTagManager. This is an initial version, using standard C++
approach as much as possible, to allow easier code review. Will
optimize later.
A workaround for all static dynamic initialization issues is
implemented. Refer to code comments.
* Added LogTagConfigParser.
Note: new code does not fully handle old log config parsing behavior.
* Fix log tag config vs registering ordering issue.
* Started testing LogTagConfigParser, incomplete.
The intention of this commit is to illustrate the capabilities of
the current design of LogTagConfigParser.
The test contained in this commit is not complete. Also, design changes
may require throwing away this commit and rewriting test code from
scratch.
Does not test whitespace segmentation (multiple tags on the config);
will do in next commit.
* Added CV_LOGTAG_EXPAND_NAME macro
This macro allows to be re-defined locally in other compilation units
to apply a prefix to whatever argument is passed as the "tag" argument
into CV_LOG_WITH_TAG. The default definition in logger.hpp does not
modify the argument. It is recommended to include the address-of
operator (ampersand) when re-defined locally.
* Added a few tests for LogTagManager, some fail.
See test_logtagmanager.cpp
Failed tests are: non-global ("something"), setting level by name-part
(first part or any part) has no effect at all.
* LogTagManagerTests substring non-confusion tests
* Fix major bugs in LogTagManager
The code change is intended to approximate the spec documented in
https://gist.github.com/kinchungwong/
ec25bc1eba99142e0be4509b0f67d0c6
Refer to test suite in test_logtagmanager.cpp
Filter test result in "opencv_test_core" ...
with gtest_filter "LogTagManager*"
To see the test code that finds the bugs, refer to original commits
(before rebase; might be gone)
..
f3451208 (2019-03-03T19:45:17Z)
.... LogTagManagerTests substring non-confusion tests
..
1b848f5f (2019-03-03T01:55:18Z)
.... Added a few tests for LogTagManager, some fail.
* Added LogTagManagerNamePartNonConfusionTest.
See test_logtagmanager.cpp in modules/core/test.
* Added LogTagAuto for auto registration in ctor
* Rewritten LogTagManager to resolve issues.
* Resolves code review issues around 2019-04-10
LogTagConfigParser::parseLogLevel - as part of resolving code review
issues, this function is rewritten to simplify control flow and to
improve conformance with legacy usage (for string values "OFF",
"DISABLED", and "WARNINGS").
Alexander Alekhin [Sat, 20 Apr 2019 20:09:33 +0000 (20:09 +0000)]
imgcodecs(tiff): update tile size checks
backporting of commit:
25247b9f6e5e550868262b7611a9e575c1f7212a
Alexander Alekhin [Sat, 20 Apr 2019 20:53:07 +0000 (20:53 +0000)]
Merge pull request #14373 from alalek:oss_fuzz_14185_14321
Alexander Alekhin [Sat, 20 Apr 2019 20:09:33 +0000 (20:09 +0000)]
imgcodecs(tiff): update tile size checks
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14185
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14321
Alexander Alekhin [Sat, 20 Apr 2019 19:30:54 +0000 (19:30 +0000)]
Merge pull request #14369 from ManthanKeim:patch-1
Manthan Keim [Sat, 20 Apr 2019 06:47:38 +0000 (12:17 +0530)]
Update py_svm_opencv.markdown
Fixes a broken link for histograms of Oriented Gradients.
Dmitry Kurtaev [Fri, 19 Apr 2019 18:01:19 +0000 (21:01 +0300)]
Merge pull request #13694 from dkurt:dnn_ie_async
Asynchronous API from Intel's Inference Engine (#13694)
* Add forwardAsync for asynchronous mode from Intel's Inference Engine
* Python test for forwardAsync
* Replace Future_Mat to AsyncMat
* Shadow AsyncMat
* Isolate InferRequest callback
* Manage exceptions in Async API of IE
Alexander Alekhin [Fri, 19 Apr 2019 12:43:58 +0000 (15:43 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 19 Apr 2019 12:42:16 +0000 (12:42 +0000)]
Merge pull request #14366 from alalek:win32_fix_pdb
Alexander Alekhin [Fri, 19 Apr 2019 10:54:51 +0000 (13:54 +0300)]
cmake: fix PDB handling
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
Ruslan Garnov [Wed, 17 Apr 2019 18:54:47 +0000 (21:54 +0300)]
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
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:10:24 +0000 (13:10 +0000)]
Merge pull request #14339 from alalek:cmake_fix_std_cxx11
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 17:00:55 +0000 (20:00 +0300)]
cmake: fix C++11 flags (ENABLE_CXX11 is not required)
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
Alexander Alekhin [Sat, 13 Apr 2019 17:22:38 +0000 (17:22 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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 [Fri, 12 Apr 2019 11:36:17 +0000 (11:36 +0000)]
Merge pull request #11748 from paroj:cap_except
Maksim Shabunin [Thu, 11 Apr 2019 16:16:50 +0000 (19:16 +0300)]
Merge pull request #14278 from mshabunin:fix-osx-camera-auth-rt
* AVFoundation: Use runtime check for camera authorization
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
Pavel Rojtberg [Tue, 12 Jun 2018 13:21:33 +0000 (15:21 +0200)]
VideoCapture: add exception error mode similar to fstream + test
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 [Mon, 8 Apr 2019 11:34:32 +0000 (14:34 +0300)]
'-dev' version
Alexander Alekhin [Mon, 8 Apr 2019 08:10:29 +0000 (08:10 +0000)]
Merge tag '4.1.0'
Alexander Alekhin [Sun, 7 Apr 2019 17:09:10 +0000 (17:09 +0000)]
release: OpenCV 4.1.0
OpenCV 4.1.0
Alexander Alekhin [Sun, 7 Apr 2019 17:07:04 +0000 (17:07 +0000)]
Merge tag '4.1.0-openvino'
Alexander Alekhin [Sun, 7 Apr 2019 12:35:15 +0000 (12:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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 19:02:24 +0000 (19:02 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Maksim Shabunin [Fri, 5 Apr 2019 18:58:01 +0000 (21:58 +0300)]
Merge pull request #14267 from mshabunin:fix-osx-camera-auth
* Added authorization request to AVFoundation camera backend (OSX 10.14+)
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
Dmitry Kurtaev [Fri, 5 Apr 2019 14:15:51 +0000 (17:15 +0300)]
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
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