Alexander Alekhin
db900af8c7
Merge pull request #14696 from devnexen:fbsd_build_fix
2019-06-02 20:54:32 +00:00
David Carlier
9fd95b93f7
FreeBSD build fix
2019-06-02 20:25:42 +01:00
Yashas Samaga B L
ae279966c2
Merge pull request #14660 from YashasSamaga:dnn-cuda-build
...
add cuDNN dependency and setup build for cuda4dnn (#14660 )
* update cmake for cuda4dnn
- Adds FindCUDNN
- Adds new options:
* WITH_CUDA
* OPENCV_DNN_CUDA
- Adds CUDA4DNN preprocessor symbol for the DNN module
* FIX: append EXCLUDE_CUDA instead of overwrite
* remove cuDNN dependency for user apps
* fix unused variable warning
2019-06-02 14:47:15 +03:00
Alexander Alekhin
3289a0aff9
Merge pull request #14687 from terfendail:wint_reducefix
2019-05-31 14:52:50 +00:00
Vitaly Tuzov
723165f878
fix for AVX2 version of v_reduce_min intrinsic
2019-05-31 16:14:54 +03:00
Alexander Alekhin
805ab6331f
Merge pull request #14662 from dkurt:dnn_tf_fix_identity_switch
2019-05-30 20:22:17 +00:00
Alexander Alekhin
738435b1dd
Merge pull request #14679 from alalek:cmake_update_option_enable_fast_math
2019-05-30 18:24:30 +00:00
Alexander Alekhin
d8b42792a6
cmake: update ENABLE_FAST_MATH option
2019-05-30 19:44:35 +03: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
3ccb1d67c2
Merge pull request #14670 from alalek:gapi_fix_visibility_conflict
2019-05-30 11:21:50 +00:00
Alexander Alekhin
8ea2f59d33
Merge pull request #14671 from alalek:dnn_test_fast_read
2019-05-30 06:48:34 +00:00
Alexander Alekhin
d6d4571628
Merge pull request #14675 from alalek:backport_14664
2019-05-29 21:09:24 +00:00
Alexander Alekhin
43de95eb19
3rdparty(libpng): fix leak in png_handle_eXIf
...
backporting of commit: 419a6d51b3
2019-05-29 20:15:55 +00:00
mehlukas
0ecc2b8c17
Merge pull request #14674 from mehlukas:3.4-moveObjdetect
...
Merge two Haar Cascade tutorials (#14674 )
* move haar cascade introduction, add code explanation, mark content as moved
* switch to ref for include to provide correct breadcrumb navigation
2019-05-29 23:13:27 +03:00
Alexander Alekhin
52548bde05
dnn(test): replace file content reading
2019-05-29 23:08:33 +03:00
Alexander Alekhin
d2d8535a31
Merge pull request #14664 from alalek:oss_fuzz_13314
2019-05-29 20:05:33 +00:00
Alexander Alekhin
29b3f66507
Merge pull request #14606 from asashour:java_inline_return
2019-05-29 20:03:54 +00:00
Alexander Alekhin
419a6d51b3
3rdparty(libpng): fix leak in png_handle_eXIf
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13314
ported commit: a142b7a543
2019-05-29 18:51:52 +00:00
Dmitry Kurtaev
081d9bc73f
Fix Identity Switch from Keras
2019-05-29 17:13:21 +03:00
Alexander Alekhin
9f68376c91
gapi: fix visibility conflict in OpenCV builds
2019-05-29 15:06:08 +03:00
Alexander Alekhin
216988b0b1
Merge pull request #14582 from alalek:android_update_debug
2019-05-29 11:22:53 +00:00
Alexander Alekhin
53c771551c
Merge pull request #14473 from alalek:video_dis_update_opencl
...
video(DISOpticalFlow): update OpenCL implementation (#14473 )
* video(DIS): add code for profiling
* video(DIS): fix test parameters
* video(DIS): simplify OpenCL kernels
- parameters -> defines
- avoid float3
- const / local scope
- improve readability, replace Kernel::set() -> args()
* video(DIS): use CV_32FC2 buffers
2019-05-29 14:22:21 +03:00
Alexander Alekhin
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
Alexander Alekhin
0d477d7364
Merge pull request #14651 from alalek:dnn_test_update_debug_tags
2019-05-28 16:26:49 +00:00
Alexander Alekhin
e0d88cb7a4
Merge pull request #14614 from mehlukas:3.4-movevideo
2019-05-28 16:22:56 +00:00
Alexander Alekhin
571dfa7605
Merge pull request #14652 from LaurentBerger:I14644
2019-05-28 11:11:27 +00:00
Ahmed Ashour
ca8a1d2cff
java: generated code inline return
2019-05-28 08:34:02 +02:00
Alexander Alekhin
38a3c1ce6b
dnn(test): update test tags for Debug build
2019-05-27 20:12:30 +00:00
LaurentBerger
a3be8d7cd7
dead link
2019-05-27 21:57:10 +02:00
Alexander Alekhin
483e9f341c
Merge pull request #14626 from dkurt:dnn_ie_slice_layer
2019-05-27 16:27:14 +00:00
Alexander Alekhin
aaf56c2839
Merge pull request #14649 from savuor:fix/luv_hls_read_oob
2019-05-27 16:24:55 +00:00
Alexander Alekhin
ed96864892
Merge pull request #14641 from thangktran:thangktran/bugfix/DISOpticalFlow-segfault-for-small-images
2019-05-27 16:23:08 +00:00
Alexey Nikolaev
05563f5bc4
Merge pull request #14592 from aleksey-nikolaev:master
...
VideoCapture Direct Show. Added getter for CV_CAP_PROP_CONVERT_RGB, CAP_PROP_CHANNEL properties. (#14592 )
* Added getter for CV_CAP_PROP_CONVERT_RGB, CAP_PROP_CHANNEL properties.
Some refactoring.
* One space less.
2019-05-27 19:18:36 +03:00
Lubov Batanina
61d3222a22
Merge pull request #14537 from l-bat:fix_network_vizualizer
...
Fix dnn visualizer (#14537 )
* Fixed print layer params
* Fix print
2019-05-27 19:17:07 +03:00
Alexander Alekhin
a81c0e6db9
Merge pull request #14447 from catree:fix_issue_14423
2019-05-27 15:00:21 +00:00
Alexander Alekhin
d73261844e
Merge pull request #14622 from asashour:junit
2019-05-27 14:55:45 +00:00
Alexander Alekhin
b07f951e6b
Merge pull request #14591 from thangktran:thangktran/feature/floodFill-on-opencv.js
2019-05-27 14:54:46 +00:00
Alexander Alekhin
42484f3bcb
Merge pull request #14647 from alalek:fix_coverity_issues
2019-05-27 14:32:02 +00:00
Alexander Alekhin
d7c465d49e
Merge pull request #14643 from mshabunin:fix-ie-status
2019-05-27 14:31:10 +00:00
Alexander Alekhin
c5204a74c0
Merge pull request #14633 from alalek:java_test_filter
2019-05-27 14:13:25 +00:00
Alexander Alekhin
4a2544ff4b
Merge pull request #14632 from alalek:java_test_debug
2019-05-27 14:13:10 +00:00
Alexander Alekhin
c9b3e718db
Merge pull request #14609 from janstarzy:tiff-orientation-fix
2019-05-27 13:39:51 +00:00
Dmitry Kurtaev
44d21e5a79
Enable Slice layer on Inference Engine backend
2019-05-27 16:28:01 +03:00
Rostislav Vasilikhin
8c698262ea
rgb2hls_b: out of bounds read fixed
2019-05-27 16:19:52 +03:00
Alexander Alekhin
1094ed64e9
Merge pull request #14605 from terfendail:wsignmask_fixavx
2019-05-27 13:19:39 +00:00
Rostislav Vasilikhin
791ebd05fc
out of bounds read fixed in rgb2luv_b
2019-05-27 16:19:01 +03:00
Alexander Alekhin
483f28723c
calib3d: initialize local vars, fix indentation in for loops
2019-05-27 14:39:47 +03:00
Maksim Shabunin
a550e50683
Fix IE status message on MacOS
2019-05-27 10:26:16 +03:00
Maksim Shabunin
472f3b7347
Fix TBB debug
2019-05-27 10:26:06 +03:00
Thang Tran
d1615ba11a
video:fixed DISOpticalFlow segfault from small img
2019-05-27 08:18:26 +02:00