Artem Lukoyanov
84a0a91d16
Merge branch 'master' of https://github.com/opencv/opencv into interpMultichannelImg
...
Added assertios to remap and warpAffine functions
As @mshabunin said, remap and warpAffine functions do not support more than 4 channels in
Bicubic and Lanczos4 interpolation modes. Assertions were added. Appropriate test was chenged.
resolves #8272
2017-03-24 23:58:51 +03:00
Alexander Alekhin
49e16a3c9f
Merge pull request #8448 from jexner:foreach-segfault-fix
2017-03-24 18:25:30 +00:00
Alexander Alekhin
e7cad594c1
Merge pull request #8454 from superbort:reuse-stitching
2017-03-24 14:38:54 +00:00
Julian Exner
46af07575e
Add test case for cv::Mat::forEach
...
This test case uses a matrix with more dimensions than columns. Without
the fix in
b45e784beb
this crashes with a segmentation fault, hangs or simply fails with wrong
values.
2017-03-24 15:34:58 +01:00
Alexander Broemmer
30d26acee0
Make stitching panoramas reusable after estimating transform once
...
Stitcher will now make a working copy of the CameraParams object to avoid side effects when composing Panorama.
Makes it possible to estimate transform once and then compose multiple panoramas. Useful for setup with fixed cameras.
2017-03-24 14:20:43 +01:00
Artem Lukoyanov
c4ae5c0ee5
Added assertios to remap and warpAffine functions
...
Remap and warpAffine functions do not support more than 4 channels in
Bicubic and Lanczos4 interpolation modes. Assertions were added.
resolve #8272
2017-03-24 11:19:58 +03:00
Alexander Alekhin
d0c64fca2b
Merge pull request #8433 from csukuangfj:issue-8189
2017-03-23 20:20:07 +00:00
jexner
b45e784beb
Fix segmentation fault in cv::Mat::forEach
...
This issue concerns only matrices with more dimensions than columns.
See https://github.com/opencv/opencv/issues/8447
2017-03-23 18:48:59 +01:00
Julian Tanke
f70cc29edb
export SVM::trainAuto to python #7224 ( #8373 )
...
* export SVM::trainAuto to python #7224
* workaround for ABI compatibility of SVM::trainAuto
* add parameter comments to new SVM::trainAuto function
* Export ParamGrid member variables
2017-03-23 16:00:19 +03:00
Chaoshuai Lu
de7018539d
Fix UIImageToMat method by taking image scale information into account
2017-03-22 22:33:13 -07:00
Chaoshuai Lu
874fb7ae78
Fix MatToUIImage method crash when the step is not equal to cols * elemSize()
2017-03-22 22:04:27 -07:00
KUANG, Fangjun
03c4c37969
fix issue 8189.
2017-03-22 22:24:20 +01:00
Vadim Pisarevsky
0b3d13645f
Merge pull request #8364 from csukuangfj:patch-2
2017-03-22 14:13:13 +00:00
Vadim Pisarevsky
8abd163464
Merge pull request #8404 from khnaba:stream-with-custom-allocator
2017-03-21 20:06:56 +00:00
Vadim Pisarevsky
e5dbd2c3a5
Merge pull request #8406 from khnaba:dft-as-algorithm
2017-03-21 20:05:54 +00:00
Vadim Pisarevsky
a57d144076
Merge pull request #7462 from alalek:cpu_multi_target
2017-03-21 19:51:32 +00:00
Naba Kumar
29680100ac
Support for creating streams with custom allocator
2017-03-21 14:50:14 +02:00
Alexander Alekhin
8bce760174
Merge pull request #8424 from khnaba:expose-buffer-pool
2017-03-21 12:43:15 +00:00
Alexander Alekhin
b3d128bb39
Merge pull request #8401 from avartenkov:multichannel_warp
2017-03-21 11:59:56 +00:00
Alexander Alekhin
741e51396b
Merge pull request #8416 from berak:patch-2
2017-03-21 11:57:57 +00:00
Naba Kumar
00f3ad7217
Implement DFT as cv::Algorithm to support concurrent streams
2017-03-21 13:55:13 +02:00
Naba Kumar
cdcf44b3ef
Expose BufferPool class for external use also
2017-03-21 13:50:02 +02:00
Alexander Alekhin
1389cc9600
Merge pull request #8393 from alalek:ocl_driver_version
2017-03-21 10:44:52 +00:00
Alexander Alekhin
e77a5d5f13
Merge pull request #8422 from berak:fix_shapematchmodes
2017-03-21 09:06:30 +00:00
vartenkov
3fbe1f8d64
Fix multichannel warping with BORDER_CONSTANT
...
Warping a matrix with more than 4 channels using BORDER_CONSTANT and
INTER_NEAREST, INTER_CUBIC or INTER_LANCZOS4 interpolation led to
undefined behaviour. This commit changes the behavior of these methods
to be similar to that of INTER_LINEAR. Changed the scope of some of the
variables to more local. Modified some tests to be able to detect the
error described.
2017-03-20 15:21:49 +03:00
berak
11f3c0741e
imgproc: move ShapeMatchModes enum from c to c++ header
2017-03-20 09:59:19 +01:00
berak
0b31eca9c2
remove unnessecary print statement
...
#resolves: 7881
remove printf statement and associated variables from invMapPointSpherical() in undistort.cpp
2017-03-19 10:12:50 +01:00
Alexander Alekhin
dcdd5d64b6
ocl: dump OpenCL driver version in tests
2017-03-15 18:23:30 +03:00
Maksim Shabunin
9333f82be0
Reduce dependencies between modules
2017-03-15 17:58:52 +03:00
Fangjun KUANG
246d3761ce
Merge pull request #8383 from csukuangfj/patch-10
...
* Improve documentation.
* Update imgproc.hpp
2017-03-15 11:12:59 +00:00
Naba Kumar
27cf6e549e
Merge pull request #8367 from khnaba:cuda-calchist-with-mask
...
Implement cv::cuda::calcHist with mask support (#8367 )
* Implement cuda::calcHist with mask
* Fix documentation build warning
* Have their own step sizes for src and mask. Fix review comment.
2017-03-15 09:34:00 +00:00
Maksim Shabunin
a83a1cafa7
Merge pull request #8388 from ottogin:calib3d
2017-03-15 04:33:33 +00:00
Artem Lukoyanov
3bf5d34544
Callib3d 4channel image detection
...
3.2 version doesn't support 4 channel color image
detections, unlike 3.1. Now, we don't call
CV_Error() if 4 channel image is given.
resolve #8326
2017-03-15 02:54:15 +03:00
Alexander Alekhin
73e9c44377
Merge pull request #8370 from csukuangfj:patch-7
2017-03-14 13:32:35 +00:00
Alexander Alekhin
661f3e2160
Merge pull request #8371 from csukuangfj:patch-8
2017-03-14 13:23:02 +00:00
Alexander Alekhin
6fcb07d41e
Merge pull request #8375 from Sahloul:fixes/matx/init
2017-03-14 13:22:26 +00:00
Alexander Alekhin
54f7ebdec9
Merge pull request #8380 from csukuangfj:patch-9
2017-03-14 13:20:52 +00:00
Hamdi Sahloul
171e705ba4
Fixes the constructor of 1x14, 2x7, 7x2 or 14x1 matrix
2017-03-14 18:26:22 +09:00
Fangjun KUANG
3ad6d13ff3
Fix an error in the documentation.
2017-03-14 09:57:37 +01:00
hailong-wang
207218e920
Fix the bug of Mat_<>::opeartor []
...
`template<typename _Tp> inline const _Tp* Mat_<_Tp>::operator [](int y) const` does not support 3d matrix since it checks rows.
This operator[] shall check size.p[0] instead.
2017-03-14 13:02:59 +08:00
Fangjun KUANG
31cc519cd3
fix typos.
2017-03-13 13:51:22 +01:00
Fangjun KUANG
3c15913f53
Impove the documentation for Mat::diag
2017-03-13 12:46:50 +01:00
Alexander Alekhin
502aa1f053
Merge pull request #8368 from csukuangfj:patch-5
2017-03-13 10:15:30 +00:00
Alexander Alekhin
fdda19cb0c
Merge pull request #8356 from csukuangfj:patch-1
2017-03-13 09:59:16 +00:00
Fangjun KUANG
95468b72f3
Fix typos in the documentation for cv::Mat.
2017-03-13 10:20:41 +01:00
KUANG, Fangjun
debc1c4c95
fix an error while setting kernel argument for a 3-D matrix.
2017-03-12 18:29:49 +01:00
KUANG, Fangjun
be7d4608fb
Add more comments to the members of CoreTLSData related to OpenCL.
2017-03-12 16:13:00 +01:00
Alexander Alekhin
08c6ffaa8d
Merge pull request #8346 from Sahloul:fixes/python_wrapper/flann
2017-03-10 20:01:54 +00:00
Fangjun KUANG
2a30d8c9f9
Update documentation for cv::accumulate.
...
Make it more clear for the type of input argument.
2017-03-10 17:53:12 +01:00
Hamdi Sahloul
db52841544
Accept default argument of FLANN index parameters
2017-03-10 22:09:31 +09:00