mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 23:30:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,702 Commits 6 Branches 126 Tags 3 GiB
b7b82c1cef
Commit Graph

17587 Commits

Author SHA1 Message Date
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
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
Dmitry Kurtaev
715f40a48d Use layers consumers to predict data layout 2018-06-25 18:25:40 +03:00
Li, Peng
ab8022f74e 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>
 2018-06-25 17:06:18 +03:00
Rostislav Vasilikhin
18bc2a1a93 Kinect2 support added to OpenNI2 backend (#11794) 
* Kinect2 support added to OpenNI2 backend

* more fixes for OpenNI2 backend

* whitespace fixed

* libfreenect2 support added

* const cast added

* mutable removed
 2018-06-25 13:19:20 +03:00
Dmitry Kurtaev
e8e9d1d021 Implement Interp layer using Resize layer 2018-06-22 19:26:47 +03:00
Alexander Alekhin
1894f1a37f Merge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag 2018-06-22 05:23:55 +00:00
Alexander Alekhin
50c607d206 dnn(ocl): fix external / predefined builtin configuration behavior 
OPENCV_OCL4DNN_FORCE_AUTO_TUNING should ignore existed configuration from:
- builtin predefined configurations (for Intel OpenCL iGPUs)
- external configuration (via OPENCV_OCL4DNN_CONFIG_PATH)

Prefer external configuration over builtin.
 2018-06-21 20:59:03 +03:00
Dmitry Kurtaev
4626246087 Add ShuffleChannel layer 2018-06-21 19:10:42 +03:00
Dmitry Kurtaev
40b85c1cd9 Remove undocumented feature to retreive layers outputs by indices 2018-06-20 14:44:21 +03:00
Alexander Alekhin
eed43a231b Merge pull request #11775 from alalek:issue_11771 2018-06-17 13:25:44 +00:00
Alexander Alekhin
8622b1254e Merge pull request #11774 from adamrankin:cap_dshow_autofocus 2018-06-16 14:11:44 +00:00
Alexander Alekhin
5e2c112697 photo: remove redundant broken check 
`dest(roi_d)` operation contains similar check inside.
 2018-06-16 11:36:51 +03:00
Adam Rankin
ecf4b639e1 Adding the ability to toggle autofocus on/off for DirectShow webcams 2018-06-15 12:32:12 -04:00
Alexander Alekhin
9629af1aa9 videoio: MSMF async reader for camera stream 
Synchronized reading from camera with heavy frame processing
provides bad effects (huge frame latency, processing frames from the past).
Generally, there is no way to process each frame and some frames will be dropped.
Allow preventive frame dropping to reduce lag of processed frames.

This mode is applied to cameras only (opened by 'index').
 2018-06-14 18:37:05 +03:00
Alexander Alekhin
30d4e0261a Merge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax 2018-06-14 13:18:30 +00:00
Alexander Alekhin
001f5faa0d Merge pull request #11763 from dkurt:dnn_keras_relu6_v2 2018-06-14 13:17:54 +00:00
Dmitry Kurtaev
bd87eb6e66 Import average pooling and softmax layers from Darknet 2018-06-14 15:22:08 +03:00
Alexander Alekhin
2bb5d1bca3 videoio(msmf): cleanup unused methods from ComPtr wrapper 
Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters
 2018-06-14 14:15:09 +03:00
Dmitry Kurtaev
693a7663e7 Import ClipByValue from Keras 2018-06-14 13:30:30 +03:00
Alexander Alekhin
8f24db048c Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition 2018-06-14 09:57:39 +00:00
Alexander Alekhin
5fd7cfbcad dnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT 
to control DNN_BACKEND_DEFAULT enumeration value behavior
 2018-06-13 19:00:04 +03:00
Alexander Alekhin
1c2ee8a5f1 Merge pull request #11737 from alalek:videoio_msmf_replace_debug_print 2018-06-13 13:31:31 +00:00
Alexander Alekhin
09c63e4f00 videoio(msmf): fix reopen condition in configureHW() 
`camid` value is always -1 after close().
 2018-06-13 16:29:45 +03:00
Alexander Alekhin
f040282bf8 Merge pull request #11739 from dkurt:more_ie_models 2018-06-13 13:26:50 +00:00
yuki takehara
4fe648b15c Merge pull request #11706 from take1014:setTo_Nan_10507 
* setTo_#10507

* setTo_Nan_10507

* setTo: update check / test for NaNs
 2018-06-12 18:05:44 +00:00
Alexander Alekhin
d69a327d6d OpenCV version++ 
OpenCV 3.4.2
 2018-06-10 10:20:38 +03:00
Alexander Alekhin
ab11b17d4b experimental version++ 2018-06-10 10:20:38 +03:00
Dmitry Kurtaev
7d727ac2fb Fuse top layers to batch normalization 2018-06-09 18:06:53 +03:00
Alexander Alekhin
0d249c7448 videoio(msmf): replace custom debug print function 2018-06-09 17:38:32 +03:00
Dmitry Kurtaev
2c291bc2fb Enable FastNeuralStyle and OpenFace networks with IE backend 2018-06-09 15:57:12 +03:00
Alexander Alekhin
34fc8e9260 Merge pull request #11714 from alalek:win32_waitKey_accuracy 2018-06-09 12:10:24 +00:00
Alexander Alekhin
929d39f69a Merge pull request #11728 from dkurt:dnn_update_tf_ssd 2018-06-08 19:04:28 +00:00
Alexander Alekhin
f72633b9f5 Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D 2018-06-08 19:01:40 +00:00
Alexander Alekhin
c05180ccce Merge pull request #11702 from terfendail:msmf_sizefix 2018-06-08 18:56:31 +00:00
Vitaly Tuzov
cb4b6bb2dc Fixed setting of frame size properties for MSMF-based VideoCapture 2018-06-08 18:55:06 +03:00
Alexander Alekhin
c64f6b3c22 videoio(MSMF): refactor grabFrame() / retrieveFrame() methods 
- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()
 2018-06-08 17:20:47 +03:00
Dmitry Kurtaev
40765c5f8d Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine 2018-06-08 16:55:21 +03:00
gnthibault
b46fef327e Fixed Assertin error due to Size.area() overflowing 2018-06-08 11:22:36 +02:00
Alexander Alekhin
8620bd5a84 highgui(win32): improve waitKey() timeout condition 
- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit
 2018-06-07 19:31:08 +03:00
rockzhan
1187a7fa34 Merge pull request #11649 from rockzhan:dnn_dw_prelu 
dnn: Fix output mismatch when forward dnn model contain [depthwise conv(group=1) + bn + prelu]  (#11649)

* this can make sure [depthwise conv(group=1) + bn + prelu] output not shift

* add TEST to show the output mismatch in [DWconv+Prelu]

* fix typo

* change loading image to init cvMat directly

* build runtime model, without loading external model

* remove whitespace

* change way to create a cvmat

* add bias_term, add target output

* fix [dwconv + prelu] value mismatch when no optimizations

* fix Test error when change output channels

* add parametric test

* change num_output to group value

* change conv code and change test back
 2018-06-07 13:45:54 +00:00
David
7175f257b5 Added ResizeBilinear op for tf (#11050) 
* Added ResizeBilinear op for tf

Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).

Minor changes to tf_importer and resize layer to save some code lines

Minor changes in init.cpp

Minor changes in tf_importer.cpp

* Replaced implementation of a custom ResizeBilinear layer to all layers

* Use Mat::ptr. Replace interpolation flags
 2018-06-07 16:29:04 +03:00
Maksim Shabunin
60fa6bea70 Merge pull request #11711 from alalek:python_standalone 2018-06-07 13:27:19 +00:00
Alexander Alekhin
dd7f88bd68 python: support standalone Python bindings build 
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
 2018-06-07 15:16:39 +03:00
Vadim Pisarevsky
5e5d997dff Merge pull request #11620 from terfendail:hmmorph_fix 2018-06-07 11:19:21 +00:00
Sayed Adel
e0d28aa893 core:ppc Fix java CoreTest/testMahalanobis (#11677) 
* core:ppc Fix java CoreTest/testMahalanobis

* core:ppc Fix warning unused variable on clang
 2018-06-07 14:16:48 +03:00
Vadim Pisarevsky
828f33311f Merge pull request #11700 from dkurt:dnn_ie_try_catch 2018-06-07 11:09:00 +00:00
Dmitry Kurtaev
f3a6ae5f00 Wrap Inference Engine init to try-catch 2018-06-07 12:55:52 +03:00
Vitaly Tuzov
2e22f8e790 Fix for morphologyEx MORPH_HITMISS mode 2018-06-06 21:04:17 +03:00
Vadim Pisarevsky
7c3090ddcf Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code 2018-06-06 12:21:00 +00:00
Vadim Pisarevsky
3cbd2e2764 Merge pull request #11650 from dkurt:dnn_default_backend 2018-06-06 09:30:39 +00:00
Alexander Alekhin
afaf5f940e Merge pull request #11695 from alalek:dnn_test_fix_sa_warnings 2018-06-05 20:07:39 +00:00
Alexander Alekhin
31a1df0fae Merge pull request #11692 from alalek:default_log_level_warnings 2018-06-05 20:07:15 +00:00
Alexander Alekhin
b0ae357cfb Merge pull request #11687 from alalek:gstreamer_write_pipeline 2018-06-05 20:06:55 +00:00
Alexander Alekhin
4091ced5ab core: set default logger level to 'warning' in Release builds 
should hide unnecessary 'info' messages
 2018-06-05 18:39:47 +03:00
Alexander Alekhin
6816495bee dnn(test): reuse test/test_common.hpp, eliminate dead code warning 2018-06-05 12:52:53 +03:00
Alexander Alekhin
277e9279cc videoio(gstreamer): support dumping of VideoWriter pipeline 2018-06-04 18:39:20 +00:00
Alexander Alekhin
d041b0a599 videoio: fix capture modes 2018-06-04 19:48:51 +03:00
Alexander Alekhin
b2cff44084 Merge pull request #11682 from alalek:fix_pylint 2018-06-04 16:16:08 +00:00
Alexander Alekhin
2628662586 videoio(ffmpeg): cleanup, remove dead code 2018-06-04 19:07:22 +03:00
Dmitry Kurtaev
b781ac7346 Make Intel's Inference Engine backend is default if no preferable backend is specified. 2018-06-04 18:31:46 +03:00
Alexander Alekhin
15130f4f43 Merge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace 2018-06-04 15:27:33 +00:00
Alexander Alekhin
dcb9bc2544 python: eliminate pylint warnings 
Tested with:
- pylint 1.9.1
 2018-06-04 17:58:06 +03:00
Alexander Alekhin
ec30b1294f Merge pull request #11636 from alalek:cmake_ffmpeg_find_package 2018-06-04 14:37:36 +00:00
Rostislav Vasilikhin
fc35c77f00 Merge pull request #11610 from savuor:fix/stereobm_simd_fixed_float 
* StereoBM: fixed SIMD processing for fixed-type output arrays

* changed norm type and threshold, added assertion

* fixed disp_shift
 2018-06-04 13:03:12 +00:00
Alexander Alekhin
04802e41e9 gtest: support parameters with types from anonymous namespace 2018-06-04 13:30:24 +03:00
Vadim Pisarevsky
ccbc0b91ea Merge pull request #11654 from alalek:issue_11648 2018-06-04 10:22:44 +00:00
Vadim Pisarevsky
3030594665 Merge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2 2018-06-04 10:19:44 +00:00
Vadim Pisarevsky
055f33ec46 Merge pull request #11657 from dkurt:dnn_ie_multiple_networks 2018-06-04 10:12:46 +00:00
Alexander Alekhin
c7183775db Merge pull request #11678 from csukuangfj:fix-doc 2018-06-03 11:00:38 +00:00
Kuang Fangjun
9ae28415ec fix doc. 2018-06-03 17:44:24 +08:00
Kuang Fangjun
ec42d87204 fix #11673. 2018-06-03 07:58:23 +08:00
Alexander Alekhin
40a61ec64e Merge pull request #11647 from sanchom:3.4 2018-06-02 20:52:17 +00:00
Alexander Alekhin
6912c20380 Merge pull request #11659 from take1014:snippet_11597 2018-06-01 16:48:10 +00:00
Alexander Alekhin
993981428f Merge pull request #11656 from pauljurczak:patch-1 2018-06-01 16:39:54 +00:00
Alexander Alekhin
b229107f8e Merge pull request #11641 from alalek:videoio_test_fixup 2018-06-01 16:39:11 +00:00
take1014
4ec9afac57 add imgproc snippets 2018-06-01 23:42:00 +09:00
Dmitry Kurtaev
ab389142af Fix multiple networks with Intel's Inference Engine backend 2018-06-01 14:10:32 +03:00
Paul Jurczak
bd7bad02a0 convertFp16 documentation edit (2) 
If this seems too wordy, take into account a new user who tries to find out extent of FP16 support in OpenCV.
 2018-06-01 04:15:21 -06:00
Alexander Alekhin
03edddba47 core: drop unnecessary duplicate check 2018-06-01 12:31:48 +03:00
Sancho McCann
dbab7ecac8 Refactored out a dead code path. 2018-05-31 21:09:26 +00:00
Alexander Alekhin
1822e85f4a Merge pull request #11642 from alalek:calib3d_chess_board_avoid_clone 2018-05-31 19:17:48 +00:00
Vadim Pisarevsky
d734e83af0
Hsv2rgb univ intrin (#11637) 
* add universal intrinsics for HSV2RGB_b

* rewritten HSV2RGB_b without using extra universal intrinsics

* removed unused variable

* undo changes in v_load_deinterleave
 2018-05-31 21:59:45 +03:00
Alexander Alekhin
0349e8c9af Merge pull request #11608 from take1014:hist_11544 2018-05-31 16:44:02 +00:00
Vadim Pisarevsky
7d19bd6c19 Merge pull request #11634 from vpisarev:empty_mat_with_types_2 
fixes handling of empty matrices in some functions (#11634)

* a part of PR #11416 by Yuki Takehara

* moved the empty mat check in Mat::copyTo()

* fixed some test failures
 2018-05-31 16:36:39 +00:00
Alexander Alekhin
da75e463a8
Merge pull request #11639 from alalek:fix_precomp_hpp 2018-05-31 16:35:21 +00:00
Alexander Alekhin
1bc96e3ed0 calib3d: cv::findContours() doesn't require to clone input 2018-05-31 19:34:23 +03:00
Alexander Alekhin
f185802489 documentation: avoid links to 'master' branch from 3.4 maintenance branch (2) 
Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master
 2018-05-31 19:30:56 +03:00
Alexander Alekhin
46c508b84f Merge pull request #11638 from alalek:docs_avoid_master_links_in_3.4 2018-05-31 16:22:03 +00:00
Alexander Alekhin
5d68c8dbe7 videoio(test): fixup information dump 2018-05-31 18:54:43 +03:00
Alexander Alekhin
b934702c7f cmake: support find_package(FFMPEG) 
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
 2018-05-31 18:27:01 +03:00
Alexander Alekhin
58d47ae9c8 Merge pull request #11633 from alalek:issue_10546 2018-05-31 15:08:45 +00:00
take1014
229e8b1b18 Correct handling when IPP is enabled 2018-05-31 22:54:32 +09:00
Alexander Alekhin
799b4f48e7 fix missing precomp.hpp 2018-05-31 16:53:44 +03:00
Alexander Alekhin
9ba9358ecb documentation: avoid links to 'master' branch from 3.4 maintenance branch 2018-05-31 16:45:18 +03:00
Dmitry Kurtaev
32bab45f81 Fix Inference Engine graphs with fused output layers 2018-05-31 16:21:08 +03:00
Alexander Alekhin
c94fe0c7e7 videoio(v4l): eliminate global variable 2018-05-31 15:11:20 +03:00
Alexander Alekhin
83d915eca1 videoio(v4l): don't pre-scan or cache list of available cameras 2018-05-31 15:11:20 +03:00
Alexander Alekhin
22f435ff4d videoio(v4l): fix code indentation, tabs 2018-05-31 15:11:20 +03:00
Alexander Alekhin
49321a233c Merge pull request #11632 from alalek:videoio_fixes 2018-05-31 12:09:14 +00:00
Alexander Alekhin
1b27351f45 Merge pull request #11627 from alalek:fix_python_cast_method_with_kw 2018-05-31 11:38:39 +00:00
Vadim Pisarevsky
c58cc4c2ff Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn 2018-05-31 11:07:39 +00:00
Alexander Alekhin
ddba772297 videoio: fix isOpened() method for legacy APIs, fix "index" API list 2018-05-31 14:07:22 +03:00
Dmitry Kurtaev
f96f934426 Update Intel's Inference Engine deep learning backend (#11587) 
* Update Intel's Inference Engine deep learning backend

* Remove cpu_extension dependency

* Update Darknet accuracy tests
 2018-05-31 14:05:21 +03:00
Alexander Alekhin
133e9f2012 Merge pull request #11618 from alalek:ffmpeg_debug_log 2018-05-30 15:36:42 +00:00
Alexander Alekhin
5c80763a71 Merge pull request #11601 from alalek:calib3d_replace_findContours 2018-05-30 15:35:49 +00:00
Alexander Alekhin
c2d40b465d python: fix arg types of cv2_UMatWrapperObject functions 2018-05-30 18:07:03 +03:00
Alexander Alekhin
1207300e01 python: avoid direct cast PyCFunctionWithKeywords->PyCFunction 2018-05-30 17:24:43 +03:00
Dmitry Kurtaev
bf87a43185 Faster-RCNN object detection models from TensorFlow 2018-05-30 17:12:36 +03:00
Alexander Alekhin
44572fac44 Merge pull request #11557 from tomoaki0705:relaxIntelOnlyOCL4DNN 2018-05-29 15:25:22 +00:00
Alexander Alekhin
c27b1d93e3 Merge pull request #11614 from dkurt:dnn_fix_keras_dilated_conv 2018-05-29 15:21:30 +00:00
Alexander Alekhin
8f28817373 Merge pull request #11617 from alalek:ffmpeg_fix_time_base 2018-05-29 15:19:13 +00:00
Alexander Alekhin
d70e01b635 calib3d: chess board - replace to cv::findContours() 2018-05-29 14:16:20 +00:00
Alexander Alekhin
83ec0f526c videoio(ffmpeg): add option to enable debug logs 2018-05-29 12:40:52 +00:00
Alexander Alekhin
cd9e43704e videoio: backends priority list 2018-05-29 12:06:45 +00:00
Alexander Alekhin
5128c1ff1f videoio(ffmpeg): specify stream->time_base 
Using codec->time_base is deprecated to specify muxer settings.
Resolves issue with FPS value for AVI files with FFmpeg 4.0.

Related FFmpeg commits:
- 194be1f43e
- 91736025b2
 2018-05-29 11:42:50 +00:00
Tomoaki Teshima
2e9e71ab9e make ocl4dnn available to run on other platform than Intel GPU 2018-05-29 19:18:10 +09:00
Dmitry Kurtaev
085be6a445 Fix dilated convolution from Keras 2018-05-29 12:15:47 +03:00
Alexander Alekhin
06c1890639 Merge pull request #11607 from dkurt:dnn_scale_shift_layer 2018-05-28 18:19:22 +00:00
Dmitry Kurtaev
2c3c59d018 Remove Shift deep learning layer 2018-05-28 18:18:56 +03:00
Alexander Alekhin
549b5df225 build: workaround issues with C compilation mode 
- cvdef.h + cvRound (double only)
- highgui_c.h
 2018-05-28 18:07:23 +03:00
Alexander Alekhin
58d28061a4 Merge pull request #11591 from alalek:calib3d_chessboard_fix3 2018-05-28 12:48:11 +00:00
Alexander Alekhin
faae5edf72 Merge pull request #11590 from alalek:calib3d_chessboard_fix2 2018-05-28 12:44:46 +00:00
Alexander Alekhin
29421d7def Merge pull request #11589 from alalek:calib3d_chessboard_fix 2018-05-28 10:13:43 +00:00
Alexander Alekhin
4384036108 Merge pull request #11576 from alalek:avoid_copyTo_with_getMat 2018-05-25 16:52:58 +00:00
Alexander Alekhin
f3cbb0f941 calib3d: chess board - perform full range (with 0) histogram smooth 2018-05-25 15:35:36 +03:00
Alexander Alekhin
ad57750d25 calib3d: chess board - properly detect/handle iCntMaxima=0 case 2018-05-25 15:32:07 +03:00
Alexander Alekhin
1dfc742f27 calib3d: chess board - avoid image modification via cvFindContours 2018-05-25 15:01:34 +03:00
Alexander Alekhin
0a6d190095 Merge pull request #11396 from terfendail:msmf_icapture 2018-05-24 18:30:09 +00:00
yuki takehara
ed207d79e7 Merge pull request #11108 from take1014:hough_4303 
* Added accumulator value to the output of HoughLines and HoughCircles

* imgproc: refactor Hough patch

- eliminate code duplication
- fix type handling, fix OpenCL code
- fix test data generation
- re-generated test data in debug mode via plain CPU code path
 2018-05-23 20:42:12 +00:00
yuki takehara
2d5d98ec0f Merge pull request #11551 from take1014:filter2d_10683 
* Add arguments to dftFilter2D

* test: add expected test values
 2018-05-23 20:25:11 +00:00
Alexander Alekhin
1923916929 Merge pull request #11581 from mdfirman:rectify3Collinear_bugfix 2018-05-23 20:19:12 +00:00
Alexander Alekhin
3654fb10d7 Merge pull request #11567 from alalek:code_quality 2018-05-23 15:47:11 +00:00
Michael Firman
e8cb67572a Bugfix to allow adjust3rdMatrix to be run 2018-05-23 16:03:21 +01:00
Alexander Alekhin
5a706eee8a Merge pull request #11578 from alalek:build_warnings 2018-05-23 15:02:32 +00:00
Alexander Alekhin
9b173d317f Merge pull request #11573 from mshabunin:fix-gst-leak 2018-05-23 15:00:37 +00:00
Vitaly Tuzov
9622ca0e37 MSMF-based VideoCapture and VideoWriter backend changed to C++ interface 2018-05-23 17:54:08 +03:00
Alexander Alekhin
39b60f9b17 fix build warnings 2018-05-23 16:04:41 +03:00
Alexander Alekhin
8307e06c1a Merge pull request #11575 from mshabunin:fix-ie-win 2018-05-23 13:00:23 +00:00
Alexander Alekhin
b3ff29fcf5 avoid copyTo(outputarray.getMat()) pattern 
- leads to errors due 'const' modifier of getMat() method
- may be non-optimal with non-CPU data storage
 2018-05-23 13:56:34 +03:00
Maksim Shabunin
895e10c317 dnn: fixed IE support on Windows 2018-05-23 12:46:14 +03:00
Maksim Shabunin
1a15136536 GStreamer backend: fixed memory leak and version check 2018-05-23 10:48:13 +03:00
Namgoo Lee
79af0bfccf NPP : NppStreamHandler fix 2018-05-23 15:54:39 +09:00
Alexander Alekhin
2f9b4439af Merge pull request #11565 from alalek:issue_11545 2018-05-22 16:00:37 +00:00
Alexander Alekhin
099eb40ba1 Merge pull request #11564 from alalek:ts_run_py_passthrough_test_args 2018-05-22 15:58:51 +00:00
Alexander Enaldiev
84584002f2 Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats 
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)

* imgcodecs: fixes

- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
 2018-05-22 15:10:15 +00:00
Alexander Alekhin
2fc713bb94 Merge pull request #11566 from mshabunin:allow-ie-force 2018-05-22 14:12:32 +00:00
Alexander Alekhin
471c17321f improve code quality 
- eliminate rand() calls
- non initialized members/ variables
- unused return values
- missing/useless NULL checks
 2018-05-22 17:08:31 +03:00
Maksim Shabunin
53a68783a5 dnn: support later IE versions 2018-05-22 15:18:18 +03:00
Maksim Shabunin
020ad1ac76 dnn: allow setting IE paths via command line 2018-05-22 14:40:03 +03:00
Alexander Alekhin
35a4551609 imgcodecs: fix imwrite handling of different OutputArray types 2018-05-22 13:57:51 +03:00
Alexander Alekhin
76ac7ab4ef imgcodecs: added test for imwrite parameter types 
issue 11545
 2018-05-22 13:55:14 +03:00
Alexander Alekhin
a00182db8e ts: run.py passthrough --test_* args "as is" 
to allow pass `--test_bigdata` via run.py
 2018-05-22 13:40:09 +03:00
Alexander Alekhin
58c8aefe03 dnn(text): update check threshols 
- make green Linux debug/Linux32/Win32 builders
 2018-05-22 13:29:31 +03:00
Alexander Alekhin
085b27fc3d Merge pull request #11390 from dkurt:east_text_detection 2018-05-21 13:02:29 +00:00
Alexander Alekhin
e21c01708a videoio: fix lifetime management of data of input frames 2018-05-21 12:29:24 +03:00
Alexander Alekhin
faafb3152a Merge pull request #11550 from tomoaki0705:fixCudaAsync 2018-05-20 20:59:34 +00:00
Tomoaki Teshima
e2c787884d fix the test failure of CUDA_Arithm/MeanStdDev 2018-05-20 19:38:02 +09:00
shengyu
72d3e14e8f fix wrong indentation on github page (tab to space) 2018-05-19 11:23:51 +08:00
Dmitry Kurtaev
07dc6d2b45 Return a convex hull from rotatedRectangleIntersection 2018-05-18 14:20:17 +03:00
Alexander Alekhin
ab2c21e7c1 Merge pull request #11531 from alalek:issue_11518 2018-05-18 10:59:27 +00:00
Alexander Alekhin
d6279bfff8 fix build warnings 2018-05-17 18:29:21 +03:00
Alexander Alekhin
1ba25c5569 Merge pull request #11520 from terfendail:ffmpeg_icapture 2018-05-17 15:28:58 +00:00
Alexander Alekhin
45b92aebe5 Merge pull request #11523 from alalek:bigdata_tests 2018-05-17 14:53:19 +00:00
Alexander Alekhin
491e3627b6 photo: initialize cos() table with double type 
This avoids MSVC 19.14.26428.1 to call vectorized __vdecl_cosf4() function with less precision.
 2018-05-17 15:30:11 +03:00
Alexander Alekhin
1983991d2f photo(test): update test checks 
- allow 5% of changed pixels with intensity difference <= 1
 2018-05-16 17:58:46 +03:00
Li Peng
1b517a45ae add fp16 accuracy and perf test 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-05-16 22:45:07 +08:00
Li Peng
ba5e8befa9 fp16 ocl support for more layers 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-05-16 22:45:04 +08:00
Li Peng
3dd916882a fp16 ocl support for googlenet 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-05-16 22:45:02 +08:00
Li Peng
329abb5b64 dnn fp16 support 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-05-16 22:44:39 +08:00
Vitaly Tuzov
aeed43ec90 FFMPEG-based VideoCapture and VideoWriter backend changed to C++ interface 2018-05-16 17:19:18 +03:00
Alexander Alekhin
bb8ff2c463 Merge pull request #11494 from tomoaki0705:fixOpenCLDnn 2018-05-16 14:11:36 +00:00
Alexander Alekhin
336841fa1b Merge pull request #11525 from alalek:issue_11511 2018-05-16 12:14:11 +00:00
Tomoaki Teshima
3f5347dd7a work around of the test failure of opencv_test_dnn 
* let OpenCL kernel run only on Intel GPU
  * brush up the workaround based on 9a2b028 from alalek
 2018-05-16 19:23:19 +09:00
Namgoo Lee
2c1ce8c0e9 cuda_meanStdDev : bug fix 2018-05-16 03:31:47 +09:00
Alexander Alekhin
f42fca9f49 cuda: avoid unnecessary cudaStreamSynchronize() call 
resolves #11511
 2018-05-15 18:38:22 +03:00
Alexander Alekhin
703f79b757 tests: add "bigdata" tests 2018-05-15 15:56:26 +03:00
Alexander Alekhin
6582afcdbb ts: add BigData tests category (skipped by default) 
Pass --test_bigdata to allow launching of "BigData" tests.
 2018-05-15 15:55:56 +03:00
Vadim Pisarevsky
e0dbe5cfcc
handle huge matrices correctly (#11505) 
* make sure that the matrix with more than INT_MAX elements is marked as non-continuous, and thus all the pixel-wise functions process it correctly (i.e. row-by-row, not as a single row, where integer overflow may occur when computing the total number of elements)
 2018-05-14 15:29:14 +03:00
Alexander Alekhin
c6a9de812b Merge pull request #11497 from alalek:libjpeg-turbo 2018-05-14 12:17:10 +00:00
Alexander Alekhin
f8252702a8 3rdparty: integrate libjpeg-turbo build scripts into OpenCV 2018-05-11 18:29:57 +03:00
Alexander Alekhin
78f205ffa5 python: better Python 3 support 2018-05-11 17:32:04 +03:00
Alexander Alekhin
df02fe0615 Merge pull request #11445 from cclauss:file-long-raw_input-xrange 2018-05-11 13:28:53 +00:00
Alexander Alekhin
24bb7b7679 Merge pull request #11444 from cclauss:patch-2 2018-05-11 13:28:27 +00:00
Alexander Alekhin
8356a6b6ab Merge pull request #11442 from cclauss:print-function 2018-05-11 13:26:04 +00:00
Dmitry Kurtaev
8488f2e265 EAST: An Efficient and Accurate Scene Text Detector (https://arxiv.org/abs/1704.03155v2) 2018-05-11 14:55:42 +03:00
Alexander Alekhin
d1d7408a20 Merge pull request #11502 from berak:fix_knearest 2018-05-11 11:47:13 +00:00
berak
9b0ef7bb17 ml: fix caching of internal state when changing the impl in KNearest 2018-05-11 12:20:17 +02:00
Alexander Alekhin
ed150bd97a Merge pull request #11461 from dkurt:dnn_reduce_mem_consumption 2018-05-11 09:47:03 +00:00
Dmitry Kurtaev
c99c3e761e Fuse multipliers but not convolution layers weights 2018-05-10 19:24:38 +03:00
Vadim Pisarevsky
9e3b6a228a Merge pull request #11418 from K-Shinotsuka:issue42 2018-05-10 15:15:04 +00:00
Vadim Pisarevsky
566cb5e3d8 Merge pull request #11430 from K-Shinotsuka:issue43 2018-05-10 15:14:39 +00:00
Alexander Alekhin
6f24b81079 Merge pull request #11490 from shengyu7697:tab_to_space 2018-05-10 14:41:07 +00:00
Alexander Alekhin
d2bc7b5a95 Merge pull request #11489 from alalek:fix_arm_build 2018-05-10 14:37:51 +00:00
Alexander Alekhin
9dc2005251 Merge pull request #11476 from tomoaki0705:fixCudaSampleBuildError 2018-05-09 20:48:33 +00:00
Namgoo Lee
ed86bd34b1 Merge pull request #11483 from nglee:dev_cudaCannyStreamIssue 
cuda_canny : multi stream safety (#11483)

* CUDA_ImgProc/Canny Asynchronous test

* cuda_canny : multi stream safety (1/3)

- Convert global variable canny::counter to class local variable

* cuda_canny : multi stream safety (2/3)

- Use texture objects rather than texture reference for cc >= 3.0,
  since texture reference must be declared as a static global variable
  which results in race condition when ran concurrently

* cuda_canny : multi stream safety (3/3)

- Refrain from using global variable in row_filter and column_filter
  (converts column_filter::c_kernel and row_filter::c_kernel to local
  variables)

* Fixes #11193
 2018-05-09 23:44:34 +03:00
Alexander Alekhin
352510cc19 core: fix ARM intrinsincs 
'0' is specific case (make no sence as a standalone operation),
but it can be useful in template-based programming.

reverts commit: a58c9d4d63
 2018-05-09 23:31:02 +03:00
shengyu
70455a959d tab to space 2018-05-09 21:15:51 +08:00
Tomoaki Teshima
f7ea6b12ea cuda: fix build error of sample 2018-05-09 00:23:49 +09:00
Damien Picard
ba000bf8ea Fixes 11480 : allow to force the video codec used to read videos 
with the ffmpeg backend
 2018-05-08 15:02:01 +02:00
Tomoaki Teshima
a58c9d4d63 arm: fix build error of v_rotate_left 
* remove meaningless tests
 2018-05-08 00:35:18 +09:00
Sayed Adel
115b10ed32 photo:ppc fix MergeRobertson test 2018-05-05 09:38:55 +00:00
Sayed Adel
ed19da21ab core:ppc Several improvements on VSX(2) 
* add v_float64x2 support to v_rotate_*
* treat float vector in v_check_any, vec_any_lt as int vector
* add test case for v_rotate_left
 2018-05-04 23:09:38 +00:00
cDc
f2fbfd7a10 fix bug in Matx::inv() 2018-05-05 10:30:58 +03:00
Dmitry Kurtaev
777d77848c Free Convolution and MatMul weights after TensorFlow layers import 2018-05-04 11:20:14 +03:00
Dmitry Kurtaev
9ffe4694db Reduce memory consumption at Caffe importer 2018-05-04 09:24:13 +03:00
k-shinotsuka
ecb4ea8f76 add universal intrinsics for RGB2HSV_f 2018-05-04 00:58:46 +09:00
k-shinotsuka
a5f68e98f4 add universal intrinsics for HLS2RGB_f 2018-05-03 23:50:38 +09:00
zuoshaobo
4ff6a1bc7b Merge pull request #11425 from zuoshaobo:relu_negative_slope 
* FIX INF_ENGINE RELU ERROR

* set slope to variable

* tab in indentwq
 2018-05-03 13:36:49 +03:00
cclauss
8a79b167b8 Define execfile, file, long, raw_input, xrange for Python 3 2018-05-03 09:19:05 +02:00
cclauss
de99f53e94 Don't forget self in table_formatter.py 
__ridx__ is an _undefined name_ in this context but __self.ridx__ is used three other times in this method and nine times in this class.  Undefined names may raise [NameError](https://docs.python.org/3/library/exceptions.html#NameError) at runtime.

flake8 testing of https://github.com/opencv/opencv

$ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__
```
./modules/ts/misc/table_formatter.py:50:23: F821 undefined name 'ridx'
            self.rows[ridx + 1].props = properties
                      ^
```
 2018-05-03 08:24:24 +02:00
cclauss
05c1a3d160 print() is a function in Python 3 2018-05-03 07:12:12 +02:00
Alexander Alekhin
083b08742d Merge pull request #11406 from alalek:core_matsize_dims 2018-04-28 14:38:42 +00:00
Alexander Alekhin
65b0b319eb eliminate MSVS2017 build warning 
modules\dnn\src\layers\prior_box_layer.cpp(208): warning C4834: discarding return value of function with 'nodiscard' attribute
 2018-04-28 15:14:41 +03:00
yuki takehara
4934f7c5a4 Merge pull request #11285 from take1014:core_6125 
* Resolves 6125

* Fix test code

* Delete unnecessary code
 2018-04-28 14:14:10 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera 2018-04-27 19:34:29 +03:00
Alexander Alekhin
7e43a0c2b7 Merge pull request #11394 from dkurt:dnn_custom_layers_py 2018-04-27 15:19:46 +00:00
Alexander Alekhin
8c349ff8ff core: added MatSize::dims() method 
to avoid accessing of 'p[-1]' (static code analysers dislike this)
 2018-04-27 16:57:29 +03:00
Alexander Alekhin
8d7ccd29fe Merge pull request #11401 from exoson:livestitch 2018-04-27 13:47:42 +00:00
Tomoaki Teshima
87a4f4ab3a Merge pull request #11409 from tomoaki0705/fixCLAHEfailure 
Arm: fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4 (#11409)

* fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4
  * avoid the race condition in the reduce

* imgproc(ocl): simplify CLAHE code

* remove unused class
 2018-04-27 16:41:56 +03:00
Alexander Alekhin
856a07711b core: disabled IPP AVX512 normL1(a, b, mask) 
for cv::Mat with type=16UC3 and width < 16
 2018-04-27 12:57:53 +03:00
exoson
058299cc66 Optimize MultiBandBlender to run faster 2018-04-27 10:48:13 +03:00
Alexander Alekhin
1031dfe4e8 Merge pull request #11402 from alalek:build_warnings 2018-04-26 19:04:37 +00:00
Alexander Alekhin
39e2d64b84 core: fix icc std::exception_ptr detection 
std::exception_ptr requires enabled C++11 mode
 2018-04-26 17:46:25 +03:00
Vitaly Tuzov
1dc73281f8 Added precise seek to MSMF-based VideoCapture::set(CAP_PROP_POS_FRAMES) 2018-04-26 16:15:23 +03:00
Alexander Alekhin
8e15c6fd78 videoio(openni2): fix CV_CAP_PROP_OPENNI2_SYNC property 2018-04-26 14:16:03 +03:00
Alexander Alekhin
f708a11f0f build: fix warnings 2018-04-26 14:13:01 +03:00
Alexander Alekhin
57dad685d1 core: disabled IPP AVX2 normL1(a, b, mask) 
for cv::Mat with width < 16
 2018-04-26 13:35:25 +03:00
Alexander Alekhin
dfa04a11bb core: norm with mask 16UC3 regression test 2018-04-26 13:35:25 +03:00
Dmitry Kurtaev
d5b9563263 Custom deep learning layers in Python 2018-04-26 09:25:18 +03:00
Alexander Alekhin
9166e6052b imgproc: fixed fixedpoint coding style 
- fixed wrong condition (always true)
- replaced unnecessary shift operation: '>> 63' to '< 0'
- used CV_BIG_INT()/CV_BIG_UINT() macros
 2018-04-25 17:33:57 +03:00
Alexander Alekhin
469dc6ac42 imgproc: fix fixed point build 
avoid using of templated 'operator T ()'
 2018-04-25 16:34:44 +03:00
Alexander Alekhin
ca1975cada
Merge pull request #11385 from shengyu7697:tab_to_space 2018-04-24 18:11:14 +03:00
shengyu
7773b2b4d6 tab to space 2018-04-24 17:45:16 +03:00
Alexander Alekhin
84db82a329 build: fix warnings 2018-04-24 16:15:22 +03:00
Alexander Alekhin
ef2548778c build: -Wimplicit-fallthrough warning for GCC 7+ only 2018-04-24 16:03:40 +03:00
Alexander Alekhin
6b581c4e51 build: unreachable code after CV_Error() (part 2) 2018-04-24 16:03:40 +03:00
Alexander Alekhin
576d2dbac0 refactor: don't use CV_ErrorNoReturn() internally 2018-04-24 15:38:42 +03:00
Dmitry Kurtaev
4ec456f0a0 Custom layers for deep learning networks (#11129) 
* Custom deep learning layers support

* Stack custom deep learning layers
 2018-04-24 14:59:59 +03:00
Alexander Alekhin
909a25571e Merge pull request #11332 from alalek:v_select_x86 2018-04-24 11:44:33 +00:00
Vadim Pisarevsky
5c57e6bdb0 Merge pull request #11380 from vpisarev:faster_interleave_deinterleave 2018-04-24 11:30:18 +00:00
Vitaly Tuzov
80600e5cdc Added DXVA hardware acceleration to MSMF-based VideoCapture 2018-04-24 13:42:49 +03:00
Vitaly Tuzov
916f094ce6 Integrated camera and file MSMF-based VideoCaptures and implemented configuration properties get/set 2018-04-24 12:13:20 +03:00
Vitaly Tuzov
b0b2d8de44 Remove unused code 2018-04-24 12:13:19 +03:00
Maksim Shabunin
5ae550c622 Merge pull request #11320 from mshabunin:gstreamer-cpp 2018-04-24 08:23:28 +00:00
Vadim Pisarevsky
4001e310f5 improved performance of v_load_deinterleave(8uC3) & v_store_interleave(8uC3) intrinsics when using SSSE3 instructions. 2018-04-23 18:06:06 +03:00
Alexander Alekhin
e82af627ed Merge pull request #11376 from alalek:cv_error_set_terminate 2018-04-23 14:51:55 +00:00
Vitaly Tuzov
44848d3241 MSMF-based CameraCapture reworked to use SourceReader 2018-04-23 17:04:54 +03:00
Vitaly Tuzov
65c46d0cc6 Removed WINRT related code 2018-04-23 17:04:53 +03:00
Alexander Alekhin
4cbec82ac1 build: unreachable code after CV_Error() 2018-04-23 15:45:57 +03:00
Alexander Alekhin
10c9227136 core: CV_Error with set_terminate() on Windows 
To dump contents of the last OpenCV error
 2018-04-23 15:09:41 +03:00
Maksim Shabunin
5309832308 VideoIO: prettier test console output, gstreamer capture backend changed to C++ interface 2018-04-23 13:21:37 +03:00
Alexander Alekhin
65726e4244 core(hal): improve v_select() SSE4.1+ 
v_select 'mask' is restricted to these values only: 0 or ~0 (0xff/0xffff/etc)
mask in accuracy test is updated.
 2018-04-23 13:17:53 +03:00
Vadim Pisarevsky
9615f8c994 Merge pull request #11358 from mshabunin:enable-xine 2018-04-23 10:09:29 +00:00
Vadim Pisarevsky
b8a6bfb54e Merge pull request #11350 from alalek:fix_11348 2018-04-23 10:08:10 +00:00
Vadim Pisarevsky
a312380367 Merge pull request #11357 from alalek:disable_errors_dump 2018-04-23 10:06:43 +00:00
Alexander Alekhin
29b4fd2774 Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests 2018-04-23 09:16:39 +00:00
Alexander Alekhin
f659f80c7f Merge pull request #11374 from lupustr3:pvlasov/morph_big_fix 2018-04-23 09:14:23 +00:00
Pavel Vlasov
a42789f330 IPP morphology with big images hotfix. 2018-04-23 10:50:20 +03:00
berak
d89fb163c6 core: add a check for empty input in inRange() 2018-04-21 12:54:52 +02:00
Alexander Alekhin
7b36e57551 Merge pull request #11362 from dkurt:dnn_keras_deconv 2018-04-20 16:53:38 +00:00
Ryan Wong
6f675ae75b Merge pull request #11304 from kinchungwong:issue_11242_intrin_cv34x_nocpp11 
* Issue 11242 intrinsics v_extract, v_rotate improvement, branch 3.4, without C++11 (remove type restrictions for SSE2, use PALIGNR on SSSE3, compile to no-op when imm is 0 or nlanes).

* fix whitespace

* Fix #11242 (NEON intrinsics v_rotate...) branch 3.4
Separate macro expansion OPENCV_HAL_IMPL_NEON_SHIFT_OP for bitwise shifts for integers, from macro expansion OPENCV_HAL_IMPL_NEON_ROTATE for lane rotations. Bitwise shifts do not apply to floats, but lane-rotations can apply to both.

* fix whitespace

* Fix #11242 compile error (VSX intrinsics v_rotate(a)) branch 3.4 no-c++11
 2018-04-20 18:43:47 +03:00
Alexander Alekhin
c8b515ea69 Merge pull request #11315 from tomoaki0705:featureComparePixelCount 2018-04-20 14:50:40 +00:00
Alexander Alekhin
52172e6f92 Merge pull request #11361 from alalek:ocl_use_host_mem_ptr_workaround 2018-04-20 14:49:37 +00:00
Dmitry Kurtaev
d959d7b9f0 Fuse deconvolution layer subgraphs from Keras 2018-04-20 16:51:38 +03:00
Simon Que
705464258e Merge pull request #11353 from eecsninja:3.4 
* Fix CV_Asserts with negation of strings

{!"string"} causes some compilers to throw a warning.

The value of the string is not that important -- it's only for printing
the assertion message.

Replace these calls with:

  CV_Error(Error::StsError, "string")

to suppress the warning.

* remove unnecessary 'break' after CV_Error()
 2018-04-20 15:31:47 +03:00
Maksim Shabunin
a9bdf75c5b videoio: refactored XINE backend 2018-04-20 15:20:46 +03:00
Alexander Alekhin
d76b41b50e ocl: CL_MEM_USE_HOST_PTR workaround test 2018-04-20 14:58:42 +03:00
Alexander Alekhin
2f9cbc2e57 core: disable errors dump 
Error messages are available via exceptions
 2018-04-20 12:33:20 +03:00
Dmitry Kurtaev
bd77d100e1 Enable some tests for clDNN plugin from Intel's Inference Engine 2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144 build: enable -Wimplicit-fallthrough warning for OpenCV modules 2018-04-19 19:54:03 +03:00
Alexander Alekhin
21026bf7cd python: fix support of UI callbacks 2018-04-19 18:42:01 +03:00
Alexander Alekhin
647eb243ae core: CV_Error is marked as 'noreturn' 2018-04-19 18:04:12 +03:00
Vadim Pisarevsky
7ea5029ae5
Grabcut with frozen models (#11339) 
* model is not learned when grabcut is called with GC_EVAL

* fixed test, was writing to wrong file.

* modified patch by Iwan Paolucci; added GC_EVAL_FREEZE_MODEL in addition to GC_EVAL (which semantics is retained)
 2018-04-19 15:23:50 +03:00
Vadim Pisarevsky
64a6b12114 Merge pull request #11340 from dkurt:dnn_inf_engine_switch_target 2018-04-19 12:23:15 +00:00
Vadim Pisarevsky
4e31015715 Merge pull request #11341 from alalek:v_min_max_sse41 2018-04-19 12:21:50 +00:00
Alexander Alekhin
ad2127765f Merge pull request #11309 from K-Shinotsuka:issue41 2018-04-19 10:58:00 +00:00
Tomoaki Teshima
98d9369a38 add new comparison to tolerate with rounding error 
* restore resize of carotene
  * clean up the source code
  * remove unused member function (Near)
  * add strict test on the border
 2018-04-19 17:31:42 +09:00
Dmitry Kurtaev
3b4a292ca9 Let switch CPU/OpenCL targets for models from Intel's Model Optimizer 2018-04-19 10:23:57 +03:00
Alexander Alekhin
fa3cb03f62 core(hal): v_min()/v_max() use SSE4.1 intrinsics 2018-04-18 19:43:20 +03:00
Alexander Alekhin
0477284b0a Merge pull request #11338 from alalek:fix_fp16_with_disabled_optimizations 2018-04-18 13:34:34 +00:00
Vadim Pisarevsky
b290bdafb9 Merge pull request #11322 from dkurt:dnn_yolov3 2018-04-18 12:11:13 +00:00
Alexander Alekhin
97882d03cc core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option 
Reproducer:
    cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
 2018-04-18 14:13:03 +03:00
Alexander Alekhin
28d4157ea7 Merge pull request #11331 from dkurt:fix_11318 2018-04-17 16:41:29 +00:00
Dmitry Kurtaev
66ce8cd7ea Fix bugs found by valgrind 2018-04-17 17:53:51 +03:00
Vadim Pisarevsky
b8b7ca7302
Rewite polar transforms (#11323) 
* Rewrite polar transformations

- A new wrapPolar function encapsulate both linear and semi-log remap
- Destination size is a parameter or calculated automatically to keep objects size between remapping
- linearPolar and logPolar has been deprecated

* Fix build warning and error in accuracy test

* Fix function name to warpPolar

* Explicitly specify the mapping mode, so we retain all the parameters as non-optional.

Introduces WarpPolarMode enum to specify the mapping mode in flags

* resolves performance warning on windows build

* removed duplicated logPolar and linearPolar implementations
 2018-04-17 15:50:52 +03:00
k-shinotsuka
b3755ae670 add universal intrinsics for RGB2HLS_f 2018-04-17 19:37:36 +09:00
Dmitry Kurtaev
97fec07d96 Support YOLOv3 model from Darknet 2018-04-16 18:44:12 +03:00
Alexander Alekhin
e0fef2bca1 Merge pull request #11319 from alalek:issue_11293 2018-04-16 15:39:22 +00:00
Alexander Alekhin
ee90a6cbde dnn(test): update error tolerance for RCNN/RFCN tests 2018-04-16 14:24:41 +03:00
Alexander Alekhin
59b413c8a1 imgproc(ipp): disable parallel GaussianBlur 2018-04-16 13:31:52 +03:00
Alexander Alekhin
225c75e4a1 Merge pull request #11306 from alalek:opencl_trace_messages 2018-04-14 11:36:19 +00:00
Alexander Alekhin
cfaca4327b Merge pull request #11169 from tomoaki0705:universalRemap 2018-04-13 13:24:06 +00:00
Alexander Alekhin
a2d6ee2d31 Merge pull request #11305 from tomoaki0705:typoNVIDIA 2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a82e70cd40 remove raw SSE2/NEON implementation from imgwarp.cpp 
* use universal intrinsic instead of raw intrinsic
  * add 2 channels de-interleave on x86 platform
  * add v_int32x4 version of v_muladd
  * add accumulate version of v_dotprod based on the commit from seiko2plus on bf1852d
  * remove some verify check in performance test
  * avoid the out of boundary access and keep the performance
 2018-04-13 21:19:16 +09:00
Alexander Alekhin
670ef403b0 ocl: improve trace messages of OpenCL calls 2018-04-13 14:54:27 +03:00
Alexander Alekhin
46d85fb558 Merge pull request #11302 from dkurt:dnn_inf_engine_extra_layers 2018-04-13 11:49:38 +00:00
Tomoaki Teshima
a40354d16f use correct name for NVIDIA 
* remove NVidia and Nvidia
  * replace Cuda with CUDA
  * keep the letters for API
 2018-04-13 20:33:19 +09:00
Dmitry Kurtaev
b92c3182ab Blank and L2-normalization layers from Intel's Inference Engine 2018-04-12 15:21:08 +03:00
Alexander Alekhin
2129db6e91 Merge pull request #11297 from seiko2plus:VSXImprovements_1 2018-04-12 10:57:39 +00:00
Sayed Adel
56ec10bfa2 core:ppc Several improvements on VSX(1) 
* remove unnecessary defines from vsx_utils
 * fix v_load_expand, load lower 64bit
 * use vec_ld, vec_st with alignment load/store on all types except 64bit
 * map v_extract to v_rotate_right
 * update license header
 * enable VSX by default on clang since #11167
 2018-04-11 19:21:22 +00:00
Vadim Pisarevsky
0b9d075958 Merge pull request #11295 from dkurt:dnn_repeated_conv_params 2018-04-11 15:25:24 +00:00
Vadim Pisarevsky
59221296c0 Merge pull request #10978 from alalek:cv_check_macros 2018-04-11 15:17:27 +00:00
Vadim Pisarevsky
533bb89800 Merge pull request #11236 from dkurt:dnn_fuse_l2_norm 2018-04-11 15:09:55 +00:00
Vitaly Tuzov
c80a168d9d Updated warpAffine test to ensure bit-exactness for CV_8U (#10921) 
* Updated warpAffine test to ensure bit-exactness for CV_8U

* Updated invertAffineTransform to bit-exact evaluation
 2018-04-11 18:08:29 +03:00
Vitaly Tuzov
62cf71002e Bit-exact GaussianBlur performance update (#10898) 
* Added custom implementation for NxN bit-exact GaussianBlur

* Reworked fixedpoint interface a bit

* Reworked horizontal line estimation for bit-exact GaussianBlur

* Reworked vertical line estimation for bit-exact GaussianBlur

* Updated range estimation for vectorized part of bit-exact GaussianBlur evaluation
 2018-04-11 18:07:48 +03:00
Vadim Pisarevsky
30175594e9 Merge pull request #11062 from dkurt:dnn_inf_engine_cldnn 2018-04-11 15:06:18 +00:00
Dmitry Kurtaev
512632e574 Parse repeated values of ConvolutionParameter 2018-04-11 14:38:05 +03:00
Dmitry Kurtaev
4ef6c91583 Fix multiple inputs for models from Intel's Model Optimizer 2018-04-11 13:28:07 +03:00
Alexander Alekhin
070ec313f2 Merge pull request #11282 from alalek:fix_msvs_build_issues 2018-04-10 14:36:51 +00:00
Alexander Alekhin
d2d9fd6945 build: fix MSVS build problems 
with 'CL=/permissive-'
 2018-04-10 14:50:56 +03:00
Alexander Alekhin
fa4b9e80e2 Merge pull request #11275 from alalek:issue_11274 2018-04-10 11:28:21 +00:00
Dmitry Kurtaev
1ba72ca0d3 Fuse tf.nn.l2_normalize layer 2018-04-10 10:12:44 +03:00
shimat
68db42e9be fix LSD test (wrong detector kind) 2018-04-10 11:38:35 +09:00
Alexander Alekhin
567ae61e78 core: add "check" macros 2018-04-09 21:24:02 +03:00
Alexander Alekhin
86488ac1bc Merge pull request #11130 from allnes:gst_test_pipeline 2018-04-09 18:21:11 +00:00
Alexander Nesterov
c0d6f3d23e Added tests for gstreamer pipeline 2018-04-10 02:33:26 +03:00
Alexander Alekhin
b76ce0e0a4 Merge pull request #11253 from mshabunin:decrease-tbb-dependency 2018-04-09 16:03:34 +00:00
Alexander Alekhin
b82bec88d9 Merge pull request #11271 from alalek:tbb_build_warning 2018-04-09 15:53:26 +00:00
Alexander Alekhin
7dc162cb42 core: fix mm_pause() for non-SSE i386 builds 
replaced to safe binary compatible 'rep; nop' asm instruction
 2018-04-09 18:37:35 +03:00
Vadim Pisarevsky
474a23bda5 Merge pull request #11170 from alalek:test_fixed_type 2018-04-09 14:53:43 +00:00
tlanclos
a2c7afad77 V4L Buffer: Support CV_CAP_PROP_BUFFERSIZE in cap_v4l (#11047) 2018-04-09 17:34:00 +03:00
shimat
e172935658 LSD: support vector<Vec4i> lines (#11042) 
* add LSD supportsVec4iResult

* LineSegmentDetector.drawSegments: support vector<Vec4i>

* test_lsd.cpp: replace detect()

* test_lsd.cpp: add compareSegments tests

* lsd.cpp: LSD.compareSegments support Vec4i

* test_lsd.cpp: fix trailing whitespace
 2018-04-09 17:31:56 +03:00
Dmitry Kurtaev
709cf5d038 OpenCL GPU target for Inference Engine deep learning backend 
Enable FP16 GPU target for DL Inference Engine backend.
 2018-04-09 17:21:35 +03:00
Vadim Pisarevsky
72cb06abf0 Merge pull request #11231 from saskatchewancatch:tiff-dpi-feature 2018-04-09 13:28:08 +00:00
Vadim Pisarevsky
fa5a6bfa02 Merge pull request #11251 from mshabunin:add-runtime-version 2018-04-09 13:24:29 +00:00
Vladislav Sovrasov
0d9c63744e Add CPU default extensions loading in IE dnn backend (#11252) 
* Add CPU default extensions loading in IE dnn backend

* Load cpu_extensions for the future Intel's Inference Engine
 2018-04-09 16:22:19 +03:00
Vadim Pisarevsky
20334e3f09 Merge pull request #11264 from K-Shinotsuka:issue39 2018-04-09 13:20:48 +00:00
Vadim Pisarevsky
19de675a4e Merge pull request #11270 from alalek:parallel_for_exception_fix_android 2018-04-09 13:18:39 +00:00
Alexander Alekhin
a22ee76b45 imgcodecs: exclude rle8.bmp from GDAL tests 
GDAL message:
- ERROR 1: The BMP file is probably corrupted or too large. Image width = 480
 2018-04-09 13:18:33 +03:00
Alexander Alekhin
854ab48de0 tbb: fix build warnings -Wshadow 2018-04-09 12:58:09 +03:00
Alexander Alekhin
8dacbe7584 android: std::exception_ptr is not available on some platforms (even with enabled C++11) 2018-04-09 12:54:57 +03:00
Vadim Pisarevsky
6a15910f0f Merge pull request #11208 from terfendail:seamless_1 2018-04-09 09:52:28 +00:00
Vadim Pisarevsky
4617758053 Merge pull request #11247 from lopespt:fix_issue_10506 2018-04-09 09:39:17 +00:00
Vadim Pisarevsky
f0d22dabea Merge pull request #11254 from terfendail:msmf_sourcereader 2018-04-09 09:34:15 +00:00
Vadim Pisarevsky
26a8ab5719 Merge pull request #11262 from alalek:fix_houghCircles_sync 2018-04-09 09:32:37 +00:00
Maksim Shabunin
d2cff38db6 Added interface to check library version during runtime 2018-04-09 12:30:39 +03:00
Alexander Alekhin
3c936ddcf9 Merge pull request #11259 from dkurt:fix_10965 2018-04-09 08:39:41 +00:00
Alexander Alekhin
47e476c9cd Merge pull request #11217 from dan-masek:fix_issue_11206 2018-04-08 15:12:12 +00:00
Alexander Alekhin
814b78dad8 Merge pull request #11230 from tkonolige:master 2018-04-08 15:11:17 +00:00
k-shinotsuka
fbdcc0e8e4 add universal intrinsics for HSV2RGB_f 2018-04-08 01:47:22 +09:00
Alexander Alekhin
15837b43ca imgproc: don't call .unlock() on non-holded mutex in houghCircles() 2018-04-07 13:00:17 +00:00
Dmitry Kurtaev
73ca194313 Fix convertFp16 in JavaScript build 2018-04-07 09:44:43 +03:00
Alexander Alekhin
23d866ad40 Merge pull request #11237 from alalek:cuda_refactor_memorypool 2018-04-06 15:37:37 +00:00
Vitaly Tuzov
24bd44f088 MSMF-based VideoCapture reworked to use SourceReader 2018-04-06 17:39:56 +03:00
Maksim Shabunin
b88609a921 Reduced direct TBB dependencies 2018-04-06 14:21:15 +03:00
lopespt
c17ce1a0af Solves issue #10506 2018-04-05 20:25:32 -03:00
Alexander Alekhin
875b4e212a Merge pull request #11200 from alalek:android_refactor_sdk_detection 2018-04-05 20:44:59 +00:00
Alexander Alekhin
a87a5dfdb3 Merge pull request #11192 from terfendail:setto_fix 2018-04-05 20:25:34 +00:00
Alexander Alekhin
e20fb7f429 Merge pull request #11197 from alalek:parallel_propagate_exception 2018-04-05 20:24:22 +00:00
Alexander Alekhin
e27ae6483a Merge pull request #11221 from dkurt:dnn_fix_proposal_layer 2018-04-05 20:23:49 +00:00
Alexander Alekhin
6abfc6761e android: refactor Android SDK detection 
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
 2018-04-05 19:19:31 +00:00
Alexander Alekhin
7818071ba2 cuda: eliminate part of build warnings 2018-04-05 17:53:22 +03:00
Alexander Alekhin
82ba3ac894 cuda: refactor MemoryPool 
- make non-copyable (aligns inner mutex semantic to std::mutex)
- getMemoryPool() returns reference instead of pointer (NULL is not expected here)
 2018-04-05 16:04:37 +03:00
Alexander Alekhin
f93c1b942a Merge pull request #11222 from lopespt:add_binary_search_knearest 2018-04-05 11:00:00 +00:00
Vitaly Tuzov
628f04ae96 Merge pull request #11092 from terfendail:msmf_videocapture 
Update for MSMF-based VideoCapture and VideoWriter (#11092)

* MSMF based VideoCapture updated to handle video stream formats different from RGB24

* MSMF based VideoWriter updated to handle video frame top-bottom line ordering regardless of output format

* Fixed race condition in MSMF based VideoCapture

* Refactored MSMF based VideoCapture and VideoWriter

* Disabled frame rate estimation for MP43

* Removed test for unsupported avi container from MSMF VideoWriter tests

* Enabled MSMF-based VideoIO by default
 2018-04-05 13:55:42 +03:00
Alexander Alekhin
c2fb4debc5 Merge pull request #11224 from alalek:fix_core_min_avx2 2018-04-05 10:37:31 +00:00
Alexander Alekhin
8f7e7cd343 Merge pull request #11071 from alalek:issue_11061_fix_error_message 2018-04-05 10:15:04 +00:00