Dikay900
bb78b01ace
fix mat copy in shape
...
fixes #5643
2015-12-23 10:48:36 +01:00
Alexander Alekhin
afdbd855ee
Merge pull request #5843 from jia-kai:disable-dlopen-opencl
2015-12-21 15:47:15 +00:00
Alexander Alekhin
4cfe2b4dea
Merge tag '3.1.0'
...
OpenCV 3.1.0
2015-12-21 14:24:46 +03:00
jiakai
22599a2812
define g_haveOpenCL only when HAVE_OPENCL is set
2015-12-21 16:42:38 +08:00
jiakai
387214a3c5
do not open libopencl by dlopen if HAVE_OPENCL is not set
2015-12-21 12:04:00 +08:00
Maksim Shabunin
92387b1ef8
Fix java version++
2015-12-18 18:02:16 +03:00
Maksim Shabunin
8d1f5b5490
Version++ for android
2015-12-18 17:57:07 +03:00
Alexander Alekhin
94e4498cfd
Version for 3.1.0 release
2015-12-18 16:08:05 +03:00
Alexander Alekhin
3ee90a1ff4
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
2015-12-18 15:59:02 +03:00
Alexander Alekhin
34957bcfed
Merge pull request #5832 from alalek:python_samples
2015-12-18 11:38:27 +00:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
2015-12-18 11:00:30 +03:00
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
2015-12-18 07:17:29 +00:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
2015-12-17 16:48:02 +00:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Alexander Alekhin
437fbe2594
Merge pull request #5817 from alalek:fix_ocl_buffer_pool
2015-12-17 11:54:28 +00:00
Alexander Alekhin
0862e8e34c
fix build
2015-12-17 13:25:10 +03:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
Maksim Shabunin
3c6aa650a1
Merge pull request #5811 from mshabunin:fix-java-moments
2015-12-16 13:12:01 +00:00
Alexander Alekhin
6f2632ca2e
ocl: fix buffer pool small allocations issue ( fixes #5815 )
2015-12-16 14:31:26 +03:00
Vadim Pisarevsky
b2bb7d075a
Merge pull request #5781 from jet47:fix-cuda-createContinuous
2015-12-16 10:37:56 +00:00
Vadim Pisarevsky
3bbd22cb63
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
2015-12-16 10:36:29 +00:00
Maksim Shabunin
5ebc7f0b72
Simple Moments class for Java
2015-12-16 10:53:14 +03:00
Maksim Shabunin
574280cd3a
Merge pull request #5784 from alalek:distrib_fix
2015-12-15 12:24:36 +00:00
Cédric Rousseau
76e4b0a8fe
Reverts "Set the default value of exposure_weight in createMergeMertens to 1.0" because it breaks source code compatibility and tests
...
This reverts commit dbfd6a3dde
2015-12-15 13:16:15 +01:00
Vadim Pisarevsky
1e443a6ea6
Merge pull request #5800 from taketwo:fix-merge-debevec
2015-12-15 10:26:00 +00:00
Vadim Pisarevsky
f93a4dfbc9
Merge pull request #5799 from alalek:fix_5066
2015-12-15 10:24:39 +00:00
Vadim Pisarevsky
34129d8e83
Merge pull request #5806 from IshankGulati:cv-merge-documentation
2015-12-15 10:16:21 +00:00
Cédric Rousseau
dbfd6a3dde
Set the default value of exposure_weight in createMergeMertens to 1.0
2015-12-15 11:12:10 +01:00
Vadim Pisarevsky
c5d4ecae37
Merge pull request #5588 from T-Dunker:ScheimpflugModel
2015-12-15 10:11:59 +00:00
Cédric Rousseau
d19189e80f
Fixed the formula to compute the well-exposedness weight map.
2015-12-15 10:30:06 +01:00
Ishank gulati
d1ac75cabd
corrected cv::merge documentation
2015-12-15 11:02:08 +05:30
Sergey Alexandrov
08b30580b7
Do not modify input parameter in MergeDebevec
...
MergeDebevec takes camera response function as an optional input
parameter. Despite being clearly marked as input, this matrix is
overwritten during processing.
This commit adds a temporary matrix to store the log response and avoid
modification of the input.
2015-12-14 22:24:27 +01:00
Vadim Pisarevsky
aee03cd5e5
Merge pull request #5796 from alalek:fix_5019
2015-12-14 19:52:32 +00:00
Alexander Alekhin
1305962af7
fixes #5066 : laplacian: "y" may contain negative values
2015-12-14 18:13:57 +03:00
Thomas Dunker
6882c10b45
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
2015-12-14 15:20:34 +01:00
Alexander Alekhin
0db10a3052
fixes #5019 : python and java bindings become CMake modules (loadable plugins)
2015-12-14 16:20:18 +03:00
Alexander Alekhin
5c15461595
UMat access flags ( fixes #5095 )
2015-12-14 14:26:43 +03:00
Alexander Alekhin
a153871940
disable ts module if it is not used: BUILD_TESTS=OFF and BUILD_PERF_TESTS=OFF
2015-12-12 15:23:31 +03:00
Alexander Alekhin
1836d41b5c
warning fix (MSVS2015)
2015-12-12 15:23:31 +03:00
Vadim Pisarevsky
5cdf0e3e89
Merge pull request #5351 from paroj:calibout
2015-12-11 16:21:06 +00:00
Vadim Pisarevsky
e0395a79ec
Merge pull request #5616 from afriesen:lr_predict
2015-12-11 12:22:56 +00:00
Pavel Rojtberg
60c06e551a
calibrateCamera: do not require rvec and tvec to be vector<Mat>
...
if they are not we also do not need to allocate a local copy of the rvec
and tvec
2015-12-11 11:01:57 +01:00
Pavel Rojtberg
205775ed52
calibrateCamera: only allocate and compute rvecs, tvecs when needed
...
also replace C defines with C++ enums
2015-12-11 10:58:26 +01:00
Vadim Pisarevsky
21b415f6be
Merge pull request #5691 from paroj:levmarqLU
2015-12-11 08:39:05 +00:00
Vadim Pisarevsky
286ba8cffd
Merge pull request #5783 from vpisarev:ml_fixes
2015-12-11 06:25:15 +00:00
Pavel Rojtberg
b5ddaae427
calib3d: add CALIB_USE_LU to use LU decomposition in solver
2015-12-10 23:26:37 +01:00
Pavel Rojtberg
4c251bd260
CvLevMarq: add solve method to interface
2015-12-10 23:02:18 +01:00
Pavel Rojtberg
22b64e2c28
CvLevMarq: remove fixed rows instead of setting them to zero
...
use the same approach like in fisheye calibration: instead of setting
masked out rows to zero, remove them from the equation system.
This way JtJ does not become singular and we can use the much faster LU
decomposition instead of SVD.
This results in a speedup of the Calibrate unit tests of 3x-10x.
2015-12-10 23:02:18 +01:00
