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
486f31fae9
Merge pull request #11715 from catree:add_tutorial_objDetect_HDR_java_python
2018-06-08 18:59:29 +00:00
Alexander Alekhin
c05180ccce
Merge pull request #11702 from terfendail:msmf_sizefix
2018-06-08 18:56:31 +00:00
catree
afa5b0cc93
Add Java and Python code for cascade classifier and HDR tutorials.
2018-06-08 19:30:30 +02:00
Vitaly Tuzov
cb4b6bb2dc
Fixed setting of frame size properties for MSMF-based VideoCapture
2018-06-08 18:55:06 +03:00
Alexander Alekhin
d3696f3ad2
ffmpeg: update OpenCV FFmpeg wrapper (3.4)
2018-06-08 18:47:00 +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
catree
9a7f426b7b
Add LD_PRELOAD instruction to be able to run Java code that calls OpenCV functions that use the Intel MKL library.
2018-06-08 15:47:06 +02:00
Alexander Alekhin
f5ddbbf659
Merge pull request #11722 from gnthibault:3.4
2018-06-08 12:59:19 +00:00
Alexander Alekhin
a7047dd4b6
samples: add videocapture_camera sample
...
- show capturing information: width / height / fps
- show average FPS for cap.read()+imshow() via cv::getTickCount()
- optional frame processing code path
2018-06-08 15:51:46 +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
Alexander Alekhin
8542887257
Merge pull request #11705 from alalek:fix_samples_callback
2018-06-07 11:14:53 +00:00
Alexander Alekhin
749530978c
Merge pull request #11704 from alalek:apps_avoid_catch_by_value
2018-06-07 11:13:30 +00: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
Kyle D. Patterson
f581992a62
Update py_calibration.markdown
...
Improved readability by correcting grammar and idioms.
Further improved language and readability.
Attempted to fix list bullets.
Again, attempted to fix list bullets.
Removed trailing whitespace on line 8.
2018-06-06 16:26:11 -04:00
Vitaly Tuzov
2e22f8e790
Fix for morphologyEx MORPH_HITMISS mode
2018-06-06 21:04:17 +03:00
Alexander Alekhin
9b0bafb82c
samples: fix callback function type
2018-06-06 18:29:05 +03:00
Alexander Alekhin
caa6915b83
apps: catch() with "const reference"
2018-06-06 18:23:29 +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
95f948a9e4
Merge pull request #11685 from alalek:videoio_fix_backend_modes
2018-06-05 20:06:27 +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
03d3966d15
Merge pull request #11690 from peters:master
2018-06-05 14:59:16 +00:00
Peter Rekdal Sunde
9492f46d77
3rdparty: update libwebp 0.6.1 => 1.0.0
...
Commit: 698b8844e3
Tag: https://github.com/webmproject/libwebp/releases/tag/v1.0.0
2018-06-05 13:17:20 +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
9c2b924dfc
Merge pull request #11681 from alalek:fix_docs_bs4_spaces
2018-06-04 16:15:45 +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
Alexander Alekhin
0560747d3d
docs: preserve space symbols during bs4 processing
2018-06-04 17:27:18 +03: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