ExpandingDev [Fri, 25 Jan 2019 13:36:28 +0000 (08:36 -0500)]
Merge pull request #13675 from ExpandingDev:patch-1
* Add note about building for pkg-config
* minor fixes
Alexander Alekhin [Thu, 24 Jan 2019 16:22:12 +0000 (16:22 +0000)]
Merge pull request #13687 from rgarnov:gapi_fix_fluid_heterogeneity
Ruslan Garnov [Thu, 24 Jan 2019 13:19:27 +0000 (16:19 +0300)]
Fixed fluid heterogeneity support
Alexander Alekhin [Tue, 22 Jan 2019 17:59:28 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 22 Jan 2019 15:31:28 +0000 (15:31 +0000)]
Merge pull request #13666 from savuor:yuv_wide_port
Alexey Smirnov [Tue, 22 Jan 2019 10:14:33 +0000 (13:14 +0300)]
Merge pull request #13664 from smirnov-alexey:gapi_add_descrof_overloading
* Add version of descr_of function taking vector of Mat
* Overload descr_of function for cv::Mat
* Add template function instead of copypasting and change tests a little
Alexander Alekhin [Mon, 21 Jan 2019 18:12:38 +0000 (18:12 +0000)]
Merge pull request #13658 from nglee:dev_CudaShflUpCompat
Alexander Alekhin [Mon, 21 Jan 2019 18:10:25 +0000 (18:10 +0000)]
Merge pull request #13668 from alalek:imgproc_rgb2yuv_regression
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:57:08 +0000 (18:57 +0300)]
a*b+c -> fma
Namgoo Lee [Mon, 21 Jan 2019 15:31:05 +0000 (15:31 +0000)]
__shfl_up_sync with mask for CUDA >= 9
* __shfl_up_sync with proper mask value for CUDA >= 9
* BlockScanInclusive for CUDA >= 9
* compatible_shfl_up for use in integral.hpp
* Use CLAHE in cudev
* Add tests for BlockScan
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:01:44 +0000 (18:01 +0300)]
fixed (un)signed packing s16 -> u8
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:01:44 +0000 (18:01 +0300)]
fixed (un)signed packing s16 -> u8
Alexander Alekhin [Mon, 21 Jan 2019 13:04:23 +0000 (16:04 +0300)]
imgproc(test): RGB2YUV regression test
Rostislav Vasilikhin [Mon, 21 Jan 2019 12:35:34 +0000 (15:35 +0300)]
YUV vectorizations ported to master from 3.4
Alexander Alekhin [Sun, 20 Jan 2019 18:39:03 +0000 (18:39 +0000)]
Merge pull request #13656 from dkurt:dnn_tf_atrous_faster_rcnn
Alexander Alekhin [Sat, 19 Jan 2019 13:44:30 +0000 (13:44 +0000)]
Merge pull request #13580 from LaurentBerger:PythonStitch2
LaurentBerger [Fri, 4 Jan 2019 20:23:51 +0000 (21:23 +0100)]
Check syntax of stitchnig detailed
Alexander Alekhin [Fri, 18 Jan 2019 16:18:47 +0000 (16:18 +0000)]
Merge pull request #13650 from terfendail:shapedescr_wintr
Rostislav Vasilikhin [Fri, 18 Jan 2019 16:06:29 +0000 (19:06 +0300)]
Merge pull request #13649 from savuor:yuv_wide
YUV/YCrCb conversions rewritten to wide intrinsics (#13649)
* YUV: minors
* YUV42x conversions template-merged
* more template-merged YUV42x conversions; some NEON code removed
* rgb2yuv<float> vectorized
* yuv2rgb<float> vectorized
* memcpy removed
* Yuv2RGB<ushort> vectorized
* unused code removed
* rgb2yuv<ushort> vectorized
* rgb2yuv<uchar> vectorized
* v_pack_u used (up to +30% perf)
* yuv2rgb<uchar> vectorized
* fixed compilation
Alexander Alekhin [Fri, 18 Jan 2019 16:00:18 +0000 (16:00 +0000)]
Merge pull request #13539 from dkurt:ie_graph_api
Dmitry Kurtaev [Fri, 18 Jan 2019 15:46:52 +0000 (18:46 +0300)]
Create text graphs for Faster-RCNN from TensorFlow with dilated convolutions
Vitaly Tuzov [Thu, 17 Jan 2019 21:11:52 +0000 (00:11 +0300)]
boundingRect() reworked to use wide universal intrinsics
Alexander Alekhin [Fri, 18 Jan 2019 14:32:11 +0000 (17:32 +0300)]
Revert "Merge pull request #13586 from eightco:Core_bugfix3"
This reverts commit
3721c8bb068aceafce068ab459810440057d8254
except changes in modules/dnn/test/test_tf_importer.cpp
Alexander Alekhin [Fri, 18 Jan 2019 14:56:31 +0000 (14:56 +0000)]
Merge pull request #13637 from berak:fix_openvx
Vitaly Tuzov [Fri, 18 Jan 2019 11:59:03 +0000 (14:59 +0300)]
Performance test for bounding rect estimation
Andrey Golubev [Thu, 17 Jan 2019 17:59:47 +0000 (20:59 +0300)]
Merge pull request #13640 from andrey-golubev:gapi_gcallpriv_doc
* GAPI: document GCall's recursive behavior
* Move documentation outside the class
Lee Jaehwan [Thu, 17 Jan 2019 14:23:09 +0000 (23:23 +0900)]
Merge pull request #13586 from eightco:Core_bugfix3
* Add Operator override for multi-channel Mat with literal constant.
* simple test
* Operator overloading channel constraint for primitive types
* fix some test for #13586
Alexander Alekhin [Thu, 17 Jan 2019 12:35:20 +0000 (12:35 +0000)]
Merge pull request #13645 from mshabunin:doc-includes
Alexander Alekhin [Thu, 17 Jan 2019 12:34:52 +0000 (12:34 +0000)]
Merge pull request #13644 from berak:dnn_samples_googlenet
Dmitry Kurtaev [Mon, 14 Jan 2019 06:55:44 +0000 (09:55 +0300)]
Move Inference Engine to new API
berak [Thu, 17 Jan 2019 10:41:25 +0000 (11:41 +0100)]
dnn/samples: add googlenet to model zoo
Maksim Shabunin [Thu, 17 Jan 2019 10:57:40 +0000 (13:57 +0300)]
Enabled #include documentation in all members
Alexander Alekhin [Wed, 16 Jan 2019 18:18:57 +0000 (18:18 +0000)]
Merge pull request #13625 from nglee:dev_CudaFarnebackInitFlowFix
Alexander Alekhin [Wed, 16 Jan 2019 17:49:06 +0000 (17:49 +0000)]
Merge pull request #13639 from andrey-golubev:gapi_fix_gcall_misuse
Alexander Alekhin [Wed, 16 Jan 2019 15:45:26 +0000 (15:45 +0000)]
Merge pull request #13631 from terfendail:thresh_wintr
Andrey Golubev [Wed, 16 Jan 2019 15:15:44 +0000 (18:15 +0300)]
GAPI: fix GCall misuse in unrollExpr
berak [Wed, 16 Jan 2019 11:10:22 +0000 (12:10 +0100)]
fix openvx wrappers
Alexander Alekhin [Tue, 15 Jan 2019 17:47:21 +0000 (17:47 +0000)]
Merge pull request #13593 from brad-kelly:integral_avx512_ver34
Alexander Alekhin [Tue, 15 Jan 2019 17:46:26 +0000 (17:46 +0000)]
Merge pull request #13622 from sturkmen72:code_clean_up
Vitaly Tuzov [Tue, 15 Jan 2019 16:15:19 +0000 (19:15 +0300)]
threshold() reworked to use wide universal intrinsics
Alexander Alekhin [Tue, 15 Jan 2019 11:22:00 +0000 (11:22 +0000)]
Merge pull request #13610 from terfendail:morph_wintr
Brad Kelly [Wed, 14 Nov 2018 04:03:11 +0000 (20:03 -0800)]
Implementing AVX512 support for 3 channel cv::integral for CV_64F
Suleyman TURKMEN [Fri, 11 Jan 2019 17:31:55 +0000 (20:31 +0300)]
code clean up
Vitaly Tuzov [Thu, 10 Jan 2019 16:08:55 +0000 (19:08 +0300)]
Morphology reworked to use wide universal intrinsics
Alexander Alekhin [Mon, 14 Jan 2019 14:54:11 +0000 (14:54 +0000)]
Merge pull request #13619 from alalek:issue_13595
Namgoo Lee [Fri, 11 Jan 2019 04:00:08 +0000 (04:00 +0000)]
Fix Farneback Optical Flow Algorithm
- Before this PR, following tests failed on some platform.
CUDA_OptFlow/FarnebackOpticalFlow.Accuracy/19
CUDA_OptFlow/FarnebackOpticalFlow.Accuracy/23
- The algorithm now recognizes the OPTFLOW_USE_INITIAL_FLOW flag.
Previously, when the flag was set, it did not use the flow data
passed as input, instead used some garbage data in memory.
- More strict test limit.
Alexander Alekhin [Sun, 13 Jan 2019 09:35:24 +0000 (09:35 +0000)]
Merge pull request #13617 from terfendail:always_inline
atinfinity [Sun, 13 Jan 2019 09:34:05 +0000 (18:34 +0900)]
Merge pull request #13616 from atinfinity:fixed-py_matcher-tutorial
* fixed tutorial code of py_matcher
* fixed imread mode
Alexander Alekhin [Sun, 13 Jan 2019 09:33:05 +0000 (09:33 +0000)]
Merge pull request #13614 from dkurt:dnn_tf_ssd_fpn
Alexander Alekhin [Sat, 12 Jan 2019 11:14:18 +0000 (11:14 +0000)]
cmake: don't use LIB_SUFFIX with CMAKE_INSTALL_LIBDIR
Vitaly Tuzov [Fri, 11 Jan 2019 19:40:35 +0000 (22:40 +0300)]
Added CV_ALWAYS_INLINE macro
Jim Zhou [Fri, 11 Jan 2019 13:58:47 +0000 (21:58 +0800)]
Merge pull request #13601 from JimZhou-001:JimZhou-001
* Fix the bug in case determinant of rotation matrix is -1
* calib3d(test): check det(R) == 1
Dmitry Kurtaev [Fri, 11 Jan 2019 07:50:52 +0000 (10:50 +0300)]
SSD with FPN proposals from TensorFlow
Alexander Alekhin [Thu, 10 Jan 2019 15:15:09 +0000 (15:15 +0000)]
Merge pull request #13606 from rrrapha:malloc-h
Raphael Graf [Thu, 10 Jan 2019 10:54:45 +0000 (11:54 +0100)]
dnn: remove malloc.h include
Alexander Alekhin [Thu, 10 Jan 2019 09:29:41 +0000 (12:29 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 9 Jan 2019 15:45:09 +0000 (15:45 +0000)]
Merge pull request #13560 from cuihaoleo:master
Alexander Alekhin [Wed, 9 Jan 2019 14:42:57 +0000 (14:42 +0000)]
Merge pull request #13592 from tdp2110:master
Alexander Alekhin [Wed, 9 Jan 2019 14:02:59 +0000 (14:02 +0000)]
Merge pull request #13600 from dkurt:fix_13576
Alexander Alekhin [Wed, 9 Jan 2019 14:02:14 +0000 (14:02 +0000)]
Merge pull request #13599 from dkurt:dnn_conv_error_msg
Quentin Chateau [Wed, 9 Jan 2019 14:01:07 +0000 (15:01 +0100)]
Merge pull request #13584 from qchateau:improve_stitching_detailed
Improve stitching detailed (#13584)
* Added block size getter/setters
* Added a bunch of new features to the stitching_detailed sample
* Do not required XFEATURES2D for default use
* Add support for akaze features in stitching_detailed
* Improved sample logs
Alexander Alekhin [Wed, 9 Jan 2019 13:59:49 +0000 (13:59 +0000)]
Merge pull request #13571 from paroj:jsaruco
Alexander Alekhin [Wed, 9 Jan 2019 13:38:57 +0000 (13:38 +0000)]
Merge pull request #13583 from qchateau:fix_13582
Alexander Alekhin [Wed, 9 Jan 2019 13:33:45 +0000 (13:33 +0000)]
Merge pull request #13553 from luctowers:master
CUI Hao (Lab) [Wed, 2 Jan 2019 08:45:51 +0000 (16:45 +0800)]
Fix typo in core+RotatedRect.java
Alexander Alekhin [Wed, 9 Jan 2019 13:30:21 +0000 (13:30 +0000)]
Merge pull request #13587 from catree:add_matplotlib_colormaps
Alexander Alekhin [Wed, 9 Jan 2019 13:25:14 +0000 (13:25 +0000)]
Merge pull request #13591 from scramsby:fix-unicode-errors
Alexander Alekhin [Wed, 9 Jan 2019 13:23:54 +0000 (13:23 +0000)]
Merge pull request #13596 from nglee:dev_RemoveCudaIncludeWarningMsg
Dmitry Kurtaev [Wed, 9 Jan 2019 11:54:20 +0000 (14:54 +0300)]
Fix edge_detection.py sample for Python 3
Lucas Towers [Mon, 31 Dec 2018 13:57:38 +0000 (05:57 -0800)]
Fix improper defining of CV_XADD when using Intel C++
Dmitry Kurtaev [Wed, 9 Jan 2019 10:10:19 +0000 (13:10 +0300)]
Add a text message for Convolution layer's input channels check
Thomas Peters [Mon, 7 Jan 2019 21:15:48 +0000 (16:15 -0500)]
fix implicit fallthrough warning.
Namgoo Lee [Tue, 8 Jan 2019 01:57:12 +0000 (10:57 +0900)]
Remove build warning msg with CUDA10.0
Scott Ramsby [Mon, 7 Jan 2019 18:18:58 +0000 (10:18 -0800)]
Fix build error when building with Unicode on Windows
catree [Sun, 6 Jan 2019 20:42:46 +0000 (21:42 +0100)]
Add Matplotlib Perceptually Uniform Sequential colormaps (viridis, plasma, inferno, magma, cividis, twilight and twilight shifted).
Quentin Chateau [Sat, 5 Jan 2019 15:39:09 +0000 (16:39 +0100)]
Do not compute gains when no images overlap
Alexander Alekhin [Fri, 4 Jan 2019 12:12:35 +0000 (12:12 +0000)]
Merge pull request #13555 from qchateau:nr_blocks_gain_filtering_iterations
Lee Jaehwan [Fri, 4 Jan 2019 12:10:50 +0000 (21:10 +0900)]
Merge pull request #13544 from eightco:bugfix
Fix a bug in cv :: merge when array of 3-channel mat is input (#13544)
* Mat merge function bug fix - Bug fix of merge function of 3-channel vector <Mat> of 3 or 4 matrices
* Add Core_merge test for opencv#13544
* fixups
Pavel Rojtberg [Thu, 3 Jan 2019 17:58:55 +0000 (18:58 +0100)]
js: allow building with basic aruco functionality
Pavel Rojtberg [Thu, 3 Jan 2019 17:50:36 +0000 (18:50 +0100)]
js: allow building without dnn
Alexander Alekhin [Thu, 3 Jan 2019 12:15:54 +0000 (12:15 +0000)]
Merge pull request #13566 from qchateau:fix_13563
Quentin Chateau [Wed, 2 Jan 2019 17:41:26 +0000 (18:41 +0100)]
Fixed uninitialized value and naming
Alexander Alekhin [Wed, 2 Jan 2019 01:18:04 +0000 (01:18 +0000)]
copyright: 2019
Alexander Alekhin [Wed, 2 Jan 2019 01:18:04 +0000 (01:18 +0000)]
copyright: 2019
Quentin Chateau [Mon, 31 Dec 2018 17:50:48 +0000 (18:50 +0100)]
Setter/getter for number of gain filtering iterations
Quentin Chateau [Fri, 28 Dec 2018 10:53:46 +0000 (11:53 +0100)]
Merge pull request #13532 from Tytan:channel_exp_comp
Channels exposure compensators (#13532)
* feed compatible with single channel images
* Simplified BlockGainCompensator::apply
* ChannelsCompensator
* BlocksChannelsCompensator
* Make source level compatibility detector happy
Alexander Alekhin [Fri, 28 Dec 2018 10:51:12 +0000 (10:51 +0000)]
Merge pull request #13534 from mshabunin:fix-external-ffmpeg
Alexander Alekhin [Thu, 27 Dec 2018 15:15:50 +0000 (18:15 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
WuZhiwen [Thu, 27 Dec 2018 12:06:44 +0000 (20:06 +0800)]
Merge pull request #13520 from wzw-intel:hang
* dnn/Vulkan: fix GPU hang for heavy convolution tasks
Intel i915 driver will declare GPU hang if the compute shader
takes too long to complete. See
https://bugs.freedesktop.org/show_bug.cgi?id=108947 for details.
The idea in this commit is to divide heavy task into several light
ones and run compute shader multiple times to make each run take
short time enough.
TODO: Add more efficient compute shader
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: add a more efficient conv shader
Maksim Shabunin [Thu, 27 Dec 2018 11:40:44 +0000 (14:40 +0300)]
Fixed standalone FFmpeg search with pkg-config
Maksim Shabunin [Wed, 26 Dec 2018 12:50:20 +0000 (15:50 +0300)]
Merge pull request #13422 from mshabunin:split-videoio-cmake
* Split videoio dependencies search into pieces, removed obsolete backends
Alexander Alekhin [Wed, 26 Dec 2018 12:38:59 +0000 (12:38 +0000)]
Merge pull request #13453 from crackwitz:w32-opengl-mouse-position
Alexander Alekhin [Wed, 26 Dec 2018 12:10:09 +0000 (12:10 +0000)]
Merge pull request #13451 from crackwitz:gdi-off-by-one
Christoph Rackwitz [Sun, 16 Dec 2018 04:50:32 +0000 (05:50 +0100)]
fix for #4990: highgui w32 ogl: correct calculation of image coordinates from window coordinates
Alexander Alekhin [Wed, 26 Dec 2018 10:27:38 +0000 (10:27 +0000)]
Merge pull request #13504 from Tytan:stitcher_result_mask
Quentin Chateau [Wed, 26 Dec 2018 07:24:38 +0000 (08:24 +0100)]
Merge pull request #13503 from Tytan:gain_comp_multi_feed
Stitching: multi-feed on gain and block compensator (#13503)
* multi-feed on gain and block compensator
* ABI compatibility
Alexander Alekhin [Wed, 26 Dec 2018 07:23:49 +0000 (07:23 +0000)]
Merge pull request #13511 from knsong:3.4
Alexander Alekhin [Wed, 26 Dec 2018 07:23:30 +0000 (07:23 +0000)]
Merge pull request #13492 from terfendail:matx_addition
Christoph Rackwitz [Sun, 16 Dec 2018 02:53:42 +0000 (03:53 +0100)]
Off-by-ones in windows/GDI window calculations
Check for "gutter" around displayed image. there was one row/column missing on the bottom/right.
Might as well set gutter = 0?
Vitaly Tuzov [Fri, 21 Dec 2018 15:24:50 +0000 (18:24 +0300)]
Added test for addition of Mat and Matx