platform/upstream/opencv.git
5 years agoMerge pull request #13775 from terfendail:morph_fix
Alexander Alekhin [Thu, 7 Feb 2019 15:53:58 +0000 (15:53 +0000)]
Merge pull request #13775 from terfendail:morph_fix

5 years agoFixed out of bound reading issue in erode() and dilate()
Vitaly Tuzov [Thu, 7 Feb 2019 12:58:34 +0000 (15:58 +0300)]
Fixed out of bound reading issue in erode() and dilate()

5 years agoMerge pull request #13738 from dkurt:dnn_ie_lock_shared_plugins
Alexander Alekhin [Wed, 6 Feb 2019 12:09:58 +0000 (12:09 +0000)]
Merge pull request #13738 from dkurt:dnn_ie_lock_shared_plugins

5 years agoAdd a mutex for shared Inference Engine plugins
Dmitry Kurtaev [Thu, 31 Jan 2019 13:10:59 +0000 (16:10 +0300)]
Add a mutex for shared Inference Engine plugins

5 years agoMerge pull request #13762 from alalek:ocl_dnn_mvn_local_size
Alexander Alekhin [Tue, 5 Feb 2019 14:58:27 +0000 (14:58 +0000)]
Merge pull request #13762 from alalek:ocl_dnn_mvn_local_size

5 years agodnn(ocl): use compile-time LOCAL_SIZE parameter
Alexander Alekhin [Tue, 5 Feb 2019 12:27:29 +0000 (15:27 +0300)]
dnn(ocl): use compile-time LOCAL_SIZE parameter

instead of get_local_size(0) and dynamic local memory allocation

5 years agoMerge pull request #13670 from allnes:dnn_fix_obj_detect_sample
Alexander Alekhin [Tue, 5 Feb 2019 12:37:53 +0000 (12:37 +0000)]
Merge pull request #13670 from allnes:dnn_fix_obj_detect_sample

5 years agoMerge pull request #13737 from winice-test:master
winice [Mon, 4 Feb 2019 15:59:00 +0000 (23:59 +0800)]
Merge pull request #13737 from winice-test:master

* Optical Flow rework to use wide universal intrinsics

* remove if (useSIMD) check as review requested

5 years agoMerge pull request #12855 from dkurt:js_features2d_tests
Alexander Alekhin [Sat, 2 Feb 2019 14:22:02 +0000 (14:22 +0000)]
Merge pull request #12855 from dkurt:js_features2d_tests

5 years agoAdd tests for features2d JavaScript bindings
Dmitry Kurtaev [Tue, 16 Oct 2018 09:23:43 +0000 (12:23 +0300)]
Add tests for features2d JavaScript bindings

5 years agoMerge pull request #13708 from savuor:yuv42x_wide
Rostislav Vasilikhin [Fri, 1 Feb 2019 16:09:31 +0000 (19:09 +0300)]
Merge pull request #13708 from savuor:yuv42x_wide

