Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Alexander Alekhin
51631b90af
Merge pull request #14726 from alalek:backport_14716
2019-06-05 15:54:46 +00:00
Alexander Alekhin
a2445c44cb
imgcodecs: sanitize PAM decoding
...
backporting of commit: 76fca0e755
2019-06-05 18:12:43 +03:00
Ahmed Ashour
5c56b8ce92
java: generated code to have javadoc
2019-06-05 12:44:03 +02:00
Ahmed Ashour
1aca1d582e
Fix some typos
2019-06-05 12:24:13 +02:00
Lubov Batanina
3efd2df87f
Merge pull request #14682 from l-bat:axpy_layer
...
* Add Axpy layer
* Fix test
* fix caffe importer
2019-06-05 00:18:06 +03:00
Ted Steiner
f1fb002682
Merge pull request #14678 from tedsteiner:qnx
...
Fix build issue on QNX platform (#14678 )
* QNX compatibility
* core: unify gettimeofday() usage
2019-06-04 19:45:21 +03:00
Alexander Alekhin
d5a0d6783a
Merge pull request #14710 from bommo1:bommo1-14265
2019-06-04 16:44:42 +00:00
Alexander Alekhin
5fde16ba90
Merge pull request #14712 from SchultzC:master
2019-06-04 16:43:45 +00:00
rasmus25
394bc91e07
Merge pull request #14718 from rasmus25:3.4
...
* Revert the bad parts of b085158d59
to fix https://github.com/opencv/opencv/issues/11131
but preserve the good parts to keep https://github.com/opencv/opencv/issues/10791 fixed
* calib3d: add regression test for stereoCalibrate to fix https://github.com/opencv/opencv/issues/11131
2019-06-04 18:43:42 +03: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
Ruslan Garnov
25e4bce1a6
Removed LUT3D API entry
2019-06-04 17:13:21 +03:00
Alexander Alekhin
fa96507fe7
Merge pull request #14719 from alalek:update_protobuf_3.5.2
2019-06-04 13:10:17 +00:00
Alexey Smirnov
e329c84d5e
Merge pull request #14684 from smirnov-alexey:as/convert2_test_extension
...
G-API: Add parameters alpha and beta in tests on ConvertTo kernel (#14684 )
* Add parameters alpha and beta in tests on ConvertTo kernel
* Change tolerance function
* Reduce number of test cases
2019-06-04 15:54:09 +03:00
Alexander Alekhin
1febb12942
3rdparty: apply protobuf v3.5.1..v3.5.2 patch
...
https://github.com/protocolbuffers/protobuf/compare/v3.5.1..v3.5.2
2019-06-04 12:57:34 +03:00
Alexander Alekhin
03a3be0844
Merge pull request #14716 from alalek:oss_fuzz_13282
2019-06-04 09:24:32 +00:00
Alexander Alekhin
9802b4e123
Merge pull request #14707 from alalek:update_libwebp_1.0.2
2019-06-04 09:21:35 +00:00
Alexander Alekhin
e1ef7a2288
Merge pull request #14705 from alalek:update_libjpeg_9c
2019-06-04 09:21:17 +00:00
Alexander Alekhin
f768f89803
Merge pull request #14704 from alalek:fix_missing_files_libjpeg_turbo_2.0.2
2019-06-04 09:19:58 +00:00
Alexander Alekhin
1f75c67c56
Merge pull request #14701 from alalek:update_libpng_1.6.37
2019-06-04 09:19:26 +00:00
Alexander Alekhin
f1b6228d4f
3rdparty(webp): enable -std=c99
2019-06-03 22:23:34 +00:00
Alexander Alekhin
d58f9ae824
3rdparty: update libwebp 1.0.0 => 1.0.2
...
https://github.com/webmproject/libwebp/releases/tag/v1.0.2
2019-06-03 22:23:34 +00:00
Alexander Alekhin
76fca0e755
imgcodecs: sanitize PAM decoding
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13282
2019-06-03 22:19:42 +00:00
bommo1
a38157a1f4
Fix https://github.com/opencv/opencv/issues/14265
2019-06-03 23:05:03 +02:00
Alexander Alekhin
f355b3505f
Merge pull request #14661 from dkurt:ie_deconv_adj
2019-06-03 16:58:17 +00:00
Vitaly Tuzov
3b015dfc7d
Merge pull request #14210 from terfendail:wui_512
...
AVX512 wide universal intrinsics (#14210 )
* Added implementation of 512-bit wide universal intrinsics(WIP)
* Added implementation of 512-bit wide universal intrinsics: implemented WUI vector types(WIP)
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented load/store
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented fp16 load/store
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented recombine and zip, implemented non-saturating and saturating arithmetics
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented bit operations
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented comparisons
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented lane shifts and reduction
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented absolute values
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented rounding and cast to float
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented LUT
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented type extension/narrowing and matrix operations
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented load_deinterleave for 2 and 3 channels images
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented load_deinterleave for 2- and implemented for 4-channel images
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented store_interleave
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented signmask and checks
* Added implementation of 512-bit wide universal intrinsics(WIP): build fixes
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented popcount in case AVX512_BITALG is unavailable
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented zip
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented rotate for s8 and s16
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented interleave/deinterleave for s8 and s16
* Added implementation of 512-bit wide universal intrinsics(WIP): updated v512_set macros
* Added implementation of 512-bit wide universal intrinsics(WIP): fix for GCC wrong _mm512_abs_pd definition
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked v_zip to avoid AVX512_VBMI intrinsics
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked v_invsqrt to avoid AVX512_ER intrinsics
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked v_rotate, v_popcount and interleave/deinterleave for U8 to avoid AVX512_VBMI intrinsics
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed integral image SIMD part
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed warnings
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed load_deinterleave for u8 and u16
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed v_invsqrt accuracy for f64
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed interleave/deinterleave for u32 and u64
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed interleave_pairs, interleave_quads and pack_triplets
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed rotate_left
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed rotate_left/right, part 2
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed 512-wide universal intrinsics based resize
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed findContours by avoiding use of uint64 dependent 512-wide v_signmask()
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed trailing whitespaces
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked specific intrinsic sets dependent parts to check availability of intrinsics based on CPU feature group defines
* Added implementation of 512-bit wide universal intrinsics(WIP):Updated AVX512 implementation of v_popcount to avoid AVX512VPOPCNTDQ intrinsics if unavailable.
* Added implementation of 512-bit wide universal intrinsics(WIP): Fixed universal intrinsics data initialisation, v_mul_wrap, v_floor, v_ceil and v_signmask.
* Added implementation of 512-bit wide universal intrinsics(WIP): Removed hasSIMD512()
* Added implementation of 512-bit wide universal intrinsics(WIP): Fixes for gcc build
* Added implementation of 512-bit wide universal intrinsics(WIP): Reworked v_signmask, v_check_any() and v_check_all() implementation.
2019-06-03 18:05:35 +03:00
Alexander Alekhin
0ec72cbd10
3rdparty: update libjpeg 9c
...
https://www.ijg.org/
2019-06-03 16:21:02 +03:00
Alexander Alekhin
68e220e7bb
3rdparty: fix missing files from libjpeg-turbo 2.0.2
2019-06-03 15:42:51 +03:00
Alexander Alekhin
143b3d2b5b
3rdparty(libpng): re-apply OpenCV patches
2019-06-03 15:04:51 +03:00
Alexander Alekhin
e96c94c4e4
3rdparty: update libpng 1.6.37
...
http://www.libpng.org/pub/png/libpng.html
https://github.com/glennrp/libpng/releases
2019-06-03 14:49:44 +03:00
Dmitry Kurtaev
9c0af1f675
Enable more deconvolution layer configurations with IE backend
2019-06-03 08:15:52 +03:00
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