Alexander Alekhin [Wed, 5 Jun 2019 16:11:22 +0000 (19:11 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 5 Jun 2019 15:54:45 +0000 (15:54 +0000)]
Merge pull request #14726 from alalek:backport_14716
Alexander Alekhin [Fri, 31 May 2019 20:52:20 +0000 (20:52 +0000)]
imgcodecs: sanitize PAM decoding
backporting of commit:
76fca0e755c961a17b890d0b7834eed774b46241
Lubov Batanina [Tue, 4 Jun 2019 21:18:06 +0000 (00:18 +0300)]
Merge pull request #14682 from l-bat:axpy_layer
* Add Axpy layer
* Fix test
* fix caffe importer
Ted Steiner [Tue, 4 Jun 2019 16:45:21 +0000 (12:45 -0400)]
Merge pull request #14678 from tedsteiner:qnx
Fix build issue on QNX platform (#14678)
* QNX compatibility
* core: unify gettimeofday() usage
Alexander Alekhin [Tue, 4 Jun 2019 16:44:42 +0000 (16:44 +0000)]
Merge pull request #14710 from bommo1:bommo1-14265
Alexander Alekhin [Tue, 4 Jun 2019 16:43:45 +0000 (16:43 +0000)]
Merge pull request #14712 from SchultzC:master
rasmus25 [Tue, 4 Jun 2019 15:43:42 +0000 (18:43 +0300)]
Merge pull request #14718 from rasmus25:3.4
* Revert the bad parts of
b085158d5999fdced91094405f8753e9275092f6 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
SchultzC [Tue, 4 Jun 2019 01:18:40 +0000 (18:18 -0700)]
Remove divide by 1000
because t = (time.time() - t) will return seconds, dividing by 1000 to obtain seconds will be incorrect.
Alexander Alekhin [Tue, 4 Jun 2019 13:10:17 +0000 (13:10 +0000)]
Merge pull request #14719 from alalek:update_protobuf_3.5.2
Alexey Smirnov [Tue, 4 Jun 2019 12:54:09 +0000 (15:54 +0300)]
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
Alexander Alekhin [Tue, 4 Jun 2019 09:50:40 +0000 (12:50 +0300)]
3rdparty: apply protobuf v3.5.1..v3.5.2 patch
https://github.com/protocolbuffers/protobuf/compare/v3.5.1..v3.5.2
Alexander Alekhin [Tue, 4 Jun 2019 09:24:32 +0000 (09:24 +0000)]
Merge pull request #14716 from alalek:oss_fuzz_13282
Alexander Alekhin [Tue, 4 Jun 2019 09:21:35 +0000 (09:21 +0000)]
Merge pull request #14707 from alalek:update_libwebp_1.0.2
Alexander Alekhin [Tue, 4 Jun 2019 09:21:17 +0000 (09:21 +0000)]
Merge pull request #14705 from alalek:update_libjpeg_9c
Alexander Alekhin [Tue, 4 Jun 2019 09:19:58 +0000 (09:19 +0000)]
Merge pull request #14704 from alalek:fix_missing_files_libjpeg_turbo_2.0.2
Alexander Alekhin [Tue, 4 Jun 2019 09:19:25 +0000 (09:19 +0000)]
Merge pull request #14701 from alalek:update_libpng_1.6.37
Alexander Alekhin [Mon, 3 Jun 2019 18:25:34 +0000 (18:25 +0000)]
3rdparty(webp): enable -std=c99
Alexander Alekhin [Mon, 3 Jun 2019 15:44:46 +0000 (18:44 +0300)]
3rdparty: update libwebp 1.0.0 => 1.0.2
https://github.com/webmproject/libwebp/releases/tag/v1.0.2
Alexander Alekhin [Fri, 31 May 2019 20:52:20 +0000 (20:52 +0000)]
imgcodecs: sanitize PAM decoding
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13282
bommo1 [Mon, 3 Jun 2019 21:05:03 +0000 (23:05 +0200)]
Fix https://github.com/opencv/opencv/issues/14265
Alexander Alekhin [Mon, 3 Jun 2019 16:58:17 +0000 (16:58 +0000)]
Merge pull request #14661 from dkurt:ie_deconv_adj
Vitaly Tuzov [Mon, 3 Jun 2019 15:05:35 +0000 (18:05 +0300)]
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.
Alexander Alekhin [Mon, 3 Jun 2019 13:21:02 +0000 (16:21 +0300)]
3rdparty: update libjpeg 9c
https://www.ijg.org/
Alexander Alekhin [Mon, 3 Jun 2019 12:32:28 +0000 (15:32 +0300)]
3rdparty: fix missing files from libjpeg-turbo 2.0.2
Alexander Alekhin [Mon, 3 Jun 2019 12:04:51 +0000 (15:04 +0300)]
3rdparty(libpng): re-apply OpenCV patches
Alexander Alekhin [Mon, 3 Jun 2019 11:49:44 +0000 (14:49 +0300)]
3rdparty: update libpng 1.6.37
http://www.libpng.org/pub/png/libpng.html
https://github.com/glennrp/libpng/releases
Dmitry Kurtaev [Tue, 28 May 2019 15:24:25 +0000 (18:24 +0300)]
Enable more deconvolution layer configurations with IE backend
Alexander Alekhin [Sun, 2 Jun 2019 20:54:32 +0000 (20:54 +0000)]
Merge pull request #14696 from devnexen:fbsd_build_fix
David Carlier [Sun, 2 Jun 2019 19:25:42 +0000 (20:25 +0100)]
FreeBSD build fix
Yashas Samaga B L [Sun, 2 Jun 2019 11:47:15 +0000 (11:47 +0000)]
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
Alexander Alekhin [Fri, 31 May 2019 14:52:50 +0000 (14:52 +0000)]
Merge pull request #14687 from terfendail:wint_reducefix
Vitaly Tuzov [Fri, 31 May 2019 13:14:54 +0000 (16:14 +0300)]
fix for AVX2 version of v_reduce_min intrinsic
Alexander Alekhin [Thu, 30 May 2019 20:22:17 +0000 (20:22 +0000)]
Merge pull request #14662 from dkurt:dnn_tf_fix_identity_switch
Alexander Alekhin [Thu, 30 May 2019 18:24:30 +0000 (18:24 +0000)]
Merge pull request #14679 from alalek:cmake_update_option_enable_fast_math
Alexander Alekhin [Thu, 30 May 2019 15:24:01 +0000 (18:24 +0300)]
cmake: update ENABLE_FAST_MATH option
Lubov Batanina [Thu, 30 May 2019 14:36:00 +0000 (17:36 +0300)]
Merge pull request #14627 from l-bat:demo_kinetics
* Support 3D ResNet-34-kinetics
* Update sample
* Remove preprocess
* Change test
* Fix sample
Alexander Alekhin [Thu, 30 May 2019 11:21:50 +0000 (11:21 +0000)]
Merge pull request #14670 from alalek:gapi_fix_visibility_conflict
Alexander Alekhin [Thu, 30 May 2019 06:48:34 +0000 (06:48 +0000)]
Merge pull request #14671 from alalek:dnn_test_fast_read
Alexander Alekhin [Wed, 29 May 2019 21:09:24 +0000 (21:09 +0000)]
Merge pull request #14675 from alalek:backport_14664
Alexander Alekhin [Tue, 28 May 2019 19:39:04 +0000 (19:39 +0000)]
3rdparty(libpng): fix leak in png_handle_eXIf
backporting of commit:
419a6d51b3bfcc4f5bedd393d66954bcd6fb3077
mehlukas [Wed, 29 May 2019 20:13:27 +0000 (22:13 +0200)]
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
Alexander Alekhin [Wed, 29 May 2019 12:29:31 +0000 (15:29 +0300)]
dnn(test): replace file content reading
Alexander Alekhin [Wed, 29 May 2019 20:05:33 +0000 (20:05 +0000)]
Merge pull request #14664 from alalek:oss_fuzz_13314
Alexander Alekhin [Wed, 29 May 2019 20:03:54 +0000 (20:03 +0000)]
Merge pull request #14606 from asashour:java_inline_return
Alexander Alekhin [Tue, 28 May 2019 19:39:04 +0000 (19:39 +0000)]
3rdparty(libpng): fix leak in png_handle_eXIf
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13314
ported commit: https://github.com/glennrp/libpng/commit/
a142b7a543d16d271b8aba3ef7ca4aa9a368f55d
Dmitry Kurtaev [Tue, 28 May 2019 16:47:02 +0000 (19:47 +0300)]
Fix Identity Switch from Keras
Alexander Alekhin [Wed, 29 May 2019 11:51:45 +0000 (14:51 +0300)]
gapi: fix visibility conflict in OpenCV builds
Alexander Alekhin [Wed, 29 May 2019 11:22:52 +0000 (11:22 +0000)]
Merge pull request #14582 from alalek:android_update_debug
Alexander Alekhin [Wed, 29 May 2019 11:22:21 +0000 (14:22 +0300)]
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
Alexander Alekhin [Tue, 28 May 2019 16:41:48 +0000 (19:41 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 28 May 2019 16:26:49 +0000 (16:26 +0000)]
Merge pull request #14651 from alalek:dnn_test_update_debug_tags
Alexander Alekhin [Tue, 28 May 2019 16:22:56 +0000 (16:22 +0000)]
Merge pull request #14614 from mehlukas:3.4-movevideo
Alexander Alekhin [Tue, 28 May 2019 11:11:27 +0000 (11:11 +0000)]
Merge pull request #14652 from LaurentBerger:I14644
Ahmed Ashour [Tue, 28 May 2019 06:34:02 +0000 (08:34 +0200)]
java: generated code inline return
Alexander Alekhin [Mon, 27 May 2019 12:14:18 +0000 (15:14 +0300)]
dnn(test): update test tags for Debug build
LaurentBerger [Mon, 27 May 2019 19:57:10 +0000 (21:57 +0200)]
dead link
Alexander Alekhin [Mon, 27 May 2019 16:27:14 +0000 (16:27 +0000)]
Merge pull request #14626 from dkurt:dnn_ie_slice_layer
Alexander Alekhin [Mon, 27 May 2019 16:24:55 +0000 (16:24 +0000)]
Merge pull request #14649 from savuor:fix/luv_hls_read_oob
Alexander Alekhin [Mon, 27 May 2019 16:23:08 +0000 (16:23 +0000)]
Merge pull request #14641 from thangktran:thangktran/bugfix/DISOpticalFlow-segfault-for-small-images
Alexey Nikolaev [Mon, 27 May 2019 16:18:37 +0000 (19:18 +0300)]
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.
Lubov Batanina [Mon, 27 May 2019 16:17:07 +0000 (19:17 +0300)]
Merge pull request #14537 from l-bat:fix_network_vizualizer
Fix dnn visualizer (#14537)
* Fixed print layer params
* Fix print
Alexander Alekhin [Mon, 27 May 2019 15:00:20 +0000 (15:00 +0000)]
Merge pull request #14447 from catree:fix_issue_14423
Alexander Alekhin [Mon, 27 May 2019 14:55:44 +0000 (14:55 +0000)]
Merge pull request #14622 from asashour:junit
Alexander Alekhin [Mon, 27 May 2019 14:54:45 +0000 (14:54 +0000)]
Merge pull request #14591 from thangktran:thangktran/feature/floodFill-on-opencv.js
Alexander Alekhin [Mon, 27 May 2019 14:32:01 +0000 (14:32 +0000)]
Merge pull request #14647 from alalek:fix_coverity_issues
Alexander Alekhin [Mon, 27 May 2019 14:31:10 +0000 (14:31 +0000)]
Merge pull request #14643 from mshabunin:fix-ie-status
Alexander Alekhin [Mon, 27 May 2019 14:13:25 +0000 (14:13 +0000)]
Merge pull request #14633 from alalek:java_test_filter
Alexander Alekhin [Mon, 27 May 2019 14:13:10 +0000 (14:13 +0000)]
Merge pull request #14632 from alalek:java_test_debug
Alexander Alekhin [Mon, 27 May 2019 13:39:51 +0000 (13:39 +0000)]
Merge pull request #14609 from janstarzy:tiff-orientation-fix
Dmitry Kurtaev [Fri, 24 May 2019 16:28:37 +0000 (19:28 +0300)]
Enable Slice layer on Inference Engine backend
Rostislav Vasilikhin [Mon, 27 May 2019 13:19:52 +0000 (16:19 +0300)]
rgb2hls_b: out of bounds read fixed
Alexander Alekhin [Mon, 27 May 2019 13:19:39 +0000 (13:19 +0000)]
Merge pull request #14605 from terfendail:wsignmask_fixavx
Rostislav Vasilikhin [Mon, 27 May 2019 13:19:01 +0000 (16:19 +0300)]
out of bounds read fixed in rgb2luv_b
Alexander Alekhin [Mon, 27 May 2019 11:39:47 +0000 (14:39 +0300)]
calib3d: initialize local vars, fix indentation in for loops
Maksim Shabunin [Fri, 24 May 2019 11:37:56 +0000 (14:37 +0300)]
Fix IE status message on MacOS
Maksim Shabunin [Fri, 24 May 2019 15:29:29 +0000 (18:29 +0300)]
Fix TBB debug
Thang Tran [Mon, 27 May 2019 06:18:26 +0000 (08:18 +0200)]
video:fixed DISOpticalFlow segfault from small img
utibenkei [Sun, 26 May 2019 16:43:34 +0000 (01:43 +0900)]
Merge pull request #14597 from utibenkei:fix_java_missing_consts
* java: fix java missing_consts
* java: test Calib3d constants
Alexander Alekhin [Sun, 26 May 2019 15:09:35 +0000 (15:09 +0000)]
java(test): test package filtering
Usage example:
- run.py -a -t java --package=calib3d
Alexander Alekhin [Sun, 26 May 2019 14:37:37 +0000 (14:37 +0000)]
java(test): enable debug mode to show useful stacktraces
Alexander Alekhin [Sat, 25 May 2019 13:53:53 +0000 (13:53 +0000)]
Merge pull request #14628 from devnexen:openbsd_build_fix
David Carlier [Sat, 25 May 2019 09:18:34 +0000 (10:18 +0100)]
OpenBSD build fix
Rostislav Vasilikhin [Fri, 24 May 2019 20:01:08 +0000 (23:01 +0300)]
Merge pull request #14616 from savuor:hsv_wide
HSV and HLS color conversions rewritten to wide intrinsics (#14616)
* RGB2HSV_b vectorized
* RGB2HSV_f: widen
* RGB2HSV_f: shorten, more intuitive
* HSV2RGB_f and HSV2RGB_b widen
* hls2rgb_f widen
* instrumentation instead vx_cleanup
* RGB2HLS_f widen
* RGB2HLS_b rewritten to wide universal intrinsics
* define guard against no SIMD code
* hls2rgb_b rewritten
* extra define removed
* warning fixed
* hls2rgb_b: performance fixed
Alexander Alekhin [Fri, 24 May 2019 19:57:53 +0000 (19:57 +0000)]
Merge pull request #14623 from alalek:fix_14617
Alexander Alekhin [Fri, 24 May 2019 11:23:32 +0000 (14:23 +0300)]
imgcodecs(CAP_IMAGES): fix handling of input pattern
Vitaly Tuzov [Thu, 23 May 2019 10:45:14 +0000 (13:45 +0300)]
Fixed v_signmask implementation for AVX2, updated universal intrinsics tests.
Ahmed Ashour [Fri, 24 May 2019 08:45:09 +0000 (10:45 +0200)]
java: test: use assertNotNull and assertFalse
Alexander Alekhin [Thu, 23 May 2019 16:50:20 +0000 (19:50 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Lukas Mehl [Thu, 23 May 2019 15:11:44 +0000 (17:11 +0200)]
remove bgsgm tutorial, set references to OpenCV-Tutorials
Alexander Alekhin [Thu, 23 May 2019 15:05:18 +0000 (15:05 +0000)]
Merge pull request #14610 from mshabunin:fix-gtk-gl
Alexander Alekhin [Thu, 23 May 2019 15:04:38 +0000 (15:04 +0000)]
Merge pull request #14602 from asashour:java_lang_
Jan Starzynski [Thu, 23 May 2019 12:40:33 +0000 (14:40 +0200)]
handle all orientations properly
Maksim Shabunin [Thu, 23 May 2019 12:58:49 +0000 (15:58 +0300)]
highgui: fixed build GTK2+OpenGL
Alexander Alekhin [Thu, 23 May 2019 12:26:19 +0000 (12:26 +0000)]
Merge pull request #14601 from asashour:14211_CvType
Ahmed Ashour [Thu, 23 May 2019 07:20:32 +0000 (09:20 +0200)]
java: remove redundant declaration of java.lang package
Ahmed Ashour [Thu, 23 May 2019 06:49:01 +0000 (08:49 +0200)]
java: add CvType.CV_16F
Alexander Alekhin [Wed, 22 May 2019 18:59:31 +0000 (18:59 +0000)]
Merge pull request #14557 from mshabunin:win-lapack
Alexander Alekhin [Wed, 22 May 2019 18:16:48 +0000 (18:16 +0000)]
Merge pull request #14520 from kupferb:patch-1
Alexander Alekhin [Wed, 22 May 2019 18:15:43 +0000 (18:15 +0000)]
Merge pull request #14514 from mshabunin:fix-videoio-docs
projects / platform / upstream / opencv.git / log