Alexander Alekhin
5115e5decb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-13 16:19:05 +00:00
Alexander Alekhin
0f41daeba5
Merge pull request #12641 from dkurt:dnn_samples_args_autofill
2018-10-13 12:28:08 +00:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Alexander Alekhin
f1fdfa1a51
Merge pull request #12623 from sturkmen72:videoio-4
2018-10-11 19:24:57 +00:00
Alexander Alekhin
de8024ce4a
samples: prefer CMake from MSVS
...
MSVS is shipped with CMake compoment.
2018-10-11 19:19:16 +03:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
Suleyman TURKMEN
59bf2a34fa
Update videoio
2018-10-10 21:58:04 +03:00
Alexander Nesterov
53ec8f286b
Added QR code decoding.
2018-10-10 15:27:00 +00:00
Alexander Alekhin
288251e672
samples: add search for MSVS 2017 BuildTools
2018-10-10 00:34:34 +00:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Alexander Alekhin
421fdc0e94
Merge pull request #12636 from alalek:winpack_samples_cpp_build_script
...
* samples: add winpack "drap & drop" build script
* samples: add search for MSVS 2017 Enterprise
2018-10-09 19:01:29 +03:00
Alexander Alekhin
8f1f4273a2
calib3d: move undistort files from imgproc
2018-10-05 07:52:21 +00:00
Sam Radhakrishnan
699db77293
Fixes #12692 : Update samples/gpu/videoreader.cpp
...
Change iteration to iterate separately when the video is decode on a GPU to account for different number of frames
2018-10-03 17:42:57 +05:30
Alexander Alekhin
ea92c2b1a6
Merge pull request #12663 from sturkmen72:patch-12
2018-09-29 12:52:27 +00:00
Suleyman TURKMEN
8eb987e393
Update findContours parameter type
2018-09-28 18:42:48 +03:00
Alexander Alekhin
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
Dmitry Kurtaev
ad5898224d
Add a file with preprocessing parameters for deep learning networks
2018-09-25 18:28:37 +03:00
Dmitry Kurtaev
f8398d80bc
add Net::getUnconnectedOutLayersNames method
2018-09-25 18:10:45 +03:00
Maksim Shabunin
a0211a1c2f
Moved OpenGL sample to opengl folder
2018-09-24 13:13:30 +03:00
Maksim Shabunin
e0f524d3b7
Fixed several incorrect printf format specifiers
2018-09-24 11:31:40 +03:00
Alexander Alekhin
e8fcd721b8
Merge pull request #12612 from alalek:winpack_samples_python_launcher_update
2018-09-22 20:44:46 +00:00
Alexander Alekhin
ecef7f7930
samples: update winpack python samples launcher
...
- accepts script parameter (allows drag & drop from 'explorer')
- use script dir instead of current dir (can launch samples from 'samples/dnn')
- added 'pause' to show error messages (about missing numpy) instead of instant closing
2018-09-22 17:28:58 +00:00
Alexander Alekhin
a956732874
cmake: update install paths (Linux)
2018-09-19 15:43:52 +03:00
Alexander Alekhin
861415133e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-19 10:58:43 +03:00
Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Dmitry Kurtaev
b0ad7f759a
Import tensorflow to create text graphs if import cv is failed
2018-09-18 09:11:51 +03:00
Alexander Alekhin
76d4aa0c06
Merge pull request #12531 from VladKarpushin:tutorial-using-anisotropic-image-segmentation
2018-09-17 12:06:46 +00:00
Vadim Pisarevsky
2113818f19
Merge pull request #12364 from dkurt:dnn_change_blob_from_image
2018-09-17 12:04:41 +00:00
Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
Karpushin Vladislav
c5687caf1a
doc: add new tutorial anisotropic image segmentation
2018-09-14 13:14:17 +07:00
Dmitry Kurtaev
58ac3e09da
Change default value of crop argument of blobFromImage from true to false
2018-09-12 19:02:58 +03:00
Vadim Pisarevsky
acbfd85737
Merge pull request #12204 from allnes:detect_qr_code
2018-09-12 11:55:44 +00:00
jsxyhelu
7828854c9d
Merge pull request #12206 from jsxyhelu/3.4
...
find innercircle of contour by using pointPolygonTest: (#12206 )
2018-09-11 23:58:01 +03:00
Alexander Nesterov
1fb7ee0e16
Optimiaztion search template lines and added sample
2018-09-11 11:46:36 +00:00
Alexander Alekhin
df8b057b44
avoid Ptr<> == NULL
checks
2018-09-09 19:30:46 +00:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
Alexander Alekhin
43b64140ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-05 19:54:09 +03:00
Alexander Alekhin
a18da0c55e
Merge pull request #12355 from sturkmen72:update_samples
2018-09-05 16:24:02 +00:00
Suleyman TURKMEN
b33cb2e3f2
Update samples
2018-09-05 18:16:40 +03:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Alexander Alekhin
afb81ba6e6
samples: eliminate cvconfig.h usage
...
- don't use TBB in samples
2018-09-04 07:28:17 +00:00
Dmitry Kurtaev
c7cf8fb35c
Import SSDs from TensorFlow by training config ( #12188 )
...
* Remove TensorFlow and protobuf dependencies from object detection scripts
* Create text graphs for TensorFlow object detection networks from sample
2018-09-03 17:08:40 +03:00
Vlad Karpushin
7d3a1657c9
doc: add new tutorial motion deblur filter ( #12215 )
...
* doc: add new tutorial motion deblur filter
* Update motion_deblur_filter.markdown
a few minor changes
2018-08-31 17:41:22 +03:00
Dmitry Kurtaev
50bceea038
Include preprocessing nodes to object detection TensorFlow networks ( #12211 )
...
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
2018-08-31 15:41:56 +03:00
Alexander Alekhin
32a02544de
Merge pull request #12189 from alalek:ippa_cleanup_3.4
2018-08-30 20:29:42 +00:00
Alexander Alekhin
e86287d8ae
cleanup: IPP Async (IPP_A)
...
except header file with conversion routines (will be removed in OpenCV 4.0)
2018-08-30 18:53:07 +03:00
Nobuo Tsukamoto
ade57c8bd0
Fixed that object_detection.py does not work in python3.
2018-08-31 00:21:54 +09:00
Alexander Alekhin
c1db75e0c7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-29 16:24:56 +03:00
Suleyman TURKMEN
bed388bafb
Update opengl_interop.cpp
...
resolves #12307
2018-08-27 01:04:46 +03:00