Alexander Alekhin
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
Suleyman TURKMEN
db8585701d
Update create_mask.cpp
2018-07-30 21:42:22 +03:00
Karpushin Vladislav
a8e9a3a88d
doc: add new tutorial "Out of focus deblur filter"
...
In this tutorial you will learn:
- what is a degradation image model
- what is a PSF of an out-of-focus image
- how to restore a blurred image
- what is the Wiener filter
2018-07-27 17:12:24 +07:00
Vadim Pisarevsky
fa466b022d
Merge pull request #12052 from dkurt:dnn_ie_torch_tests
2018-07-26 09:09:35 +00:00
Dmitry Kurtaev
faa6c4e1e1
Faster-RCNN anf RFCN models on CPU using Intel's Inference Engine backend.
...
Enable Torch layers tests with Intel's Inference Engine backend.
2018-07-25 19:04:55 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Alexander Alekhin
8de08e0463
Merge pull request #12021 from dkurt:dnn_ie_tf_ssd
2018-07-24 13:03:41 +00:00
Paul92
8c7555523b
Merge pull request #12032 from Paul92:mser-sample-improvments
...
Mser sample improvments (#12032 )
* Fixed bug in detect_mser sample
Wrong number of colors used to generate the synthetic images
* Formatting improvements
* Using safer casts
* Improved readability of legend generation
* Various readability fixes in detect_mser sample
2018-07-22 17:08:29 +03:00
Dmitry Kurtaev
c213a3823e
Run entire SSDs from TensorFlow using Intel's Inference Engine
2018-07-19 17:05:56 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Alexander Alekhin
50751ae6ff
Merge pull request #11967 from catree:add_tutorial_ml_java_python
2018-07-16 09:24:32 +00:00
catree
41b95cae38
Add Java and Python code for ML tutorials.
2018-07-13 15:52:28 +02:00
Alexander Alekhin
625d20b9b4
Merge pull request #11949 from berak:dnn_object_detection_typo
2018-07-12 09:48:08 +00:00
berak
1c75f3d037
dnn: fix typo in object_detection.cpp sample
2018-07-12 11:06:53 +02:00
catree
c9fe6f1afe
Add Java and Python code for the following tutorials:
...
- Changing the contrast and brightness of an image!
- Operations with images
2018-07-11 20:14:58 +02:00
Alexander Alekhin
2da96be217
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-09 19:44:51 +03:00
Alexander Alekhin
203f95d3be
samples: videocapture_camera use VideoCapture with 0 index
...
Not all backends support -1 index.
2018-07-03 15:44:53 +03:00
Alexander Alekhin
c52b4cf450
Merge pull request #11873 from catree:add_tutorial_features2d_java_python2
2018-07-02 15:02:14 +00:00
catree
481af5c469
Add Java and Python code for AKAZE local features matching tutorial. Fix incorrect uses of Mat.mul() in Java code.
...
Uniform Lowe's ratio test in the code.
2018-07-02 15:10:53 +02:00
Alexander Alekhin
3165baa1f1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-02 14:58:29 +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
catree
7469981d1a
Add Java and Python code for Image Segmentation with Distance Transform and Watershed Algorithm tutorial. Use more Pythonic code.
2018-06-27 18:48:32 +02:00
Vadim Pisarevsky
db48f7b5d1
Merge pull request #11804 from mshabunin:gst-sample
2018-06-27 14:26:27 +00:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
cc8db99695
Include ELA example ( #11819 )
...
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* did some code cleanup
* fixed compile error
2018-06-26 12:10:52 +03:00
Alexander Alekhin
b39cd06249
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-25 22:03:17 +03:00
Vadim Pisarevsky
e3dc7e5ec9
Merge pull request #11743 from alalek:samples_avoid_double_VideoCapture_open
2018-06-25 12:54:09 +00:00
Alexander Alekhin
70d6b8774d
Merge pull request #11790 from berak:dnn_fix_coco_txt
2018-06-23 18:51:07 +00:00
Tomoaki Teshima
ffb9ce8287
suppress warning while building the samples
2018-06-23 21:35:25 +09:00
Maksim Shabunin
fe20fa8326
gstreamer sample: fixed incorrect pipelines being generated
2018-06-21 17:14:42 +03:00
berak
8f7a3b15b2
dnn: add a coco labels file for yolov3
2018-06-19 10:45:49 +02:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Alexander Alekhin
aef16d51ec
samples: don't call twice of VideoCapture::open()
2018-06-11 23:17:49 +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
93f2fd396b
Merge pull request #11723 from alalek:sample_videocapture_camera
2018-06-09 13:49:21 +00:00
Alexander Alekhin
929d39f69a
Merge pull request #11728 from dkurt:dnn_update_tf_ssd
2018-06-08 19:04:28 +00:00
catree
afa5b0cc93
Add Java and Python code for cascade classifier and HDR tutorials.
2018-06-08 19:30:30 +02: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
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
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
Alexander Alekhin
9b0bafb82c
samples: fix callback function type
2018-06-06 18:29:05 +03:00
Vadim Pisarevsky
3cbd2e2764
Merge pull request #11650 from dkurt:dnn_default_backend
2018-06-06 09:30:39 +00:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +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
dcb9bc2544
python: eliminate pylint warnings
...
Tested with:
- pylint 1.9.1
2018-06-04 17:58:06 +03: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
Alexander Alekhin
6912c20380
Merge pull request #11659 from take1014:snippet_11597
2018-06-01 16:48:10 +00:00
take1014
4ec9afac57
add imgproc snippets
2018-06-01 23:42:00 +09: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
9ba9358ecb
documentation: avoid links to 'master' branch from 3.4 maintenance branch
2018-05-31 16:45:18 +03:00
Vadim Pisarevsky
c58cc4c2ff
Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn
2018-05-31 11:07:39 +00:00