Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
woody.chow
07c6b0a8df
Replace naive normL2Sqr with hal::normL2Sqr_ for better performance
2018-09-06 17:43:07 +09:00
Alexander Alekhin
8e8315abfd
Merge pull request #12434 from alalek:pr12414_rebased
2018-09-05 16:46:36 +00:00
Alexander Alekhin
a18da0c55e
Merge pull request #12355 from sturkmen72:update_samples
2018-09-05 16:24:02 +00:00
Zhenqing Hu
d621a99e73
To fix bug #12389 , which is a validation for the potential null pointer.
...
Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
2018-09-05 19:14:34 +03:00
Alexander Alekhin
107660c7ba
Merge pull request #12433 from alalek:fix_contrib_1746
2018-09-05 16:09:27 +00:00
Suleyman TURKMEN
b33cb2e3f2
Update samples
2018-09-05 18:16:40 +03:00
Alexander Alekhin
e70526625f
imgproc: fix Subdiv2D::getTriangleList()
2018-09-05 16:24:27 +03:00
Alexander Alekhin
8a328e393d
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests
2018-09-05 10:04:04 +00:00
Alexander Alekhin
9fae8070dc
Merge pull request #12424 from alalek:fix_build_avoid_nullptr
2018-09-05 09:46:26 +00:00
Dmitry Kurtaev
6ec230480d
Enable Myriad tests with batch size > 1
2018-09-05 10:45:09 +03:00
Alexander Alekhin
c441ad36c8
build: don't use nullptr without C++11 guard
2018-09-05 06:19:02 +00:00
Alexander Alekhin
59cd636ad7
Merge pull request #12420 from cv3d:fix/gtest_vc12
2018-09-05 06:12:09 +00:00
Hamdi Sahloul
3f3d805663
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
2018-09-05 12:16:47 +09:00
Alexander Alekhin
351ee2e3a5
Merge pull request #12409 from dkurt:fix_12407
2018-09-04 16:34:30 +00:00
Alexander Alekhin
7f7f30a08b
Merge pull request #12406 from alalek:backport_12357_12391
2018-09-04 16:09:44 +00:00
Alexander Alekhin
fda99c1c6c
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
2018-09-04 15:16:08 +00:00
Alexander Alekhin
71c8de8fa1
Merge pull request #12383 from alalek:ts_qemu_support
2018-09-04 15:15:39 +00:00
Dmitry Kurtaev
27a6be8763
Fix #12407
2018-09-04 17:48:52 +03:00
Alexander Alekhin
acce95f446
backport fixes for static analyzer warnings
...
Commits:
- 09837928d9
- 10fb88d027
Excluded changes with std::atomic (C++98 requirement)
2018-09-04 16:49:42 +03:00
Alexander Alekhin
a78e5344df
Merge pull request #12382 from alalek:update_gtest_1.8.1
2018-09-04 13:28:55 +00:00
Alexander Alekhin
e5236cecd6
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
2018-09-04 12:55:05 +00:00
Alexander Alekhin
6aff916aa5
Merge pull request #12398 from alalek:samples_eliminate_cvconfig
2018-09-04 11:38:34 +00:00
Alexander Alekhin
4f9db2c03a
Merge pull request #12377 from alalek:inputarray_raw_wrapper_customtype
2018-09-04 11:29:23 +00:00
Todor Tomov
9988e1b6ee
cap_v4l: Fix private control enumeration end condition
...
Currently the private control enumeration will be stopped when QUERYCTRL
returns -EINVAL only. It is possible however that other errors occur.
One particular case is when the v4l2 device doesn't support any controls
and doesn't implement the QUERYCTRL ioctl. In that case the v4l2
framework returns -ENOTTY. In that case the current control enumeration
will go in an endless loop.
To fix this change the control enumeration stop condition. If any errors
occur, end the control enumeration.
Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
2018-09-04 11:33:08 +03:00
Alexander Alekhin
afb81ba6e6
samples: eliminate cvconfig.h usage
...
- don't use TBB in samples
2018-09-04 07:28:17 +00:00
Alexander Alekhin
0f0a82b619
Merge pull request #12402 from alalek:fix_build_dnn_tests
2018-09-04 06:39:20 +00:00
Alexander Alekhin
2cf34c0fe5
dnn: fix tests build with disabled OpenCL
2018-09-03 23:11:25 +00:00
Alexander Alekhin
49a1328046
Merge pull request #12396 from LaurentBerger:I12392
2018-09-03 20:26:14 +00:00
Alexander Alekhin
2877f17372
Merge pull request #12397 from terfendail:resize_wintr_fix
2018-09-03 20:25:45 +00:00
Alexander Alekhin
00cbb894ec
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
2018-09-03 18:41:48 +00:00
Alexander Alekhin
a0f86479e0
core: wrap custom types via _RawArray (raw() call)
...
- support passing of `std::vector<KeyPoint>` via InputArray
2018-09-03 18:41:48 +00:00
Vitaly Tuzov
f9a5c4d181
Fixed bit-exact resize wide intrinsics implementation for 16U
2018-09-03 20:37:25 +03:00
LaurentBerger
d71812425a
Solves issue 12392
2018-09-03 19:30:49 +02:00
Alexander Alekhin
aa5c45339c
Merge pull request #12393 from peterjozsa:issue_12301
2018-09-03 16:16:48 +00:00
Alexander Alekhin
1e362ff5c3
imgproc(GaussianBlur): restore processing order
2018-09-03 18:39:42 +03:00
Vadim Pisarevsky
fc71316690
Merge pull request #12371 from alalek:issue_12366
2018-09-03 14:30:16 +00:00
yuki takehara
cb7ee27cd9
Fix bug in distanceTransform ( #12278 )
...
* fix 12218
* Update test_distancetransform.cpp
marked the test as "BIGDATA_TEST" in order to skip it on low-mem platforms
* modify test
* use a smaller image in the test
* fix test code
2018-09-03 17:18:10 +03:00
Dmitry Kurtaev
c7cf8fb35c
Import SSDs from TensorFlow by training config ( #12188 )
...
* Remove TensorFlow and protobuf dependencies from object detection scripts
* Create text graphs for TensorFlow object detection networks from sample
2018-09-03 17:08:40 +03:00
Peter Jozsa
8b0e1c7fcb
Fix https://github.com/opencv/opencv/issues/12301
2018-09-03 14:56:38 +02:00
Alexander Alekhin
e3af72bb68
Merge pull request #12376 from alalek:issue_12337
2018-09-03 10:17:56 +00:00
Alexander Alekhin
ec3492a22a
Merge pull request #12374 from alalek:issue_12368
2018-09-03 10:17:09 +00:00
Alexander Alekhin
07808c8d5d
Merge pull request #12373 from alalek:issue_12365
2018-09-03 10:16:51 +00:00
Alexander Alekhin
436e330642
Merge pull request #12386 from wzw-intel:redundant_code
2018-09-03 09:33:00 +00:00
Wu Zhiwen
a11d944f51
dnn: Remove a duplicated code snippet for flatten layer
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-09-03 10:57:33 +08:00
Alexander Alekhin
c85e44697e
cmake: drop unconditional forcing of CMAKE_SKIP_RPATH=TRUE
...
CMake "cache" entry for CMAKE_SKIP_RPATH is in the end of this file
2018-09-02 21:48:10 +00:00
Alexander Alekhin
af883e88e1
ts: support QEMU launcher
2018-09-02 21:48:01 +00:00
Alexander Alekhin
3dddf703a9
ts: re-apply OpenCV-specific patch on googletest 1.8.1
2018-09-02 13:45:48 +00:00
Alexander Alekhin
f7ccc74e09
ts: update Google Test 1.8.1
...
Helper script from googletest: ./scripts/fuse_gtest_files.py
2018-09-02 12:21:29 +00:00
Alexander Alekhin
546fcd990e
ts: restore Google Test 1.8.0 (capture OpenCV specific patch)
2018-09-02 12:07:15 +00:00