summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-07-04OpenCV 3.4.2upstream/3.4.2Alexander Alekhin107-2466/+7379
2018-07-04Merge pull request #11875 from dkurt:dnn_fix_reshapeVadim Pisarevsky5-17/+44
2018-07-03Merge pull request #11882 from alalek:videoio_vfw_lower_priorityAlexander Alekhin1-3/+3
2018-07-03Merge pull request #11881 from alalek:sample_use_camera_0Alexander Alekhin1-1/+1
2018-07-03Merge pull request #11879 from alalek:fix_msmf_32bitAlexander Alekhin1-1/+1
2018-07-03videoio(VFW): lower priority (after DSHOW)Alexander Alekhin1-3/+3
2018-07-03samples: videocapture_camera use VideoCapture with 0 indexAlexander Alekhin1-1/+1
Not all backends support -1 index.
2018-07-03videoio(MSMF): fix 32-bit build crashAlexander Alekhin1-1/+1
2018-07-03Merge pull request #11876 from ilovezfs:patch-1Alexander Alekhin1-1/+1
2018-07-03Python 3.7 compatabilityilovezfs1-1/+1
The result of PyUnicode_AsUTF8() is now of type const char * rather of char *.
2018-07-03Add Reshape layer testsDmitry Kurtaev5-17/+44
2018-07-02Merge pull request #11873 from catree:add_tutorial_features2d_java_python2Alexander Alekhin13-114/+418
2018-07-02Add Java and Python code for AKAZE local features matching tutorial. Fix ↵catree13-114/+418
incorrect uses of Mat.mul() in Java code. Uniform Lowe's ratio test in the code.
2018-07-02Merge pull request #11869 from alalek:fix_11827Alexander Alekhin1-5/+5
2018-07-02Merge pull request #11865 from csukuangfj:patch_1Alexander Alekhin1-1/+1
2018-07-02imgcodecs(sunras): avoid buffer overrunAlexander Alekhin1-5/+5
`src_pitch` may be large than data `step`
2018-07-02remove a redundant option.Kuang Fangjun1-1/+1
2018-06-30Merge pull request #11856 from alalek:videoio_msmf_fix_checkAlexander Alekhin1-8/+5
2018-06-30Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_codeAlexander Alekhin1-16/+21
2018-06-30Merge pull request #11859 from alalek:fix_videoio_msmf_win7Alexander Alekhin1-1/+20
2018-06-29videoio(msmf): avoid using of C++11 codeAlexander Alekhin1-16/+21
build fails with MSVS 2012 without additional flags
2018-06-29videoio(MSMF): avoid OpenCV load failure on Win7 machinesAlexander Alekhin1-1/+20
OpenCV binaries are compiled on Win10 environment
2018-06-29Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2Alexander Alekhin1-4/+5
2018-06-29Merge pull request #11851 from pengli:3.4Alexander Alekhin5-61/+68
2018-06-29videoio(MSMF): remove "always true" checkAlexander Alekhin1-8/+5
2018-06-29pooling ocl kernel optimizationLi Peng5-61/+68
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-29Add a planar data layout tracking for TensorFlow importerDmitry Kurtaev1-4/+5
2018-06-28Merge pull request #11852 from dkurt:dnn_dldt_ir_outsVadim Pisarevsky4-49/+81
2018-06-28Set output layers names and types for models in DLDT's intermediate ↵Dmitry Kurtaev4-49/+81
representation
2018-06-27Merge pull request #11849 from catree:add_tutorial_imgproc_java_python4Vadim Pisarevsky7-89/+555
2018-06-27Merge pull request #11768 from alalek:videoio_msmf_async_live_captureVadim Pisarevsky1-1/+190
2018-06-27Add Java and Python code for Image Segmentation with Distance Transform and ↵catree7-89/+555
Watershed Algorithm tutorial. Use more Pythonic code.
2018-06-27Merge pull request #11804 from mshabunin:gst-sampleVadim Pisarevsky1-372/+301
2018-06-27Filter homography decomp: updated PR #7153 (#11846)Vadim Pisarevsky3-46/+710
* 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-27Init qrcode algo (#11829)Nesterov Alexander3-0/+857
2018-06-27Merge pull request #11839 from dkurt:dnn_ie_r2Vadim Pisarevsky4-6/+6
2018-06-26Merge pull request #11840 from dkurt:dnn_tf_nchwVadim Pisarevsky2-21/+42
2018-06-26Pass RANSAC parameters as function input (#10569)branka-plateiq2-20/+31
* 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-26Parse strides and convolution kernel shapes considering data layoutDmitry Kurtaev2-21/+42
2018-06-26Update Inference Engine testsDmitry Kurtaev4-6/+6
2018-06-26Merge pull request #11836 from terfendail:msmf_camfallbackVadim Pisarevsky1-2/+2
2018-06-26Merge pull request #11835 from dkurt:dnn_tf_two_inputsVadim Pisarevsky2-8/+36
2018-06-26Disable MSMF VideoCapture fallback to existing camera in case provided index ↵Vitaly Tuzov1-2/+2
is out of range.
2018-06-26Multiple inputs for TensorFlow modelsDmitry Kurtaev2-8/+36
2018-06-26Merge pull request #11826 from dkurt:dnn_tf_data_layoutsVadim Pisarevsky2-15/+87
2018-06-26temporarily disabled OpenCL use in DNN module on Mac (#11828)Vadim Pisarevsky1-1/+2
* 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-25Use layers consumers to predict data layoutDmitry Kurtaev2-15/+87
2018-06-25update convolution opencl kernels in dnn module (#11762)Li, Peng4-586/+985
* 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>
2018-06-25cmake: function for application creation (#11736)Maksim Shabunin7-235/+52
* apps: add Win32 friendly opencv_version app Improve experience of launching app from explorer: - application just flash (open/close) the console window Suggested Win32 application flavor additionally shows MessageBox and waits for User interaction. * cmake: added unified application creation function
2018-06-25Merge pull request #11743 from alalek:samples_avoid_double_VideoCapture_openVadim Pisarevsky1-1/+1