Dmitry Kurtaev
362d4f5395
Replace convertFp16 from dnn::Net::setInput()
2018-07-09 14:35:54 +03:00
Alexander Alekhin
0fd74fa177
Merge pull request #11911 from berak:core_fix_autobuffer_opengl
2018-07-08 13:50:35 +00:00
berak
45677819e8
core: fix autobuffer usage in opengl.cpp
2018-07-08 09:51:06 +02:00
Alexander Alekhin
5e6a3f1f6c
Merge pull request #11901 from alalek:fix_cuda_build
2018-07-06 14:07:50 +00:00
Vadim Pisarevsky
523b6f32ba
Merge pull request #11867 from dkurt:dnn_ie_layers
2018-07-06 13:13:20 +00:00
Alexander Alekhin
fc59498b2b
cuda: fix build
...
use cv::AutoBuffer::data() to get data pointer
2018-07-06 15:32:36 +03:00
Alexander Alekhin
3b01777c98
Merge pull request #11895 from alalek:fix_fn_types
2018-07-06 12:01:31 +00:00
Alexander Alekhin
06fc77610b
core(hal): eliminate build warnings
2018-07-06 13:00:41 +03:00
Dmitry Kurtaev
019c2f2115
Enable more deep learning tests
2018-07-05 14:23:15 +03:00
Alexander Alekhin
4bc080dc50
fix function signatures, drop invalid casts
2018-07-05 13:55:26 +03:00
Alexander Alekhin
0bb2c115aa
Merge pull request #11719 from alalek:update_autobuffer_api
2018-07-05 10:01:15 +00:00
Alexander Alekhin
ccd2370bb7
Merge pull request #11890 from dkurt:keras_resize_nearest
2018-07-05 09:57:24 +00:00
Alexander Alekhin
c0d0cf5e74
Merge pull request #11893 from dkurt:fix_11884
2018-07-05 09:56:50 +00:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
135ea264ef
core: align cv::AutoBuffer API with std::vector/std::array
...
- added .data() methods
- added operator[] (int i)
- extend checks support to generic and debug-only cases
- deprecate existed operator* ()
2018-07-04 19:10:38 +03:00
Dmitry Kurtaev
f25a01bb5a
Disable fusion to output layers
2018-07-04 15:53:47 +03:00
Alexander Alekhin
bd8c8e720e
Merge tag '3.4.2'
2018-07-04 14:08:11 +03:00
Alexander Alekhin
9e1b1e5389
OpenCV 3.4.2
2018-07-04 14:05:47 +03:00
Dmitry Kurtaev
36288eebe7
Nearest neighbor resize from Keras
2018-07-04 11:53:24 +03:00
Vadim Pisarevsky
a0baae8a55
Merge pull request #11875 from dkurt:dnn_fix_reshape
2018-07-04 08:08:04 +00:00
Alexander Alekhin
9a66331984
Merge pull request #11882 from alalek:videoio_vfw_lower_priority
2018-07-03 14:54:54 +00:00
Alexander Alekhin
f545aee66d
videoio(VFW): lower priority (after DSHOW)
2018-07-03 15:54:45 +03:00
Alexander Alekhin
b3578710cf
videoio(MSMF): fix 32-bit build crash
2018-07-03 15:28:55 +03:00
ilovezfs
0c4328fbf3
Python 3.7 compatability
...
The result of PyUnicode_AsUTF8() is now of type const char * rather of
char *.
2018-07-03 00:38:59 -07:00
Dmitry Kurtaev
7ed5d85f25
Add Reshape layer tests
2018-07-03 08:26:43 +03:00
Alexander Alekhin
5557474467
imgcodecs(sunras): avoid buffer overrun
...
`src_pitch` may be large than data `step`
2018-07-02 12:56:50 +03:00
Alexander Alekhin
5a27f7c81f
Merge pull request #11856 from alalek:videoio_msmf_fix_check
2018-06-30 04:52:36 +00:00
Alexander Alekhin
6ce26b72b1
Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_code
2018-06-30 04:51:20 +00:00
Alexander Alekhin
2dbaba077a
videoio(msmf): avoid using of C++11 code
...
build fails with MSVS 2012 without additional flags
2018-06-29 20:48:58 +00:00
Alexander Alekhin
7a2448672c
videoio(MSMF): avoid OpenCV load failure on Win7 machines
...
OpenCV binaries are compiled on Win10 environment
2018-06-29 20:22:26 +00:00
Alexander Alekhin
9be3f7d41a
Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2
2018-06-29 15:02:22 +00:00
Alexander Alekhin
f40231af5d
Merge pull request #11851 from pengli:3.4
2018-06-29 15:01:20 +00:00
Alexander Alekhin
c3a90ccbad
videoio(MSMF): remove "always true" check
2018-06-29 15:23:48 +03:00
Li Peng
145eae321e
pooling ocl kernel optimization
...
set global size with real output size, also optimize
max pooling index computation if necessary.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-06-29 15:22:49 +08:00
Dmitry Kurtaev
d971678add
Add a planar data layout tracking for TensorFlow importer
2018-06-29 09:50:14 +03:00
Dmitry Kurtaev
346871e27f
Set output layers names and types for models in DLDT's intermediate representation
2018-06-28 10:21:45 +03:00
Vadim Pisarevsky
67259d7082
Merge pull request #11768 from alalek:videoio_msmf_async_live_capture
2018-06-27 18:12:10 +00:00
Vadim Pisarevsky
75ee536d6d
Filter homography decomp: updated PR #7153 ( #11846 )
...
* Add functionality to filter homography decompositions
* documentation + small refactor
* fix comparing int to size_t (compiler warning)
* fix whitespace issues
* clarification of function return values in documentation
* refactor of function parameters and change in loop nesting
* cleanup useless .h, fix size_t to int compare, small refactor
* fix documentation and whitespace
* change output from return value to outputarray parameter
* update function docs to reflect changes in parameters
* whitespace
* failing test
* fixed warnings related to extended initialisers and improper types
* initialize vectors from arrays
* initialize vectors from arrays part 2
* fix whitespace
* fix trailing whitespace
* Include <inttypes.h> in test_filter_homography_decomp.cpp, should fix 'uint8_t' : undeclared identifier error
* updated the test (made it shorter and providing better diagnostic) and significantly improved implementation (get rid of heavy repeated and/or unnecessary operations)
* fixed compile warning; removed trailing whitespace
2018-06-27 16:47:35 +03:00
Nesterov Alexander
0081dc478f
Init qrcode algo ( #11829 )
2018-06-27 16:37:10 +03:00
Vadim Pisarevsky
5dc0e51682
Merge pull request #11839 from dkurt:dnn_ie_r2
2018-06-27 09:56:02 +00:00
Vadim Pisarevsky
ba1a6ad4cc
Merge pull request #11840 from dkurt:dnn_tf_nchw
2018-06-26 19:27:25 +00:00
branka-plateiq
34ad9b8a42
Pass RANSAC parameters as function input ( #10569 )
...
* Pass RANSAC parameters as function input
* Clean up unnecessary code
* Keep the original function signature
* Clean up based on PR comments
Replace array with vector.
Correct naming convention for input variables.
Add checks on input variables.
* Use vector instead of array for dynamic size
* Revert change.
* Use dynamic array
* Fix wrong syntax in array allocation
* Undo change
* Fix variable name
* Use vector and not array
* fixed compile warning on Windows
2018-06-26 16:40:28 +03:00
Dmitry Kurtaev
dbeb4a11be
Parse strides and convolution kernel shapes considering data layout
2018-06-26 16:18:21 +03:00
Dmitry Kurtaev
b11e22c25b
Update Inference Engine tests
2018-06-26 15:38:08 +03:00
Vadim Pisarevsky
53a475d63c
Merge pull request #11836 from terfendail:msmf_camfallback
2018-06-26 12:17:55 +00:00
Vadim Pisarevsky
e87425f047
Merge pull request #11835 from dkurt:dnn_tf_two_inputs
2018-06-26 12:12:24 +00:00
Vitaly Tuzov
67b67003c5
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.
2018-06-26 14:04:02 +03:00
Dmitry Kurtaev
9510551c63
Multiple inputs for TensorFlow models
2018-06-26 14:03:59 +03:00
Vadim Pisarevsky
b80c7bca0d
Merge pull request #11826 from dkurt:dnn_tf_data_layouts
2018-06-26 06:36:27 +00:00
Vadim Pisarevsky
dc27d52221
temporarily disabled OpenCL use in DNN module on Mac ( #11828 )
...
* temporarily disabled OpenCL use in DNN module on Mac, since some of the tests fail
* disable OpenCL in DNN on Mac at CMake level, not source level (thanks to alalek for the advice)
2018-06-26 09:35:18 +03:00