Dmitry Kurtaev
8b5f061dae
Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers
2018-07-11 18:58:56 +03:00
Alexander Alekhin
999aba3807
Merge pull request #11936 from berak:dnn_shufflelayer_name
2018-07-11 12:01:31 +00:00
Alexander Alekhin
82c7ab0231
Merge pull request #11927 from pengli:3.4
2018-07-11 09:33:24 +00:00
Li Peng
4c5a86828a
Fix gemmlike convolution input reading
...
use vload3 for half3 or float3 input vector reading,
also check read position to see if it exceed input width
Signed-off-by: Li Peng <peng.li@intel.com>
2018-07-11 15:25:21 +08:00
berak
a7b502f04a
dnn: preserve name, type strings for ShuffleLayer
2018-07-11 08:19:23 +02:00
Alexander Alekhin
e4b5e9b9c9
Merge pull request #11931 from catree:add_doc_eye_ones
2018-07-10 15:43:32 +00:00
Alexander Alekhin
e9bb26267e
Merge pull request #11929 from alalek:dnn_test_drop_enums
2018-07-10 15:31:52 +00:00
catree
d7bd662c95
Add a note in the documentation about Mat::ones and mat::eye. With multi-channels type (e.g. CV_8UC3), only the first channel is treated.
2018-07-10 15:35:46 +02:00
Alexander Alekhin
452fa3011c
dnn(test): drop CV_ENUM for DNNBackend / DNNTarget
2018-07-10 15:12:01 +03:00
Dmitry Kurtaev
d57e5406f0
Add readNet* functions which parse models from byte arrays
2018-07-10 11:12:01 +03:00
Alexander Alekhin
7fe0727930
Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward
2018-07-09 16:25:34 +00:00
Alexander Alekhin
529d38613b
Merge pull request #11923 from alalek:dnn_external_protobuf
2018-07-09 16:07:42 +00:00
Alexander Alekhin
88d56dc700
Merge pull request #11922 from alalek:dnn_test_myriad_check
2018-07-09 16:07:18 +00:00
Alexander Alekhin
7ba66a1682
Merge pull request #11703 from alalek:c_api_calib3d_chessboard_detector
2018-07-09 15:37:26 +00:00
Alexander Alekhin
b6255ab9e7
dnn(ocl4dnn): fix args for 'max_pool_forward' kernel
2018-07-09 18:02:20 +03:00
Alexander Alekhin
924ff903ad
Merge pull request #11903 from alalek:issue_9002
2018-07-09 14:49:37 +00:00
Alexander Alekhin
e2b5d11290
dnn: allow to use external protobuf
...
"custom layers" feature will not work properly in these builds.
2018-07-09 17:28:45 +03:00
Alexander Alekhin
e41f19d2f3
Merge pull request #11919 from dkurt:dnn_replace_convert_fp16
2018-07-09 14:07:37 +00:00
Alexander Alekhin
52b151dceb
dnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test
2018-07-09 16:20:46 +03:00
Dmitry Kurtaev
362d4f5395
Replace convertFp16 from dnn::Net::setInput()
2018-07-09 14:35:54 +03:00
Alexander Alekhin
a29d11240e
Merge pull request #11906 from berak:fix_qrcode
2018-07-09 09:36:41 +00:00
asciian
61d8719b8d
Reading net from std::ifstream
...
Remove some assertions
Replace std::ifstream to std::istream
Add test for new importer
Remove constructor to load file
Rename cfgStream and darknetModelStream to ifile
Add error notification to inform pathname to user
Use FileStorage instead of std::istream
Use FileNode instead of FileStorage
Fix typo
2018-07-09 10:02:05 +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
berak
e14b2ba43c
objdetect: validate input in qrcode
2018-07-07 16:56:40 +02:00
Alexander Alekhin
81325a3fa0
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
2018-07-06 17:35:47 +03:00
Alexander Alekhin
aa0c6ddb4c
highgui: fix GTK issues with external UI thread
2018-07-06 17:35:47 +03: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
aa10cdbfa2
Merge pull request #11900 from alalek:build_warnings
2018-07-06 12:00:43 +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
c7fc563dc0
calib3d: chessboard detector - replace OpenCV C API
2018-07-05 13:09:10 +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
6309e28dd0
Merge tag '3.4.2-openvino'
2018-07-04 14:08:21 +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
c9fab28214
Merge pull request #11881 from alalek:sample_use_camera_0
2018-07-03 14:54:26 +00:00
Alexander Alekhin
e93e1ba2c9
Merge pull request #11879 from alalek:fix_msmf_32bit
2018-07-03 14:10:42 +00:00
