Pavel Rojtberg [Tue, 17 Jul 2018 10:38:48 +0000 (12:38 +0200)]
core: FileStorage - add support for writing vector<String> with bindings (#11883)
* core: FileStorage - add support for writing vector<String> with bindings
* python: extend persistence test for string sequences
Alexander Alekhin [Sun, 15 Jul 2018 14:32:15 +0000 (14:32 +0000)]
Merge pull request #11980 from berak:core_lda_dataAsRow
berak [Sun, 15 Jul 2018 09:32:00 +0000 (11:32 +0200)]
core: remove unused dataAsRow flag from LDA
Alexander Alekhin [Wed, 11 Jul 2018 09:35:10 +0000 (12:35 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 11 Jul 2018 09:33:24 +0000 (09:33 +0000)]
Merge pull request #11927 from pengli:3.4
Li Peng [Tue, 10 Jul 2018 04:43:03 +0000 (12:43 +0800)]
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>
Alexander Alekhin [Tue, 10 Jul 2018 15:43:32 +0000 (15:43 +0000)]
Merge pull request #11931 from catree:add_doc_eye_ones
Alexander Alekhin [Tue, 10 Jul 2018 15:31:51 +0000 (15:31 +0000)]
Merge pull request #11929 from alalek:dnn_test_drop_enums
catree [Tue, 10 Jul 2018 13:35:46 +0000 (15:35 +0200)]
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.
Alexander Alekhin [Tue, 10 Jul 2018 12:00:42 +0000 (15:00 +0300)]
dnn(test): drop CV_ENUM for DNNBackend / DNNTarget
Alexander Alekhin [Mon, 9 Jul 2018 16:31:45 +0000 (19:31 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 9 Jul 2018 16:25:34 +0000 (16:25 +0000)]
Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward
Alexander Alekhin [Mon, 9 Jul 2018 16:07:41 +0000 (16:07 +0000)]
Merge pull request #11923 from alalek:dnn_external_protobuf
Alexander Alekhin [Mon, 9 Jul 2018 16:07:18 +0000 (16:07 +0000)]
Merge pull request #11922 from alalek:dnn_test_myriad_check
Alexander Alekhin [Mon, 9 Jul 2018 15:37:26 +0000 (15:37 +0000)]
Merge pull request #11703 from alalek:c_api_calib3d_chessboard_detector
Alexander Alekhin [Mon, 9 Jul 2018 15:02:20 +0000 (18:02 +0300)]
dnn(ocl4dnn): fix args for 'max_pool_forward' kernel
Alexander Alekhin [Mon, 9 Jul 2018 14:49:37 +0000 (14:49 +0000)]
Merge pull request #11903 from alalek:issue_9002
Alexander Alekhin [Mon, 9 Jul 2018 14:19:35 +0000 (17:19 +0300)]
dnn: allow to use external protobuf
"custom layers" feature will not work properly in these builds.
Alexander Alekhin [Mon, 9 Jul 2018 14:07:37 +0000 (14:07 +0000)]
Merge pull request #11919 from dkurt:dnn_replace_convert_fp16
Alexander Alekhin [Mon, 9 Jul 2018 13:20:46 +0000 (16:20 +0300)]
dnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test
Dmitry Kurtaev [Mon, 9 Jul 2018 11:35:54 +0000 (14:35 +0300)]
Replace convertFp16 from dnn::Net::setInput()
Alexander Alekhin [Mon, 9 Jul 2018 09:36:40 +0000 (09:36 +0000)]
Merge pull request #11906 from berak:fix_qrcode
Alexander Alekhin [Sun, 8 Jul 2018 13:50:35 +0000 (13:50 +0000)]
Merge pull request #11911 from berak:core_fix_autobuffer_opengl
berak [Sun, 8 Jul 2018 07:51:06 +0000 (09:51 +0200)]
core: fix autobuffer usage in opengl.cpp
berak [Sat, 7 Jul 2018 14:56:40 +0000 (16:56 +0200)]
objdetect: validate input in qrcode
Arnaud Brejeon [Fri, 6 Jul 2018 20:36:08 +0000 (13:36 -0700)]
Merge pull request #11899 from arnaudbrejeon:moveable_types
Add missing constructors and operator= (#11899)
Alexander Alekhin [Fri, 6 Jul 2018 14:06:01 +0000 (17:06 +0300)]
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
Alexander Alekhin [Fri, 6 Jul 2018 13:17:49 +0000 (16:17 +0300)]
highgui: fix GTK issues with external UI thread
Alexander Alekhin [Fri, 6 Jul 2018 14:07:50 +0000 (14:07 +0000)]
Merge pull request #11901 from alalek:fix_cuda_build
Vadim Pisarevsky [Fri, 6 Jul 2018 13:13:20 +0000 (13:13 +0000)]
Merge pull request #11867 from dkurt:dnn_ie_layers
Alexander Alekhin [Fri, 6 Jul 2018 12:31:25 +0000 (15:31 +0300)]
cuda: fix build
use cv::AutoBuffer::data() to get data pointer
Alexander Alekhin [Fri, 6 Jul 2018 12:01:31 +0000 (12:01 +0000)]
Merge pull request #11895 from alalek:fix_fn_types
Alexander Alekhin [Fri, 6 Jul 2018 12:00:43 +0000 (12:00 +0000)]
Merge pull request #11900 from alalek:build_warnings
Alexander Alekhin [Fri, 6 Jul 2018 09:41:59 +0000 (12:41 +0300)]
core(hal): eliminate build warnings
Dmitry Kurtaev [Wed, 27 Jun 2018 13:34:36 +0000 (16:34 +0300)]
Enable more deep learning tests
Alexander Alekhin [Thu, 5 Jul 2018 10:54:42 +0000 (13:54 +0300)]
fix function signatures, drop invalid casts
Alexander Alekhin [Wed, 23 May 2018 14:44:12 +0000 (17:44 +0300)]
calib3d: chessboard detector - replace OpenCV C API
Alexander Alekhin [Thu, 5 Jul 2018 10:01:15 +0000 (10:01 +0000)]
Merge pull request #11719 from alalek:update_autobuffer_api
Alexander Alekhin [Thu, 5 Jul 2018 09:57:24 +0000 (09:57 +0000)]
Merge pull request #11890 from dkurt:keras_resize_nearest
Alexander Alekhin [Thu, 5 Jul 2018 09:56:50 +0000 (09:56 +0000)]
Merge pull request #11893 from dkurt:fix_11884
Alexander Alekhin [Sun, 10 Jun 2018 22:42:00 +0000 (22:42 +0000)]
opencv: Use cv::AutoBuffer<>::data()
Alexander Alekhin [Fri, 8 Jun 2018 05:55:57 +0000 (05:55 +0000)]
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* ()
Dmitry Kurtaev [Wed, 4 Jul 2018 12:50:39 +0000 (15:50 +0300)]
Disable fusion to output layers
Alexander Alekhin [Wed, 4 Jul 2018 11:08:21 +0000 (14:08 +0300)]
Merge tag '3.4.2-openvino'
Alexander Alekhin [Wed, 4 Jul 2018 11:08:11 +0000 (14:08 +0300)]
Merge tag '3.4.2'
Alexander Alekhin [Wed, 4 Jul 2018 11:05:47 +0000 (14:05 +0300)]
OpenCV 3.4.2
Dmitry Kurtaev [Wed, 4 Jul 2018 08:53:24 +0000 (11:53 +0300)]
Nearest neighbor resize from Keras
Vadim Pisarevsky [Wed, 4 Jul 2018 08:08:04 +0000 (08:08 +0000)]
Merge pull request #11875 from dkurt:dnn_fix_reshape
Alexander Alekhin [Tue, 3 Jul 2018 14:54:54 +0000 (14:54 +0000)]
Merge pull request #11882 from alalek:videoio_vfw_lower_priority
Alexander Alekhin [Tue, 3 Jul 2018 14:54:26 +0000 (14:54 +0000)]
Merge pull request #11881 from alalek:sample_use_camera_0
Alexander Alekhin [Tue, 3 Jul 2018 14:10:42 +0000 (14:10 +0000)]
Merge pull request #11879 from alalek:fix_msmf_32bit
Alexander Alekhin [Tue, 3 Jul 2018 12:54:45 +0000 (15:54 +0300)]
videoio(VFW): lower priority (after DSHOW)
Alexander Alekhin [Tue, 3 Jul 2018 12:44:53 +0000 (15:44 +0300)]
samples: videocapture_camera use VideoCapture with 0 index
Not all backends support -1 index.
Alexander Alekhin [Tue, 3 Jul 2018 12:28:55 +0000 (15:28 +0300)]
videoio(MSMF): fix 32-bit build crash
Alexander Alekhin [Tue, 3 Jul 2018 09:15:15 +0000 (09:15 +0000)]
Merge pull request #11876 from ilovezfs:patch-1
ilovezfs [Tue, 3 Jul 2018 06:31:39 +0000 (06:31 +0000)]
Python 3.7 compatability
The result of PyUnicode_AsUTF8() is now of type const char * rather of
char *.
Dmitry Kurtaev [Tue, 3 Jul 2018 05:26:43 +0000 (08:26 +0300)]
Add Reshape layer tests
Alexander Alekhin [Mon, 2 Jul 2018 15:02:13 +0000 (15:02 +0000)]
Merge pull request #11873 from catree:add_tutorial_features2d_java_python2
catree [Mon, 2 Jul 2018 12:59:00 +0000 (14:59 +0200)]
Add Java and Python code for AKAZE local features matching tutorial. Fix incorrect uses of Mat.mul() in Java code.
Uniform Lowe's ratio test in the code.
Alexander Alekhin [Mon, 2 Jul 2018 11:58:01 +0000 (14:58 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 2 Jul 2018 11:54:34 +0000 (11:54 +0000)]
Merge pull request #11869 from alalek:fix_11827
Alexander Alekhin [Mon, 2 Jul 2018 10:08:33 +0000 (10:08 +0000)]
Merge pull request #11865 from csukuangfj:patch_1
Alexander Alekhin [Mon, 2 Jul 2018 09:51:49 +0000 (12:51 +0300)]
imgcodecs(sunras): avoid buffer overrun
`src_pitch` may be large than data `step`
Kuang Fangjun [Mon, 2 Jul 2018 01:45:28 +0000 (09:45 +0800)]
remove a redundant option.
Alexander Alekhin [Sat, 30 Jun 2018 04:52:36 +0000 (04:52 +0000)]
Merge pull request #11856 from alalek:videoio_msmf_fix_check
Alexander Alekhin [Sat, 30 Jun 2018 04:51:20 +0000 (04:51 +0000)]
Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_code
Alexander Alekhin [Sat, 30 Jun 2018 04:50:30 +0000 (04:50 +0000)]
Merge pull request #11859 from alalek:fix_videoio_msmf_win7
Alexander Alekhin [Fri, 29 Jun 2018 20:34:14 +0000 (23:34 +0300)]
videoio(msmf): avoid using of C++11 code
build fails with MSVS 2012 without additional flags
Alexander Alekhin [Fri, 29 Jun 2018 19:54:58 +0000 (22:54 +0300)]
videoio(MSMF): avoid OpenCV load failure on Win7 machines
OpenCV binaries are compiled on Win10 environment
Alexander Alekhin [Fri, 29 Jun 2018 15:02:22 +0000 (15:02 +0000)]
Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2
Alexander Alekhin [Fri, 29 Jun 2018 15:01:20 +0000 (15:01 +0000)]
Merge pull request #11851 from pengli:3.4
Alexander Alekhin [Fri, 29 Jun 2018 12:23:48 +0000 (15:23 +0300)]
videoio(MSMF): remove "always true" check
Li Peng [Wed, 27 Jun 2018 07:15:56 +0000 (15:15 +0800)]
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>
Dmitry Kurtaev [Fri, 29 Jun 2018 06:50:14 +0000 (09:50 +0300)]
Add a planar data layout tracking for TensorFlow importer
Vadim Pisarevsky [Thu, 28 Jun 2018 10:34:42 +0000 (10:34 +0000)]
Merge pull request #11852 from dkurt:dnn_dldt_ir_outs
Dmitry Kurtaev [Thu, 28 Jun 2018 06:09:11 +0000 (09:09 +0300)]
Set output layers names and types for models in DLDT's intermediate representation
Vadim Pisarevsky [Wed, 27 Jun 2018 18:17:39 +0000 (18:17 +0000)]
Merge pull request #11849 from catree:add_tutorial_imgproc_java_python4
Vadim Pisarevsky [Wed, 27 Jun 2018 18:12:10 +0000 (18:12 +0000)]
Merge pull request #11768 from alalek:videoio_msmf_async_live_capture
catree [Wed, 27 Jun 2018 16:48:32 +0000 (18:48 +0200)]
Add Java and Python code for Image Segmentation with Distance Transform and Watershed Algorithm tutorial. Use more Pythonic code.
Vadim Pisarevsky [Wed, 27 Jun 2018 14:26:27 +0000 (14:26 +0000)]
Merge pull request #11804 from mshabunin:gst-sample
Vadim Pisarevsky [Wed, 27 Jun 2018 14:25:48 +0000 (14:25 +0000)]
Merge pull request #11847 from floe:gray8
Vadim Pisarevsky [Wed, 27 Jun 2018 13:47:35 +0000 (16:47 +0300)]
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
Nesterov Alexander [Wed, 27 Jun 2018 13:37:10 +0000 (16:37 +0300)]
Init qrcode algo (#11829)
Florian Echtler [Wed, 27 Jun 2018 13:31:53 +0000 (15:31 +0200)]
add support for 8-bit greyscale format
Vadim Pisarevsky [Wed, 27 Jun 2018 09:56:02 +0000 (09:56 +0000)]
Merge pull request #11839 from dkurt:dnn_ie_r2
Vadim Pisarevsky [Tue, 26 Jun 2018 19:27:25 +0000 (19:27 +0000)]
Merge pull request #11840 from dkurt:dnn_tf_nchw
Vadim Pisarevsky [Tue, 26 Jun 2018 14:10:00 +0000 (17:10 +0300)]
a part of PR #11364 (extended findNonZero & PSNR) (#11837)
* a part of https://github.com/opencv/opencv/pull/11364 by Tetragramm. Rewritten and extended findNonZero & PSNR to support more types, not just 8u.
* fixed compile & doxygen warnings
* fixed small bug in findNonZero test
branka-plateiq [Tue, 26 Jun 2018 13:40:28 +0000 (06:40 -0700)]
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
Dmitry Kurtaev [Tue, 26 Jun 2018 13:13:40 +0000 (16:13 +0300)]
Parse strides and convolution kernel shapes considering data layout
Dmitry Kurtaev [Tue, 26 Jun 2018 12:38:08 +0000 (15:38 +0300)]
Update Inference Engine tests
Vadim Pisarevsky [Tue, 26 Jun 2018 12:17:55 +0000 (12:17 +0000)]
Merge pull request #11836 from terfendail:msmf_camfallback
Vadim Pisarevsky [Tue, 26 Jun 2018 12:12:24 +0000 (12:12 +0000)]
Merge pull request #11835 from dkurt:dnn_tf_two_inputs
Vitaly Tuzov [Tue, 26 Jun 2018 11:04:02 +0000 (14:04 +0300)]
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.
Dmitry Kurtaev [Tue, 26 Jun 2018 10:32:28 +0000 (13:32 +0300)]
Multiple inputs for TensorFlow models
Alessandro de Oliveira Faria (A.K.A.CABELO) [Tue, 26 Jun 2018 09:10:52 +0000 (06:10 -0300)]
Include ELA example (#11819)
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* did some code cleanup
* fixed compile error
Vadim Pisarevsky [Tue, 26 Jun 2018 06:36:27 +0000 (06:36 +0000)]
Merge pull request #11826 from dkurt:dnn_tf_data_layouts
Vadim Pisarevsky [Tue, 26 Jun 2018 06:35:18 +0000 (09:35 +0300)]
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)
Alexander Alekhin [Mon, 25 Jun 2018 19:03:17 +0000 (22:03 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Dmitry Kurtaev [Mon, 25 Jun 2018 12:15:25 +0000 (15:15 +0300)]
Use layers consumers to predict data layout
Li, Peng [Mon, 25 Jun 2018 14:06:18 +0000 (22:06 +0800)]
update convolution opencl kernels in dnn module (#11762)
* optimize ocl kernel enqueue in fc layer
Signed-off-by: Li Peng <peng.li@intel.com>
* use CV_LOG_INFO in convolution auto tuning
Signed-off-by: Li Peng <peng.li@intel.com>
* update convolution IDLF kernel
extend parameter tuning range, also cleanup
ocl kernel implementation
Signed-off-by: Li Peng <peng.li@intel.com>
* update in-memory convolution cache config
fp16 and fp32 cache config are stored separately
Signed-off-by: Li Peng <peng.li@intel.com>