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
Alexander Alekhin
ba104b61bf
Merge branch 'pr8392'
2017-03-22 13:45:24 +03: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
Woody Chow
a8763c1fec
Optimize exp32f with AVX2
2017-03-15 17:03:36 +09:00
Maksim Shabunin
a83a1cafa7
Merge pull request #8388 from ottogin:calib3d
2017-03-15 04:33:33 +00:00
Matthias Grundmann
7295dd7dec
Update bgfg_gaussmix2.cpp
...
1e-12 -> DBL_EPSILON
2017-03-14 16:57:50 -07: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
Alexander Alekhin
e4377e7c51
Merge pull request #8335 from kuanyili:typo-patch
2017-03-09 10:43:00 +00:00
Matthias Grundmann
0a1767a6b5
Update bgfg_gaussmix2.cpp to avoid divide by zero cases.
2017-03-08 19:27:43 -08:00
Alexander Alekhin
8ef23d64a1
Merge pull request #8308 from sovrasov:fs_dmatch_kpts_update
2017-03-07 19:28:34 +00:00
Kuan-Yi Li
e685dcef0b
Fix typos
2017-03-07 23:42:24 +08:00
Vadim Pisarevsky
24efb02d93
Merge pull request #8332 from sovrasov:qt_no_dbg_output_in_release
2017-03-07 14:39:44 +00:00
Vadim Pisarevsky
e832870288
Merge pull request #8333 from sovrasov:ml_svm_params_scope_fix
2017-03-07 14:38:10 +00:00
Vladislav Sovrasov
195c12f2db
ml: remove useless namespace identifiers in SVM
2017-03-07 16:02:19 +03:00
Vladislav Sovrasov
cd7f0a5177
QT: disable debug output in Release mode
2017-03-07 15:41:07 +03:00
Alexander Alekhin
6b1d9971f4
Merge pull request #8313 from alalek:ocl_fix_cvtcolor
2017-03-07 11:29:01 +00:00
Alexander Alekhin
f9f013e264
Merge pull request #8323 from csukuangfj:csukuangfj-patch-8
2017-03-07 11:24:19 +00:00
Alexander Alekhin
6fe1898ab6
Merge pull request #8294 from alalek:fix_stitching_failure
2017-03-06 14:55:23 +00:00
Alexander Alekhin
990e87effb
Merge pull request #8111 from utibenkei:saliency-module-java
2017-03-06 14:39:23 +00:00
Fangjun KUANG
8a679128fa
Update comments for cv::InputArray.
2017-03-06 14:45:30 +01:00
Alexander Alekhin
3e2b05b096
Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1
2017-03-06 10:22:29 +00:00
Alexander Alekhin
aa5204958e
Merge pull request #8279 from sovrasov:calib3d_new_recover_pose
2017-03-06 10:20:43 +00:00
Alexander Alekhin
92c4b6ae4c
Merge pull request #8298 from delftrobotics-forks:circles-grid-parameters
2017-03-05 10:17:51 +00:00
Alexander Alekhin
ba8a6e3533
ocl: don't use vload4 for 3 channel images
2017-03-03 19:36:38 +03:00
Philipp Hasper
ec38ef9b10
CameraBridgeViewBase synchronizes on a final field
...
Synchronizing against non-final fields is advised against.
2017-03-03 16:07:10 +01:00
Jose Gómez
6f39f9a6a0
Merge pull request #8168 from jmgomezpoveda:issue_8166
...
* Use the YV12 format in the Android emulator to avoid image issues
* Removed trailing spaces
* Added exception in else case
* Removed tab
2017-03-03 13:44:11 +00:00
Vladislav Sovrasov
931b32d102
core: add single DMatch/Keypoint I/O
2017-03-03 13:58:55 +03:00
Alexander Alekhin
89ce2dc405
core: DMatch I/O tests
2017-03-03 13:55:27 +03:00
Alexander Alekhin
5d31d6ebbb
Merge pull request #8306 from chacha21:portability
2017-03-03 04:46:05 +00:00
chacha21
74abbd0898
Fix compilation when USE_ZLIB is false
...
create a dummy gzFile type
2017-03-02 16:58:51 +01:00
chacha21
aa1b031274
get rid of warning C4800 under VS2010
...
the "std::basic_ios::operator bool" differs between C++98 and C++11. The
"double not" syntax is portable and covers both cases with equivalent
meaning
2017-03-02 16:56:20 +01:00
Vadim Pisarevsky
b46364e436
Merge pull request #7996 from mshabunin:hal-filter-revert
2017-03-02 11:12:08 +00:00
Vadim Pisarevsky
e0ee2f769a
Merge pull request #8116 from mrquorr:master
2017-03-02 11:07:23 +00:00
Alexander Alekhin
e65c6270bf
stitching(perf): workaround test failures
...
force other RNG seed
2017-03-02 13:45:12 +03:00
Alexander Alekhin
147f3ebf0a
flann: use OpenCV theRNG()
...
std::rand() has no thread-safe guarantee.
2017-03-02 13:45:12 +03:00
Alexander Alekhin
53e685461e
stitching: force "stable" RNG
2017-03-02 13:45:12 +03:00
Hans Gaiser
11b24eb49f
Expose CirclesGridFinderParameters in findCirclesGrid.
2017-03-02 10:53:45 +01:00
Vadim Pisarevsky
f46fa6e096
Merge pull request #8283 from ramele1907:master
2017-03-02 05:54:06 +00:00
Vadim Pisarevsky
408ef5c65b
Merge pull request #8288 from Jejos:bugfix_medianBlur_accessviolation
2017-03-02 05:53:09 +00:00
Vadim Pisarevsky
c7049ca627
Merge pull request #8293 from alalek:update_rng_in_parallel_for
2017-03-02 05:51:01 +00:00
Vadim Pisarevsky
5f990566c4
Merge pull request #8297 from csukuangfj:csukuangfj-patch
2017-03-02 05:47:33 +00:00
Vadim Pisarevsky
ddfe688be6
Merge pull request #8299 from sovrasov:fs_fix_kpts_dmatch_output
2017-03-02 05:46:38 +00:00
Alexander Alekhin
da0b1d8821
Merge pull request #8238 from PkLab:fix_doc_ellipse
2017-03-01 14:31:06 +00:00
Alexander Alekhin
69f1d1ddff
Merge pull request #8296 from ville-v:master
2017-03-01 14:12:00 +00:00
Alexander Alekhin
47c4dcc8a3
Merge pull request #8204 from terfendail:ovx_tlcontext
2017-03-01 12:36:37 +00:00
Vladislav Sovrasov
c321d025c4
Fix DMatch and Keypoint I/O in FileStorage
2017-03-01 15:07:38 +03:00
Fangjun KUANG
34c70e7a1c
Fix typos.
2017-03-01 11:13:46 +01:00
ville-v
0c1bcf354c
Fix issue #8278 : "CV_XADD compile errors with Embarcadero C++ Builder 10.1"
2017-03-01 08:47:49 +02:00
ville-v
1de10f9f86
Add files via upload
...
Fix issue #8280 : "fastmath.h related compile errors with Embarcadero C++ Builder 10.1"
2017-03-01 08:42:14 +02:00
mrquorr
d8425d8881
finished for one sample
...
Finished with several samples support, need regression testing
Gave a more relevant name to function (getVotes)
Finished implicit implementation
Removed printf, finished regresion testing
Fixed conversion warning
Finished test for Rtrees
Fixed documentation
Initialized variable
Added doxygen documentation
Added parameter name
2017-02-28 11:14:33 -06:00
Alexander Alekhin
649bb7ac04
core: parallel_for_(): update RNG state of the main thread
2017-02-28 18:28:15 +03:00
Alexander Alekhin
ebdd74105a
core(test): add regression test for RNG in parallel_for_()
2017-02-28 18:22:58 +03:00
Alexander Alekhin
b28fd79fdc
core: parallel_for_(): propagate RNG state from the main thread
2017-02-28 18:22:46 +03:00
Jejos
5169c79978
fix medianBlur accessviolation
...
medianBlur called with "empty" source and ksize >= 7 crashes application with accessviolation. With this extra assert this is avoided and the application may normally catch the thrown exception.
2017-02-28 08:31:28 +01:00
Maksim Shabunin
220d1f0b3e
Merge pull request #8231 from paroj:pytype
2017-02-27 11:17:02 +00:00
Vladislav Sovrasov
710506e9e2
calib3d: add a new overload for recoverPose
2017-02-27 13:26:04 +03:00
Maksim Shabunin
c4c1c4c9bb
Replaced several hal:: classes with functions, marked old variants deprecated
2017-02-27 12:13:31 +03:00
abratchik
276e47afae
fix #7833
2017-02-26 15:14:34 +04:00
Alexander Alekhin
dcbed8d676
Merge pull request #8250 from tomoaki0705:fixNonAsciiChar
2017-02-24 11:19:00 +00:00
Alexander Alekhin
eee638fd81
Merge pull request #8244 from sovrasov:adjust_roi_fix
2017-02-24 11:18:35 +00:00
Alexander Alekhin
c624d82383
Merge pull request #8239 from tomoaki0705:buildUniversalIntrinsicBlend
2017-02-24 11:17:51 +00:00
Alexander Alekhin
0c00242f7a
Merge pull request #8235 from berak:fix_dshow_leak
2017-02-24 11:11:20 +00:00
Vadim Pisarevsky
12d7429ff0
Merge pull request #8064 from terfendail:sgbm_bigbuffer
2017-02-23 20:11:26 +00:00
Tomoaki Teshima
822c67fdee
remove non ASCII character from comment
2017-02-24 01:31:32 +09:00
PkLab.net
e03c81d90a
Change image e small fix to cv::ellipse() Doc
2017-02-23 09:10:48 +01:00
Tomoaki Teshima
aec59aba34
suppress warnings
...
- brush up the implementation
2017-02-23 09:11:12 +09:00
Alexander Alekhin
ee9c0f5f9c
Merge pull request #8234 from alalek:issue_8121
2017-02-22 16:21:01 +00:00
Maksim Shabunin
a9e33fe54e
Merge pull request #8243 from sovrasov:hal_round_to_cvround
2017-02-22 15:52:10 +00:00
Vladislav Sovrasov
595437bdd1
hal: replace round() with cvRound()
2017-02-22 14:08:38 +03:00
Vladislav Sovrasov
14451f3f06
core: fix adjustROI behavior on indexes overflow
2017-02-22 14:05:51 +03:00
Wenju He
9fbce6c8c8
fix multiband_blend.cu build error in issue opencv_contrib#1012
2017-02-22 08:44:10 +08:00
ionut
a41d877fe6
Change the value of bit/pixel from channels to 8*channels because videos encoded
...
by cap_mjpeg_encoder.cpp don't play on windows media player.
Issue number #8113
2017-02-21 19:15:40 +02:00
berak
d7240d1a28
fix leaking handle in cap_dshow.cpp
2017-02-21 14:27:12 +01:00
Vitaly Tuzov
9a4b5a4545
OpenVX calls updated to use single common OpenVX context per thread
2017-02-21 16:08:23 +03:00
Alexander Alekhin
ec7f74f7b4
core(TLS): add cleanup() method
2017-02-21 16:08:23 +03:00
Alexander Alekhin
eaba0e6358
cmake: append '-framework UIKit' for videoio/imgcodecs module
2017-02-21 13:37:37 +03:00
Pavel Rojtberg
789dc0a3b7
python: type of initial_button_state must match format string
2017-02-21 11:11:22 +01:00
Fangjun KUANG
526220a171
Fix typos in the documentation ( #8226 )
...
* fix typos.
* Fix typos.
* Fix typos.
* Fix typos.
* Fix typos.
2017-02-21 12:48:15 +03:00
Vadim Pisarevsky
5bfaf9931b
Merge pull request #8228 from csukuangfj:csukuangfj-patch
2017-02-21 09:46:09 +00:00
Hamdi Sahloul
232d6b87f4
cv::Matx python wrapper
2017-02-21 11:29:28 +09:00
Fangjun KUANG
b1851e2f16
Add support to print cv::UMat
.
...
Now a user can use `std::cout` to print an object of `cv::UMat` just like `cv::Mat`.
2017-02-20 16:22:46 +01:00
Tomoaki Teshima
64cf206fb5
optimize blend using universal intrinsic
...
- add more channels/depth performance test for blend
2017-02-20 19:09:26 +09:00
Alexander Alekhin
b2da9df82d
Merge pull request #8221 from csukuangfj:csukuangfj-path-2
2017-02-19 10:16:00 +00:00
Fangjun KUANG
e827a5bd9e
Fix an error in the demo code for cv::Mat::forEach
2017-02-18 10:14:29 +01:00
Vadim Pisarevsky
9053839282
Merge pull request #8178 from tomoaki0705:addBayer2RGBA
2017-02-16 15:01:49 +00:00
Vadim Pisarevsky
3240f2a6b7
Merge pull request #8187 from hewj03:improve-MultiBandBlender-cuda
2017-02-16 15:00:58 +00:00
Fangjun KUANG
57ed0e57f0
Fix the documentation for Mat::diag(int). ( #8199 )
...
* Fix the documentation for Mat::diag(int).
Fix issue #8181
* Fix the documentation for Mat::diag(int).
Fix issue #8181 .
* Add support for printing out cv::Complex.
* Remove extra spaces.
* cv::Complex is submitted as a new pull request.
2017-02-16 18:00:32 +03:00
Vadim Pisarevsky
ca0b6fbb95
Merge pull request #8203 from alalek:ocl_kernelarg_validate
2017-02-16 14:58:25 +00:00
Jinay Patel
f710d96602
Update ocl.cpp function Device::OpenCLVersion()
...
Instead of CL_DEVICE_EXTENSIONS in Querying OpenCLVersion, it should be CL_DEVICE_VERSION flag which needs to be passed to the function.
2017-02-16 15:20:57 +05:30
Alexander Alekhin
bc8a91ed83
Merge pull request #8211 from csukuangfj:csukuangfj-patch-3
2017-02-16 08:57:44 +00:00
Alexander Alekhin
bb8be523c5
Merge pull request #8210 from alalek:fix_mkl_link
2017-02-16 08:56:02 +00:00
Fangjun KUANG
a8a208e0fe
Merge pull request #8208 from csukuangfj:complex_support
...
Add support for printing out cv::Complex. (#8208 )
* Add support for printing out cv::Complex.
* Conform to the format of std::complex.
* Remove extra spaces.
* Remove extra spaces.
2017-02-15 21:50:14 +03:00
Alexander Alekhin
3fbaabc866
Merge pull request #8209 from csukuangfj:csukuangfj-patch-2
2017-02-15 18:48:01 +00:00
Fangjun KUANG
5e4dfb9546
Change the argument type to cl_platform_info.
...
Although both `cl_platform_info` and `cl_device_info` are defined as macro `cl_uint`, it needs to use `cl_platform_info` to get
the platform information.
2017-02-15 16:44:40 +01:00
Alexander Alekhin
05248a3dea
cmake: fix order of MKL libraries, don't pass additional libraries as modules
2017-02-15 17:13:13 +03:00
Fangjun KUANG
46fe74177d
Fix typos.
2017-02-15 14:52:00 +01:00
Pavel Rojtberg
df86f0752a
add missing casts to _Tp as determinant() always returns double
2017-02-15 12:21:17 +01:00
Alexander Alekhin
4c7aa8645a
ocl: validate arguments in KernelArgs constructor
...
- don't use undefined flag=0. It should be CONSTANT instead.
- don't allow 'UMat* m=NULL' argument (except LOCAL/CONSTANT flags).
This case is not handled well to provide NULL __global pointers.
It is better to use '-D' macro defines instead (at least for performance)
2017-02-14 16:10:32 +03:00
Alexander Alekhin
1304ad1e12
Merge pull request #8160 from ilijapuaca:master
2017-02-14 13:03:09 +00:00
Alexander Alekhin
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
Alexander Alekhin
b7945827f9
Merge pull request #8175 from alalek:cmake_cleanup_defines
2017-02-13 10:59:09 +00:00
Fangjun KUANG
1e11657ba4
Merge pull request #8197 from csukuangfj/csukuangfj-patch-1
...
Fix typos in the documentation for AutoBuffer. (#8197 )
* Allocate 1000 floats to match the documentation
Fix the documentation of `AutoBuffer`. By default, the following code
```.cpp
cv::AutoBuffer<float> m;
````
allocates only 264 floats. But the comment in the demonstration code says it allocates 1000 floats, which is
not correct.
* fix typo in the comment.
2017-02-13 13:58:44 +03:00
Wenju He
2722133206
add accuracy test CUDA_MultiBandBlender
2017-02-12 17:16:49 +08:00
Wenju He
b76e88354c
improve MultiBandBlender cuda, add normalizeUsingWeight and addSrcWeight kernels
2017-02-12 17:08:05 +08:00
Alexander Alekhin
642e4d97a4
Merge pull request #8165 from AdeelH:master
2017-02-11 11:02:10 +00:00
Tomoaki Teshima
37be9ddeec
add enum Bayer**2BGRA
...
- let it possible to reach Bayer2BGRA conversion
2017-02-11 00:20:57 +09:00
Alexander Alekhin
8633ef451e
cmake: cleanup unused defines
2017-02-10 15:18:29 +03:00
Ilija Puaca
1b842c4762
Updated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp
2017-02-09 23:35:27 +01:00
Adeel
03fb85f179
update fix for #8105 (compiling with mingw32)
...
taken from https://github.com/google/googletest/pull/856
2017-02-09 20:11:00 +05:00
Alexander Alekhin
9ac9e9e29a
core: fix String::end() implementation
2017-02-09 16:36:22 +03:00
Vadim Pisarevsky
fb3298f076
Merge pull request #7904 from paroj:initmapfc2
2017-02-08 13:30:15 +00:00
Alexander Alekhin
476d2e1eea
Merge pull request #8140 from StevenPuttemans:fix_gdal_driver_4channel_16bit
2017-02-08 11:29:34 +00:00
Vitaly Tuzov
4950f542d1
Fix for SGBM compute() buffer allocation failure on big images
2017-02-08 12:49:21 +03:00