Raphael Graf [Thu, 10 Jan 2019 10:54:45 +0000 (11:54 +0100)]
dnn: remove malloc.h include
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
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).
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
Alexander Alekhin [Wed, 2 Jan 2019 01:18:04 +0000 (01:18 +0000)]
copyright: 2019
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 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
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 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.
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 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.
Alexander Alekhin [Wed, 19 Dec 2018 16:03:55 +0000 (16:03 +0000)]
Merge pull request #13478 from terfendail:medianblur_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
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 [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
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
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 14:35:56 +0000 (14:35 +0000)]
Merge pull request #13438 from madan-ram:patch-2
Rostislav Vasilikhin [Fri, 14 Dec 2018 14:01:01 +0000 (17:01 +0300)]
Merge pull request #13379 from savuor:color_5x5
RGB to/from Gray rewritten to wide intrinsics (#13379)
* 5x5 to RGB added
* RGB25x5 added
* Gray2RGB added
* Gray2RGB5x5 added
* vx_set moved out of loops
* RGB5x52Gray added
* RGB2Gray written
* warnings fixed (int -> (u)short conversion)
* warning fixed
* warning fixed
* "i < n-vsize+1" to "i <= n-vsize"
* RGBA2mRGBA vectorized
* try to fix ARM builds
* fixed ARM build for RGB2RGB5x5
* mRGBA2RGBA: saturation, vectorization
* fixed CL implementation of mRGBA2RGBA (saturation added)
Madan Ram [Fri, 14 Dec 2018 11:04:58 +0000 (16:34 +0530)]
Update template_matching.markdown
Replaced CV_TM_SQDIFF to TM_SQDIFF and the rest since methods are renamed in opencv 3.4
Alexander Alekhin [Fri, 14 Dec 2018 10:36:39 +0000 (10:36 +0000)]
Merge pull request #13436 from alalek:cmake_with_msmf_dxva_3.4
Alexander Alekhin [Fri, 14 Dec 2018 00:15:57 +0000 (00:15 +0000)]
cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION
Alexander Alekhin [Thu, 13 Dec 2018 11:53:48 +0000 (14:53 +0300)]
videoio(MSMF): backport WITH_MSMF_DXVA flag
Vitaly Tuzov [Thu, 13 Dec 2018 11:20:22 +0000 (14:20 +0300)]
Merge pull request #13334 from terfendail:histogram_wintr
* added performance test for compareHist
* compareHist reworked to use wide universal intrinsics
* Disabled vectorization for CV_COMP_CORREL and CV_COMP_BHATTACHARYYA if f64 is unsupported
Alexander Alekhin [Thu, 13 Dec 2018 11:15:51 +0000 (11:15 +0000)]
Merge pull request #13427 from dkurt:dnn_onnx_dynamic_reshape
Alexander Alekhin [Thu, 13 Dec 2018 10:08:34 +0000 (10:08 +0000)]
Merge pull request #13387 from dkurt:dnn_minor_ie_fixes
Alexander Alekhin [Thu, 13 Dec 2018 09:14:26 +0000 (09:14 +0000)]
Merge pull request #13430 from tomoaki0705:fixCudaJetsonTX2file
Tomoaki Teshima [Thu, 13 Dec 2018 04:35:19 +0000 (13:35 +0900)]
use correct CC value for Jetson Xavier
Alexander Alekhin [Wed, 12 Dec 2018 15:38:47 +0000 (15:38 +0000)]
Merge pull request #13423 from alalek:issue_13418
Dmitry Kurtaev [Wed, 12 Dec 2018 14:36:17 +0000 (17:36 +0300)]
Operate with shapes in ONNX models
Alexander Alekhin [Wed, 12 Dec 2018 14:58:50 +0000 (14:58 +0000)]
Merge pull request #13420 from ThadHouse:Windows7shlwapi
Adrian Kashivskyy [Wed, 12 Dec 2018 14:32:19 +0000 (15:32 +0100)]
Merge pull request #13424 from akashivskyy:pr/ios-nonfree
Add ability to build iOS and macOS frameworks with nonfree modules (#13424)
* Allow building ios framework with nonfree
* Allow building osx framework with nonfree
Alexander Alekhin [Wed, 12 Dec 2018 10:35:43 +0000 (13:35 +0300)]
cmake: fix compiler flags filtering
Thad House [Wed, 12 Dec 2018 01:06:01 +0000 (17:06 -0800)]
Remove MinCore_Downlevel, replace with Shlwapi
On windows 7, MinCore_Downlevel does not work correctly. However, the only API used was QISearch, which can be found in Shlwapi.
Closes #12010
Dmitry Kurtaev [Fri, 7 Dec 2018 09:40:34 +0000 (12:40 +0300)]
Minor fixes in IE backend tests
LaurentBerger [Sun, 9 Dec 2018 12:05:27 +0000 (13:05 +0100)]
Merge pull request #13382 from LaurentBerger:imreadsize
* try to solve #13381
* Add note
Alexander Alekhin [Sat, 8 Dec 2018 17:51:47 +0000 (17:51 +0000)]
Merge pull request #13388 from alalek:ocl_fix_perf_stitching
Alexander Alekhin [Sat, 8 Dec 2018 17:51:09 +0000 (17:51 +0000)]
Merge pull request #13385 from alalek:cmake_cleanup_build_junk_dir
Alexander Alekhin [Sat, 8 Dec 2018 17:50:03 +0000 (17:50 +0000)]
Merge pull request #13316 from alalek:cmake_fix_baseline_detect