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
46c508b84f
Merge pull request #11638 from alalek:docs_avoid_master_links_in_3.4
2018-05-31 16:22:03 +00:00
Alexander Alekhin
58d47ae9c8
Merge pull request #11633 from alalek:issue_10546
2018-05-31 15:08:45 +00:00
Vadim Pisarevsky
9d91c63502
Merge pull request #11635 from dkurt:dnn_fix_ie_fused_layer_output
2018-05-31 14:52:57 +00: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
Spark Echo
80770aacd7
Merge pull request #11631 from sparkecho:3.4
...
Typo fixes (#11631 )
2018-05-31 07:23:19 +00: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
d738f56d83
Merge pull request #11598 from catree:add_tutorial_features2d_java_python
2018-05-29 15:18:44 +00:00
Alexander Alekhin
c90e65ce4b
Merge pull request #11596 from alalek:videoio_priority_list
2018-05-29 15:17:02 +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
catree
ade21f142e
Add Java and Python code for the following features2d tutorials: Harris corner detector, Shi-Tomasi corner detector, Creating your own corner detector, Detecting corners location in subpixels, Feature Detection, Feature Description, Feature Matching with FLANN, Features2D + Homography to find a known object. Use Lowe's ratio test to filter the matches.
2018-05-29 10:35:57 +02:00
Alexander Alekhin
06c1890639
Merge pull request #11607 from dkurt:dnn_scale_shift_layer
2018-05-28 18:19:22 +00:00
Alexander Alekhin
89230fa45b
Merge pull request #11605 from alalek:fix_build_10963
2018-05-28 18:18:40 +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
3c24e76018
Merge pull request #11592 from catree:remove_java_toBufferedImage
2018-05-26 17:29:48 +00:00
Alexander Alekhin
4384036108
Merge pull request #11576 from alalek:avoid_copyTo_with_getMat
2018-05-25 16:52:58 +00:00
catree
adef31097d
Use directly HighGui.toBufferedImage().
2018-05-25 16:23:42 +02: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
Alexander Alekhin
8a17ae29b9
Merge pull request #11580 from dkurt:dnn_fix_tf_ssd
2018-05-24 18:28:41 +00:00
Alexander Alekhin
6e4f82d9da
Merge pull request #11583 from catree:add_tutorial_imgproc_java_python2
2018-05-24 18:28:14 +00:00