Alexander Alekhin
0cf479dd5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-25 19:21:47 +00:00
Alexander Alekhin
39a6889767
Merge pull request #15118 from dkurt:fix_15106
2019-07-25 18:56:32 +00:00
Dmitry Kurtaev
a2125594ea
Fix false positives of face detection network for large faces
2019-07-25 20:09:59 +03:00
Alexander Alekhin
79310a0051
Merge pull request #15105 from komakai:camera_permissions
2019-07-22 17:47:54 +00:00
Giles Payne
2734291b35
Add CameraActivity utility class to automate Camera permission request handling
2019-07-20 13:40:10 +09:00
Alexander Alekhin
8bac8b513c
core: support SIMD intrinsics in user code
2019-07-19 20:33:32 +00:00
Giles Payne
a897fc91ec
Add no_samples_build option to Android SDK build
2019-07-18 21:31:02 +09:00
Alexander Alekhin
8408587341
Merge pull request #14888 from vchiluka5:NVIDIA_Optical_Flow
2019-07-07 17:20:53 +03:00
Alexander Alekhin
097d81363b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-02 21:17:45 +00:00
Alexander Alekhin
b00e19a8da
Merge pull request #14837 from Cartucho:fix_laplace_operator_on_python
2019-07-01 17:00:25 +00:00
Alexander Alekhin
6fdce865b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-29 17:27:48 +00:00
Dmitry Kurtaev
a04ab2298b
Fix JS sample of dnn
2019-06-29 19:21:14 +03:00
Vishal Chiluka
0e9a865bbf
Moved NVIDIA_Optical_Flow sample app to opencv_contrib
...
Description:
Moved NVIDIA_Optical_flow sample app and comparison app to
opencv_contrib branch. Added CUDA_CUDA_LIBRARY in CMakeLists.txt for
resolving linker errors.
2019-06-28 09:19:26 +05:30
Alexander Alekhin
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
Dmitry Kurtaev
411ca87a86
Remove extra ")"
2019-06-26 17:27:56 +03:00
Alexander Alekhin
8fd87033ef
Merge pull request #14869 from alalek:samples_msvs2019_support
2019-06-25 22:07:02 +00:00
Dmitry Kurtaev
d17d3b66aa
Fix face recognition JS sample
2019-06-24 16:41:37 +03:00
tribta
e8283f94ed
Fix Python code, for the tutorial_laplace_operator, to get the same result between the Cpp, Java and Python
2019-06-23 18:03:01 +01:00
Alexander Alekhin
5c63be3c6e
samples: support MSVS 2019 compiler
...
requires CMake 3.14+
2019-06-22 16:24:21 +00:00
Dmitry Kurtaev
d75a089690
Fix face recognition sample for JS
2019-06-21 21:53:52 -07:00
Alexander Alekhin
f33f88de31
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-21 17:27:14 +03:00
wenzhao
3f5c85e933
opencv.js: fix the loading issue of opencv.js(WASM) in face recognition
2019-06-13 11:26:27 +08:00
Alexander Alekhin
11b020b9f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-10 19:05:28 +00:00
Alexander Alekhin
6d916c5bb4
Merge pull request #14440 from alalek:async_array
2019-06-08 20:57:15 +00:00
Alexander Alekhin
ddcf388270
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-07 19:02:55 +03:00
Alexander Alekhin
8fae361768
Merge pull request #14750 from alalek:sample_fix_encoding
2019-06-07 11:12:28 +00:00
SchultzC
1e6e18ff05
Changed to integer division
2019-06-06 14:50:45 -07:00
Alexander Alekhin
a51d46cbf9
samples: skip findFile() in encoding mode
2019-06-06 20:42:55 +00:00
SchultzC
3833d86f0f
Merge pull request #14733 from SchultzC:3.4
...
* cast positional arguments to int
* Changed to integer division based
* removed white space
* removed white space
2019-06-06 13:02:45 +03:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Ahmed Ashour
1aca1d582e
Fix some typos
2019-06-05 12:24:13 +02:00
SchultzC
edb3337ead
Remove divide by 1000
...
because t = (time.time() - t) will return seconds, dividing by 1000 to obtain seconds will be incorrect.
2019-06-04 08:17:37 -07:00
Lubov Batanina
f94253b82b
Merge pull request #14627 from l-bat:demo_kinetics
...
* Support 3D ResNet-34-kinetics
* Update sample
* Remove preprocess
* Change test
* Fix sample
2019-05-30 17:36:00 +03:00
Alexander Alekhin
216988b0b1
Merge pull request #14582 from alalek:android_update_debug
2019-05-29 11:22:53 +00:00
Alexander Alekhin
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
atalaman
935c02c0a3
Merge pull request #13851 from TolyaTalamanov:at/new-kernel-package-design
...
G-API: Kernel package design (#13851 )
* Remove cv::unite_policy from API
* Add check that all id in kernel package are unique
* Refactor checker id procedure
* Remove cv::gapi::GLookupOrder from API
* Implement cv::gapi::use_only
* Fix samples
* Fix docs
* Fix comments to review
* Remove unite_policy
* Fix GKernelPackage::backends()
* Fix comments to review
* Fix all_unique
* Fix comments to review
* Fix comments to review
* Remove out of date tests
2019-05-22 14:53:44 +03:00
Dmitry Kurtaev
26e426adb1
StridedSlice from TensorFlow
2019-05-22 12:45:52 +03:00
Alexander Alekhin
3c1267dbe6
android: update 'debug' information support
2019-05-19 16:09:45 +00:00
Alexander Alekhin
132253c9f3
dnn: use AsyncArray
2019-05-18 19:32:23 +00:00
Alexander Alekhin
e21262deba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-16 04:40:39 +00:00
Alexander Alekhin
18151e79bb
cmake(samples): use LINK_PRIVATE in target_link_libraries
2019-05-15 18:38:00 +03:00
mehlukas
6bff0e24f8
Merge pull request #14314 from mehlukas:3.4-opticalflow
...
Extend optical flow tutorial (#14314 )
* extend python optical flow tutorial with cpp example code and add it to general tutorial directory
* remove unused parameters, fix comparison between signed and unsigned int
* fix hsv range problem
* switch to samples::findFile for sample file location
* switch to command line parameter for path
* remove old tutorial as in 14393
* minor fixes
2019-05-15 15:13:57 +03:00
mehlukas
47c45e5bd3
Merge pull request #14393 from mehlukas:3.4-meanshift
...
Extend meanshift tutorial (#14393 )
* copy original tutorial and python code
* add cpp code, fix python code
* add camshift cpp code, fix bug in meanshift code
* add description to ToC page
* fix shadowing previous local declaration
* fix grammar: with -> within
* docs: remove content of old py_meanshift tutorial, add link
* docs: replace meanshift tutorial subpage in Python tutorials
* switch to ref to fix wrong breadcrumb navigation
* switch to cmdline for path as in #14314
* Apply suggestions from code review
* order programming languages alphabetically
2019-05-15 13:34:20 +03:00
Alexander Alekhin
9fabc3406f
Merge pull request #14558 from alalek:cmake_samples_threading_3.4
2019-05-14 19:02:23 +00:00
Dmitry Kurtaev
63bb97cc19
Asynchronous C++ sample
2019-05-14 19:09:07 +03:00
Alexander Alekhin
3201ea89d6
cmake: enable threading in samples
...
- moved code into separate file due issue with handling of CMake policies
2019-05-14 17:29:46 +03:00
Dmitry Kurtaev
c3b0a68a2b
Async mode for dnn's object detection sample
2019-05-14 09:58:47 +03:00
Alexander Alekhin
b2abd8ca41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-07 16:04:54 +00:00
LaurentBerger
fa8e301c69
extends regex matching for conv group of layers
2019-05-07 16:17:25 +02:00
Alexander Alekhin
e28e3c9491
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-01 08:27:45 +00:00