Alexander Alekhin
54e8487f56
Merge pull request #11707 from kdpatters:patch-1
2018-06-13 15:51:10 +00: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
aef16d51ec
samples: don't call twice of VideoCapture::open()
2018-06-11 23:17:49 +00:00
Alexander Alekhin
ff3d4d8b7f
Merge pull request #11740 from catree:add_tutorial_imgproc_java_python3
2018-06-11 16:32:05 +00:00
catree
a11ef2650e
Add Java and Python code for the following imgproc tutorials: Finding contours in your image, Convex Hull, Creating Bounding boxes and circles for contours, Creating Bounding rotated boxes and ellipses for contours, Image Moments, Point Polygon Test.
2018-06-10 23:57:11 +02:00
Alexander Alekhin
8c4e0dfd13
Merge pull request #11738 from dkurt:dnn_batch_norm_fusion_base
2018-06-10 17:12:04 +00:00
Alexander Alekhin
49886ebae3
OpenCV version '-openvino'
2018-06-10 10:20:38 +03: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
Alexander Alekhin
93f2fd396b
Merge pull request #11723 from alalek:sample_videocapture_camera
2018-06-09 13:49:21 +00:00
Alexander Alekhin
d068ec3a3d
Merge pull request #11734 from alalek:opencv_version_win32
2018-06-09 13:48:06 +00:00
Dmitry Kurtaev
2c291bc2fb
Enable FastNeuralStyle and OpenFace networks with IE backend
2018-06-09 15:57:12 +03:00
Alexander Alekhin
95360a5539
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.
2018-06-09 15:55:35 +03:00
Alexander Alekhin
8221f57c26
Merge pull request #11729 from alalek:ffmpeg_update_3.4
2018-06-09 12:25:23 +00:00
Alexander Alekhin
c198a35368
Merge pull request #11733 from alalek:opencv_ffmpeg_download_ps1
2018-06-09 12:11:39 +00:00
Alexander Alekhin
c0feea50a9
Merge pull request #11732 from alalek:cmake_build_apps_list
2018-06-09 12:10:49 +00:00
Alexander Alekhin
34fc8e9260
Merge pull request #11714 from alalek:win32_waitKey_accuracy
2018-06-09 12:10:24 +00:00
Alexander Alekhin
390f0a5dcd
cmake: generate and install ffmpeg-download.ps1
...
64-bit only
2018-06-09 13:19:48 +03:00
Alexander Alekhin
e8a520ed96
cmake: add BUILD_APPS_LIST
...
- build "opencv_version" only: `cmake -DBUILD_APPS_LIST=version ...`
- option 'BUILD_opencv_apps' should be 'ON'
2018-06-09 12:52:27 +03:00
Alexander Alekhin
0614ee3f95
Merge pull request #11726 from catree:add_tutorial_java_ld_preload_mkl
2018-06-08 19:10:38 +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
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