YUV42x color conversions rewritten to wide intrinsics (#13708)

* a*b+c -> fma

* YUV420sp2RGB initially vectorized

* shorter var names

* loops by 4

* yuv420p2rgb vectorized

* yuv422toRGB vectorized

* reg arrays

* rgb2yuv420 vectorized

* warnings fixed

* try to fix align error

5 years agoMerge pull request #13722 from alalek:ocl_pass_ptr_for_empty_umat
Alexander Alekhin [Fri, 1 Feb 2019 16:07:43 +0000 (16:07 +0000)]
Merge pull request #13722 from alalek:ocl_pass_ptr_for_empty_umat

5 years agoMerge pull request #13736 from dkurt:dnn_ie_future
Alexander Alekhin [Fri, 1 Feb 2019 10:01:39 +0000 (10:01 +0000)]
Merge pull request #13736 from dkurt:dnn_ie_future

5 years agoMerge pull request #13735 from dkurt:fix_13725
Alexander Alekhin [Fri, 1 Feb 2019 09:58:14 +0000 (09:58 +0000)]
Merge pull request #13735 from dkurt:fix_13725

5 years agoMerge pull request #13716 from dkurt:dnn_conv_weights_clone
Alexander Alekhin [Fri, 1 Feb 2019 09:57:08 +0000 (09:57 +0000)]
Merge pull request #13716 from dkurt:dnn_conv_weights_clone

5 years agoMerge pull request #13718 from lochsh:svm-sigmoid-fix
Hannah McLaughlin [Thu, 31 Jan 2019 12:34:36 +0000 (12:34 +0000)]
Merge pull request #13718 from lochsh:svm-sigmoid-fix

SVM sigmoid kernel fix (issue #13621) (#13718)

* Added test for sigmoid case for retrieving support vectors

* undo unhelpful test

* add test for sigmoid SVM with data that is easily separable into two concentric circles

* Update sigmoid kernel to use tanh(gamma * <x, y> + coef0) instead of -tanh(gamma * <x, y> + coef0)

* remove unnecessary constraint on coef0

* cleanup

* fixing inappropriate use of doubles

* Add f to float literal

* replace CV_Assert with ASSERT_EQ where appropriate

5 years agoFix IE tests
Dmitry Kurtaev [Thu, 31 Jan 2019 10:38:24 +0000 (13:38 +0300)]
Fix IE tests

5 years agoAlign TensorFlow and OpenCV paths to create a text graph
Dmitry Kurtaev [Thu, 31 Jan 2019 10:40:54 +0000 (13:40 +0300)]
Align TensorFlow and OpenCV paths to create a text graph

5 years agoMerge pull request #13693 from terfendail:spatialgrad_wintr
Vitaly Tuzov [Wed, 30 Jan 2019 19:37:27 +0000 (22:37 +0300)]
Merge pull request #13693 from terfendail:spatialgrad_wintr

* spatialGradient() reworked to use wide universal intrinsics

* Moved row pointers inside loops

5 years agoUpdate obj. detect sample
Alexander Nesterov [Tue, 22 Jan 2019 16:01:48 +0000 (15:01 -0100)]
Update obj. detect sample

5 years agoocl: support empty "ptr only" UMat in Kernel::set()
Alexander Alekhin [Wed, 30 Jan 2019 11:48:53 +0000 (14:48 +0300)]
ocl: support empty "ptr only" UMat in Kernel::set()

add messages to avoid silent kernel destruction

5 years agoMerge pull request #13710 from ramezrafla:3.4
Ramez Rafla [Tue, 29 Jan 2019 21:14:33 +0000 (16:14 -0500)]
Merge pull request #13710 from ramezrafla:3.4

* Added DMatch bindings

* Added CR which was accidently removed to maintain consistency

* Removed trailing white-space

5 years agoMerge pull request #13684 from terfendail:lblend_wintr
Alexander Alekhin [Tue, 29 Jan 2019 16:21:08 +0000 (16:21 +0000)]
Merge pull request #13684 from terfendail:lblend_wintr

5 years agoMerge pull request #13679 from alalek:imgproc_median_blur_cleanup
Alexander Alekhin [Tue, 29 Jan 2019 16:20:24 +0000 (19:20 +0300)]
Merge pull request #13679 from alalek:imgproc_median_blur_cleanup

* imgproc: cleanup medianBlur_8u_O1 code

Unnecessary per-channel buffers: H[c] / lut[c]

* imgproc(medianBlur_8u_O1): use CV_SIMD_WIDTH for alignment

5 years agoClone convolution layer weights only for fusion
Dmitry Kurtaev [Tue, 29 Jan 2019 11:29:47 +0000 (14:29 +0300)]
Clone convolution layer weights only for fusion

5 years agoMerge pull request #13672 from arnaudbrejeon:bug_fix_12961
Arnaud Brejeon [Mon, 28 Jan 2019 18:36:00 +0000 (10:36 -0800)]
Merge pull request #13672 from arnaudbrejeon:bug_fix_12961

PyrDown: Fix bug #12961 (#13672)

* Force unaligned pointer and create test

* More cross-platform solution

* MSVC expects a proper order

* Remove useless clang macro

5 years agoMerge pull request #13692 from dkurt:dnn_do_not_crash_myriad_in_tests
Alexander Alekhin [Mon, 28 Jan 2019 18:34:20 +0000 (18:34 +0000)]
Merge pull request #13692 from dkurt:dnn_do_not_crash_myriad_in_tests

5 years agoMerge pull request #13707 from dkurt:fix_13575
Alexander Alekhin [Mon, 28 Jan 2019 18:32:21 +0000 (18:32 +0000)]
Merge pull request #13707 from dkurt:fix_13575

5 years agoFix a dnn bug with retrieving all the output blobs
Dmitry Kurtaev [Mon, 28 Jan 2019 15:44:31 +0000 (18:44 +0300)]
Fix a dnn bug with retrieving all the output blobs

5 years agoRemove ASSERT_ANY_THROW checks fpr Myriad plugin and FP32 networks
Dmitry Kurtaev [Fri, 25 Jan 2019 12:02:29 +0000 (15:02 +0300)]
Remove ASSERT_ANY_THROW checks fpr Myriad plugin and FP32 networks

5 years agoMerge pull request #13608 from allnes:dnn_rework
Alexander Alekhin [Fri, 25 Jan 2019 11:59:29 +0000 (11:59 +0000)]
Merge pull request #13608 from allnes:dnn_rework

5 years agoAdded performance test for blendLinear
Vitaly Tuzov [Thu, 24 Jan 2019 13:26:09 +0000 (16:26 +0300)]
Added performance test for blendLinear

5 years agoblendLinear() reworked to use wide universal intrinsics
Vitaly Tuzov [Wed, 23 Jan 2019 14:24:44 +0000 (17:24 +0300)]
blendLinear() reworked to use wide universal intrinsics

5 years agoMerge pull request #13685 from mshabunin:fix-avfoundation-34
Alexander Alekhin [Thu, 24 Jan 2019 16:21:49 +0000 (16:21 +0000)]
Merge pull request #13685 from mshabunin:fix-avfoundation-34

5 years agoAdded fix for other size
Alexander Nesterov [Thu, 10 Jan 2019 17:29:44 +0000 (16:29 -0100)]
Added fix for other size

5 years agoAVFoundation on Mac: fixed frame count and unsupported format handling
Maksim Shabunin [Thu, 24 Jan 2019 11:37:26 +0000 (14:37 +0300)]
AVFoundation on Mac: fixed frame count and unsupported format handling

5 years agoMerge pull request #13658 from nglee:dev_CudaShflUpCompat
Alexander Alekhin [Mon, 21 Jan 2019 18:12:38 +0000 (18:12 +0000)]
Merge pull request #13658 from nglee:dev_CudaShflUpCompat

5 years agoMerge pull request #13668 from alalek:imgproc_rgb2yuv_regression
Alexander Alekhin [Mon, 21 Jan 2019 18:10:25 +0000 (18:10 +0000)]
Merge pull request #13668 from alalek:imgproc_rgb2yuv_regression

5 years ago__shfl_up_sync with mask for CUDA >= 9
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

5 years agofixed (un)signed packing s16 -> u8
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:01:44 +0000 (18:01 +0300)]
fixed (un)signed packing s16 -> u8

5 years agoimgproc(test): RGB2YUV regression test
Alexander Alekhin [Mon, 21 Jan 2019 13:04:23 +0000 (16:04 +0300)]
imgproc(test): RGB2YUV regression test

5 years agoMerge pull request #13656 from dkurt:dnn_tf_atrous_faster_rcnn
Alexander Alekhin [Sun, 20 Jan 2019 18:39:03 +0000 (18:39 +0000)]
Merge pull request #13656 from dkurt:dnn_tf_atrous_faster_rcnn

5 years agoMerge pull request #13650 from terfendail:shapedescr_wintr
Alexander Alekhin [Fri, 18 Jan 2019 16:18:47 +0000 (16:18 +0000)]
Merge pull request #13650 from terfendail:shapedescr_wintr

5 years agoMerge pull request #13649 from savuor:yuv_wide
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

5 years agoMerge pull request #13539 from dkurt:ie_graph_api
Alexander Alekhin [Fri, 18 Jan 2019 16:00:18 +0000 (16:00 +0000)]
Merge pull request #13539 from dkurt:ie_graph_api

5 years agoCreate text graphs for Faster-RCNN from TensorFlow with dilated convolutions
Dmitry Kurtaev [Fri, 18 Jan 2019 15:46:52 +0000 (18:46 +0300)]
Create text graphs for Faster-RCNN from TensorFlow with dilated convolutions

5 years agoboundingRect() reworked to use wide universal intrinsics
Vitaly Tuzov [Thu, 17 Jan 2019 21:11:52 +0000 (00:11 +0300)]
boundingRect() reworked to use wide universal intrinsics

5 years agoRevert "Merge pull request #13586 from eightco:Core_bugfix3"
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

5 years agoPerformance test for bounding rect estimation
Vitaly Tuzov [Fri, 18 Jan 2019 11:59:03 +0000 (14:59 +0300)]
Performance test for bounding rect estimation

5 years agoMerge pull request #13586 from eightco:Core_bugfix3
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

5 years agoMerge pull request #13645 from mshabunin:doc-includes
Alexander Alekhin [Thu, 17 Jan 2019 12:35:20 +0000 (12:35 +0000)]
Merge pull request #13645 from mshabunin:doc-includes

5 years agoMerge pull request #13644 from berak:dnn_samples_googlenet
Alexander Alekhin [Thu, 17 Jan 2019 12:34:52 +0000 (12:34 +0000)]
Merge pull request #13644 from berak:dnn_samples_googlenet

5 years agoMove Inference Engine to new API
Dmitry Kurtaev [Mon, 14 Jan 2019 06:55:44 +0000 (09:55 +0300)]
Move Inference Engine to new API

5 years agodnn/samples: add googlenet to model zoo
berak [Thu, 17 Jan 2019 10:41:25 +0000 (11:41 +0100)]
dnn/samples: add googlenet to model zoo

5 years agoEnabled #include documentation in all members
Maksim Shabunin [Thu, 17 Jan 2019 10:57:40 +0000 (13:57 +0300)]
Enabled #include documentation in all members

5 years agoMerge pull request #13625 from nglee:dev_CudaFarnebackInitFlowFix
Alexander Alekhin [Wed, 16 Jan 2019 18:18:57 +0000 (18:18 +0000)]
Merge pull request #13625 from nglee:dev_CudaFarnebackInitFlowFix

5 years agoMerge pull request #13631 from terfendail:thresh_wintr
Alexander Alekhin [Wed, 16 Jan 2019 15:45:26 +0000 (15:45 +0000)]
Merge pull request #13631 from terfendail:thresh_wintr

5 years agoMerge pull request #13593 from brad-kelly:integral_avx512_ver34
Alexander Alekhin [Tue, 15 Jan 2019 17:47:21 +0000 (17:47 +0000)]
Merge pull request #13593 from brad-kelly:integral_avx512_ver34

5 years agoMerge pull request #13622 from sturkmen72:code_clean_up
Alexander Alekhin [Tue, 15 Jan 2019 17:46:26 +0000 (17:46 +0000)]
Merge pull request #13622 from sturkmen72:code_clean_up

5 years agothreshold() reworked to use wide universal intrinsics
Vitaly Tuzov [Tue, 15 Jan 2019 16:15:19 +0000 (19:15 +0300)]
threshold() reworked to use wide universal intrinsics

5 years agoMerge pull request #13610 from terfendail:morph_wintr
Alexander Alekhin [Tue, 15 Jan 2019 11:22:00 +0000 (11:22 +0000)]
Merge pull request #13610 from terfendail:morph_wintr

5 years agoImplementing AVX512 support for 3 channel cv::integral for CV_64F
Brad Kelly [Wed, 14 Nov 2018 04:03:11 +0000 (20:03 -0800)]
Implementing AVX512 support for 3 channel cv::integral for CV_64F

5 years agocode clean up
Suleyman TURKMEN [Fri, 11 Jan 2019 17:31:55 +0000 (20:31 +0300)]
code clean up

5 years agoMorphology reworked to use wide universal intrinsics
Vitaly Tuzov [Thu, 10 Jan 2019 16:08:55 +0000 (19:08 +0300)]
Morphology reworked to use wide universal intrinsics

5 years agoMerge pull request #13619 from alalek:issue_13595
Alexander Alekhin [Mon, 14 Jan 2019 14:54:11 +0000 (14:54 +0000)]
Merge pull request #13619 from alalek:issue_13595

5 years agoFix Farneback Optical Flow Algorithm
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.

5 years agoMerge pull request #13617 from terfendail:always_inline
Alexander Alekhin [Sun, 13 Jan 2019 09:35:24 +0000 (09:35 +0000)]
Merge pull request #13617 from terfendail:always_inline

5 years agoMerge pull request #13616 from atinfinity:fixed-py_matcher-tutorial
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

5 years agoMerge pull request #13614 from dkurt:dnn_tf_ssd_fpn
Alexander Alekhin [Sun, 13 Jan 2019 09:33:05 +0000 (09:33 +0000)]
Merge pull request #13614 from dkurt:dnn_tf_ssd_fpn

5 years agocmake: don't use LIB_SUFFIX with CMAKE_INSTALL_LIBDIR
Alexander Alekhin [Sat, 12 Jan 2019 11:14:18 +0000 (11:14 +0000)]
cmake: don't use LIB_SUFFIX with CMAKE_INSTALL_LIBDIR

5 years agoAdded CV_ALWAYS_INLINE macro
Vitaly Tuzov [Fri, 11 Jan 2019 19:40:35 +0000 (22:40 +0300)]
Added CV_ALWAYS_INLINE macro

5 years agoMerge pull request #13601 from JimZhou-001:JimZhou-001
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

5 years agoSSD with FPN proposals from TensorFlow
Dmitry Kurtaev [Fri, 11 Jan 2019 07:50:52 +0000 (10:50 +0300)]
SSD with FPN proposals from TensorFlow

5 years agoMerge pull request #13606 from rrrapha:malloc-h
Alexander Alekhin [Thu, 10 Jan 2019 15:15:09 +0000 (15:15 +0000)]
Merge pull request #13606 from rrrapha:malloc-h

5 years agodnn: remove malloc.h include
Raphael Graf [Thu, 10 Jan 2019 10:54:45 +0000 (11:54 +0100)]
dnn: remove malloc.h include

5 years agoMerge pull request #13560 from cuihaoleo:master
Alexander Alekhin [Wed, 9 Jan 2019 15:45:09 +0000 (15:45 +0000)]
Merge pull request #13560 from cuihaoleo:master

5 years agoMerge pull request #13592 from tdp2110:master
Alexander Alekhin [Wed, 9 Jan 2019 14:42:57 +0000 (14:42 +0000)]
Merge pull request #13592 from tdp2110:master

5 years agoMerge pull request #13600 from dkurt:fix_13576
Alexander Alekhin [Wed, 9 Jan 2019 14:02:59 +0000 (14:02 +0000)]
Merge pull request #13600 from dkurt:fix_13576

5 years agoMerge pull request #13599 from dkurt:dnn_conv_error_msg
Alexander Alekhin [Wed, 9 Jan 2019 14:02:14 +0000 (14:02 +0000)]
Merge pull request #13599 from dkurt:dnn_conv_error_msg

5 years agoMerge pull request #13553 from luctowers:master
Alexander Alekhin [Wed, 9 Jan 2019 13:33:45 +0000 (13:33 +0000)]
Merge pull request #13553 from luctowers:master

5 years agoFix typo in core+RotatedRect.java
CUI Hao (Lab) [Wed, 2 Jan 2019 08:45:51 +0000 (16:45 +0800)]
Fix typo in core+RotatedRect.java

5 years agoMerge pull request #13587 from catree:add_matplotlib_colormaps
Alexander Alekhin [Wed, 9 Jan 2019 13:30:21 +0000 (13:30 +0000)]
Merge pull request #13587 from catree:add_matplotlib_colormaps

5 years agoMerge pull request #13591 from scramsby:fix-unicode-errors
Alexander Alekhin [Wed, 9 Jan 2019 13:25:14 +0000 (13:25 +0000)]
Merge pull request #13591 from scramsby:fix-unicode-errors

5 years agoMerge pull request #13596 from nglee:dev_RemoveCudaIncludeWarningMsg
Alexander Alekhin [Wed, 9 Jan 2019 13:23:54 +0000 (13:23 +0000)]
Merge pull request #13596 from nglee:dev_RemoveCudaIncludeWarningMsg

5 years agoFix edge_detection.py sample for Python 3
Dmitry Kurtaev [Wed, 9 Jan 2019 11:54:20 +0000 (14:54 +0300)]
Fix edge_detection.py sample for Python 3

5 years agoFix improper defining of CV_XADD when using Intel C++
Lucas Towers [Mon, 31 Dec 2018 13:57:38 +0000 (05:57 -0800)]
Fix improper defining of CV_XADD when using Intel C++

5 years agoAdd a text message for Convolution layer's input channels check
Dmitry Kurtaev [Wed, 9 Jan 2019 10:10:19 +0000 (13:10 +0300)]
Add a text message for Convolution layer's input channels check

5 years agofix implicit fallthrough warning.
Thomas Peters [Mon, 7 Jan 2019 21:15:48 +0000 (16:15 -0500)]
fix implicit fallthrough warning.

5 years agoRemove build warning msg with CUDA10.0
Namgoo Lee [Tue, 8 Jan 2019 01:57:12 +0000 (10:57 +0900)]
Remove build warning msg with CUDA10.0

5 years agoFix build error when building with Unicode on Windows
Scott Ramsby [Mon, 7 Jan 2019 18:18:58 +0000 (10:18 -0800)]
Fix build error when building with Unicode on Windows

5 years agoAdd Matplotlib Perceptually Uniform Sequential colormaps (viridis, plasma, inferno...
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).

5 years agoMerge pull request #13544 from eightco:bugfix
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

5 years agocopyright: 2019
Alexander Alekhin [Wed, 2 Jan 2019 01:18:04 +0000 (01:18 +0000)]
copyright: 2019

5 years agoMerge pull request #13453 from crackwitz:w32-opengl-mouse-position
Alexander Alekhin [Wed, 26 Dec 2018 12:38:59 +0000 (12:38 +0000)]
Merge pull request #13453 from crackwitz:w32-opengl-mouse-position

5 years agoMerge pull request #13451 from crackwitz:gdi-off-by-one
Alexander Alekhin [Wed, 26 Dec 2018 12:10:09 +0000 (12:10 +0000)]
Merge pull request #13451 from crackwitz:gdi-off-by-one

5 years agofix for #4990: highgui w32 ogl: correct calculation of image coordinates from window...
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

5 years agoMerge pull request #13511 from knsong:3.4
Alexander Alekhin [Wed, 26 Dec 2018 07:23:49 +0000 (07:23 +0000)]
Merge pull request #13511 from knsong:3.4

5 years agoMerge pull request #13492 from terfendail:matx_addition
Alexander Alekhin [Wed, 26 Dec 2018 07:23:30 +0000 (07:23 +0000)]
Merge pull request #13492 from terfendail:matx_addition

5 years agoOff-by-ones in windows/GDI window calculations
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?

5 years agoAdded test for addition of Mat and Matx
Vitaly Tuzov [Fri, 21 Dec 2018 15:24:50 +0000 (18:24 +0300)]
Added test for addition of Mat and Matx