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
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
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
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
Vitaly Tuzov [Thu, 20 Dec 2018 20:40:07 +0000 (23:40 +0300)]
Fixed operations on Mat and Matx simultaneously
Dmitry Kurtaev [Tue, 25 Dec 2018 14:29:12 +0000 (17:29 +0300)]
Merge pull request #13481 from dkurt:fix_13227
* Fix drawMatches and drawKeypoints for BGRA input images
* keep BGRA too
* Combine different input types for drawMatches test
Alexander Alekhin [Tue, 25 Dec 2018 14:27:45 +0000 (14:27 +0000)]
Merge pull request #13486 from allnes:dnn_rework
Alexander Nesterov [Wed, 12 Dec 2018 17:42:51 +0000 (16:42 -0100)]
Fix openpose samples
Alexander Alekhin [Tue, 25 Dec 2018 14:26:59 +0000 (14:26 +0000)]
Merge pull request #13524 from terfendail:filter_unroll
Vitaly Tuzov [Tue, 25 Dec 2018 11:40:48 +0000 (14:40 +0300)]
Speedup filter2d by loop unrolling
Added filter2d tests for 16S
Alexander Alekhin [Mon, 24 Dec 2018 16:49:45 +0000 (16:49 +0000)]
Merge pull request #13518 from wzw-intel:test_vulkan
Alexander Alekhin [Mon, 24 Dec 2018 16:48:13 +0000 (16:48 +0000)]
Merge pull request #13517 from wzw-intel:check_vulkan
Wu Zhiwen [Mon, 24 Dec 2018 03:00:45 +0000 (11:00 +0800)]
dnn: fixup missing vkcom/vulkan combination of backend/target in dnn test
Wu Zhiwen [Mon, 24 Dec 2018 02:41:58 +0000 (10:41 +0800)]
dnn: add Vulkan device check for BackendRegistry
Kangning Song [Sun, 23 Dec 2018 03:28:28 +0000 (11:28 +0800)]
fix initial values bug
Alexander Alekhin [Sat, 22 Dec 2018 07:38:15 +0000 (07:38 +0000)]
Merge pull request #13507 from alalek:revert_13506
Alexander Alekhin [Sat, 22 Dec 2018 07:05:18 +0000 (07:05 +0000)]
Merge tag '4.0.1'
OpenCV 4.0.1
Alexander Alekhin [Sat, 22 Dec 2018 07:03:30 +0000 (07:03 +0000)]
release: OpenCV 4.0.1 (version++)
Alexander Alekhin [Sat, 22 Dec 2018 07:01:13 +0000 (07:01 +0000)]
Merge tag '4.0.1-openvino'
OpenCV 4.0.1 for Intel(R) OpenVINO(TM) toolkit
Alexander Alekhin [Sat, 22 Dec 2018 05:40:15 +0000 (05:40 +0000)]
Merge branch '3.4' into merge-3.4
Alexander Alekhin [Sat, 22 Dec 2018 05:37:29 +0000 (05:37 +0000)]
imgproc: revert "Speedup filter2d by loop unrolling"
Commit:
124011c3219b4be6b90aec4538b4560711deb3d2
PR: https://github.com/opencv/opencv/pull/13392
Sobel filter with 16S/16U datatype is broken.
Quentin Chateau [Fri, 21 Dec 2018 22:21:22 +0000 (23:21 +0100)]
stitcher result mask getter
Alexander Alekhin [Fri, 21 Dec 2018 18:48:03 +0000 (21:48 +0300)]
Merge tag '3.4.5'
Alexander Alekhin [Fri, 21 Dec 2018 09:48:29 +0000 (12:48 +0300)]
OpenCV version++ (3.4.5)
OpenCV 3.4.5
Alexander Alekhin [Fri, 21 Dec 2018 14:29:10 +0000 (14:29 +0000)]
Merge pull request #13497 from dkurt:dnn_torch_bn_train
Alexander Alekhin [Fri, 21 Dec 2018 13:56:03 +0000 (13:56 +0000)]
Merge pull request #13386 from alalek:android_gradle
Alexander Alekhin [Fri, 21 Dec 2018 12:18:23 +0000 (12:18 +0000)]
Merge pull request #13493 from dkurt:dnn_ie_r5
Alexander Alekhin [Fri, 21 Dec 2018 12:17:06 +0000 (12:17 +0000)]
Merge pull request #13487 from alalek:videoio_test_frame_size_changing
Alexander Alekhin [Fri, 21 Dec 2018 12:15:58 +0000 (12:15 +0000)]
Merge pull request #13499 from alalek:issue_13498
Dmitry Kurtaev [Fri, 21 Dec 2018 06:11:28 +0000 (09:11 +0300)]
Batch normalization in training phase from Torch
Alexander Alekhin [Fri, 21 Dec 2018 11:01:25 +0000 (11:01 +0000)]
Merge pull request #13467 from alalek:issue_12594
Alexander Alekhin [Fri, 21 Dec 2018 11:01:04 +0000 (11:01 +0000)]
Merge pull request #13435 from alalek:issue_13434
Alexander Alekhin [Fri, 21 Dec 2018 11:00:44 +0000 (11:00 +0000)]
Merge pull request #13392 from terfendail:filter_wintr
Dmitry Kurtaev [Thu, 20 Dec 2018 10:14:47 +0000 (13:14 +0300)]
Fix dnn tests for Inference Engine R5
Alexander Alekhin [Fri, 21 Dec 2018 09:17:53 +0000 (12:17 +0300)]
objdetect(qrcode): don't process small/non-regular images
Alexander Alekhin [Fri, 21 Dec 2018 09:07:38 +0000 (09:07 +0000)]
Merge pull request #13488 from alalek:fix_videoio_v4l2_build
Alexander Alekhin [Fri, 21 Dec 2018 07:05:04 +0000 (10:05 +0300)]
Merge pull request #13489 from alalek:openvino_2018r5
Dmitry Kurtaev [Tue, 27 Nov 2018 09:02:00 +0000 (12:02 +0300)]
Add serialize method for IE net wrapper
backport
4ba4901ca98c858bd6447ca085b4456db099e95c
Alexander Alekhin [Thu, 20 Dec 2018 13:41:14 +0000 (16:41 +0300)]
dnn: add OpenVINO 2018R5 defines
https://software.intel.com/en-us/openvino-toolkit
Vitaly Tuzov [Wed, 12 Dec 2018 20:31:32 +0000 (23:31 +0300)]
Speedup filter2d by loop unrolling
Alexander Alekhin [Thu, 20 Dec 2018 13:28:12 +0000 (16:28 +0300)]
videoio(v4l2): fix build due missing V4L2_CID_ISO_SENSITIVITY
Alexander Alekhin [Thu, 20 Dec 2018 12:55:41 +0000 (12:55 +0000)]
Merge pull request #13484 from va-sorokin:fix-v4l-size
Alexander Alekhin [Thu, 20 Dec 2018 12:09:40 +0000 (15:09 +0300)]
videoio(test): test V4L frame size changing manual test
Vasiliy Sorokin [Wed, 19 Dec 2018 23:39:03 +0000 (15:39 -0800)]
videio: Fix new frame size appling in v4l.
Dmitry Kurtaev [Wed, 19 Dec 2018 20:37:55 +0000 (23:37 +0300)]
Merge pull request #13482 from dkurt:fix_python_bindings_without_stitching
* Fix python bindings without stitching module
* stitching: move stitching specific code into modules/stitching/misc
Alexander Alekhin [Wed, 19 Dec 2018 16:03:55 +0000 (16:03 +0000)]
Merge pull request #13478 from terfendail:medianblur_fix
Alexander Alekhin [Wed, 19 Dec 2018 15:50:32 +0000 (15:50 +0000)]
Merge pull request #13480 from dbudniko:dbudniko/gapi_ocl_backend_internal_umat_size_fix
Vitaly Tuzov [Wed, 19 Dec 2018 12:09:24 +0000 (15:09 +0300)]
Fixed medianBlur implementation for hi-resolution images
Vitaly Tuzov [Mon, 3 Dec 2018 19:58:31 +0000 (22:58 +0300)]
Reworked separable filter to use wide universal intrinsics
Dmitry Budnikov [Wed, 19 Dec 2018 14:45:00 +0000 (17:45 +0300)]
fix size
Alexander Alekhin [Wed, 19 Dec 2018 12:42:38 +0000 (15:42 +0300)]
eliminate build warnings
Alexander Alekhin [Mon, 5 Nov 2018 17:39:09 +0000 (17:39 +0000)]
android: gradle-based package and samples
- drop hello-android sample
Alexander Alekhin [Wed, 19 Dec 2018 11:53:40 +0000 (11:53 +0000)]
Merge pull request #13471 from dkurt:fix_enum_struct_java
Dmitry Kurtaev [Tue, 18 Dec 2018 14:39:31 +0000 (17:39 +0300)]
Try to fix "enum struct" wrapping for Java
Alexander Alekhin [Tue, 18 Dec 2018 19:07:43 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
LaurentBerger [Tue, 18 Dec 2018 18:49:16 +0000 (19:49 +0100)]
Merge pull request #13267 from LaurentBerger:StitchPython
* Python wrapper for detail
* hide pyrotationwrapper
* copy code in pyopencv_rotationwarper.hpp
* move ImageFeatures MatchInfo and CameraParams in core/misc/
* add python test for detail
* move test_detail in test_stitching
* rename
Alexander Alekhin [Tue, 18 Dec 2018 18:35:47 +0000 (18:35 +0000)]
Merge pull request #13466 from pstieber:AddTuringCudaGeneration
Alexander Alekhin [Tue, 18 Dec 2018 18:35:27 +0000 (18:35 +0000)]
Merge pull request #13456 from alalek:fix_eigen2cv_type_check
Peter J. Stieber [Mon, 17 Dec 2018 22:47:26 +0000 (14:47 -0800)]
Added Turing to the _generations list.
Alexander Alekhin [Mon, 5 Nov 2018 15:13:57 +0000 (15:13 +0000)]
android: gradle wrapper
https://github.com/gradle/gradle/tree/v4.6.0
License: Apache 2.0
Alexander Alekhin [Tue, 18 Dec 2018 12:06:14 +0000 (12:06 +0000)]
Merge pull request #13464 from alalek:ocl_max_group_size_parameter
Alexander Alekhin [Tue, 18 Dec 2018 11:46:02 +0000 (11:46 +0000)]
Merge pull request #13458 from alalek:fix_python_install_path
Quentin Chateau [Tue, 18 Dec 2018 11:43:05 +0000 (12:43 +0100)]
Merge pull request #13449 from Tytan:stitching-warp-interpolation
Stitching: added functions to set warp interpolation mode (#13449)
* Added functions to set warp interpolation mode
* Use InterpolationFlags enum
* Improved getter/setter naming
vishwesh5 [Tue, 18 Dec 2018 10:40:04 +0000 (16:10 +0530)]
Merge pull request #13432 from vishwesh5:patch-1
* Create text_detection.py
#12270 #13429
**Deep Learning text detection sample (Python)**
- Tested on **Ubuntu 18.04** - OpenCV 3.4.3, OpenCV 3.4.4, OpenCV 4.0 (master branch)
- Python version supported - Python 2 and Python 3
* Fix trailing whitespaces
* Update text_detection.py
* Remove whitespace
* Remove comments
* Remove unused packages
* Update description
Alexander Alekhin [Tue, 18 Dec 2018 05:33:21 +0000 (05:33 +0000)]
features2d: fix retainBest() implementation
Alexander Alekhin [Mon, 17 Dec 2018 18:31:49 +0000 (18:31 +0000)]
core(ocl): add parameter to limit device max workgroup size
used by OpenCV
Alexander Alekhin [Mon, 17 Dec 2018 18:08:20 +0000 (18:08 +0000)]
Merge pull request #13463 from vishwesh5:patch-2
vishwesh5 [Mon, 17 Dec 2018 15:09:22 +0000 (20:39 +0530)]
Fix Scharr and Sobel functions
Resolves #13375
Rostislav Vasilikhin [Mon, 17 Dec 2018 14:22:38 +0000 (17:22 +0300)]
Merge pull request #13440 from savuor:rgb_wide
* conversions of color_rgb.cpp vectorized
* CL impl: coeffs updated
* unused constants removed
* CUDA color coeffs updated
Alexander Alekhin [Mon, 17 Dec 2018 10:39:26 +0000 (13:39 +0300)]
cmake: fix python install paths
Alexander Alekhin [Sun, 16 Dec 2018 10:16:19 +0000 (10:16 +0000)]
Merge pull request #13455 from alalek:issue_13454
Alexander Alekhin [Sun, 16 Dec 2018 06:43:08 +0000 (06:43 +0000)]
core: fix eigen2cv() - don't change fixed type of 'dst'
Alexander Alekhin [Sun, 16 Dec 2018 06:25:39 +0000 (06:25 +0000)]
stitching: fix l_gains data type from Eigen solver (float / double)
Alexander Alekhin [Sat, 15 Dec 2018 21:17:17 +0000 (21:17 +0000)]
Merge pull request #13447 from alalek:issue_13445
Alexander Alekhin [Sat, 15 Dec 2018 07:58:39 +0000 (07:58 +0000)]
videoio(dc1394): use lazy initialization on demand
Alexander Alekhin [Fri, 14 Dec 2018 22:31:34 +0000 (22:31 +0000)]
Merge pull request #13443 from seiko2plus:issue13442
Sayed Adel [Fri, 14 Dec 2018 19:24:12 +0000 (19:24 +0000)]
core:vsx fix build failure on GCC<=6 due implementation of v_reduce_sum(v_float64x2)
Quentin Chateau [Fri, 14 Dec 2018 18:37:00 +0000 (19:37 +0100)]
Merge pull request #13400 from Tytan:optimize_exposure_compensation
Optimize exposure compensation (#13400)
* Added perf test
* Optimized gains computation
* Use Eigen for gains calculation
Alexander Alekhin [Fri, 14 Dec 2018 15:41:40 +0000 (15:41 +0000)]
Merge pull request #13441 from paroj:capimg