Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
2015-12-18 11:00:30 +03:00
Vadim Pisarevsky
2ecb48921b
Merge pull request #5802 from bastelflp:py3samples_docstr
2015-12-18 07:20:53 +00:00
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
2015-12-18 07:17:29 +00:00
flp
0c5d9e18d1
Removed outdated tutorial link
2015-12-18 01:34:57 +01:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Alexander Alekhin
03e74330fa
Merge pull request #5828 from mshabunin:CommandLineArgs
2015-12-17 17:46:37 +00:00
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
2015-12-17 16:48:02 +00:00
Alexander Alekhin
5021350082
Merge pull request #5829 from mshabunin:fix-version-check
2015-12-17 16:31:59 +00:00
ValeryTyumen
297808e6b9
Feature #3957
2015-12-17 18:19:39 +03:00
Vincent Rabaud
932043fdc2
Properly check for version in find_package
...
If I ask for version 2, the current trunk version (version 3), will say it is compatible, which is erroneous.
Do not consider different major versions compatible in cmake config file
2015-12-17 17:00:30 +03:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Maksim Shabunin
c04d62db8b
HAL samples readme file updated
2015-12-17 16:09:36 +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
ddd1a816a0
Merge pull request #5818 from alalek:android_set_visible
2015-12-17 11:53:39 +00:00
Alexander Alekhin
1f6893e4dc
Merge pull request #5827 from alalek:winrt_build_fixup
2015-12-17 10:28:34 +00:00
Maksim Shabunin
d214770d5b
HAL samples: renamed and added readme
2015-12-17 13:25:47 +03: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
flp
32737df1b5
Print found calibration data
2015-12-16 22:01:18 +01:00
Nils Plath
4474845dd5
Simplified status update.
2015-12-16 21:53:34 +01:00
Maksim Shabunin
3c6aa650a1
Merge pull request #5811 from mshabunin:fix-java-moments
2015-12-16 13:12:01 +00:00
Alexander Alekhin
491a3fdebc
android samples: force setVisibility (see #5812 )
2015-12-16 14:31:49 +03: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
Alexander Alekhin
3b87e3fa20
Merge pull request #5812 from qubick:master
2015-12-16 10:05:34 +00:00
Alexander Alekhin
74cb74dc0a
Merge pull request #5813 from alalek:fix_warning
2015-12-16 07:54:51 +00:00
Maksim Shabunin
5ebc7f0b72
Simple Moments class for Java
2015-12-16 10:53:14 +03:00
qubick
5502f0b45d
surfaceview import
2015-12-15 12:35:21 -07:00
Alexander Alekhin
8f60740205
fix build warning (unreachable code) and exit error codes
2015-12-15 22:06:11 +03:00
qubick
1434f55cb9
camera view was enabled to visible when the app launched
2015-12-15 11:38:56 -07:00
Alexander Alekhin
0d9938dab5
Merge pull request #5809 from alalek:fixup
2015-12-15 13:52:56 +00:00
Alexander Alekhin
31d0dcf28e
fixup
2015-12-15 15:54:45 +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
flp
b6ce4a527e
added docstring to python files
2015-12-15 01:03:50 +01:00
flp
14c5ef8db4
Added .gitignore for tmp files created by examples
2015-12-15 01:03:50 +01:00
flp
006d5ac0a5
Adapted for py2/py3 compatibility
2015-12-15 01:03:50 +01:00
Nils Plath
a1173dfa27
Added switch to CMakeLists.txt in order to enable/disable Matlab.
2015-12-14 23:30:28 +01:00
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
Vadim Pisarevsky
d366cb960d
Merge pull request #5798 from vpisarev:fixed_digits_py
2015-12-14 19:51:07 +00:00
Vadim Pisarevsky
5ac1d8323e
Merge pull request #5797 from alalek:fix_5018
2015-12-14 16:54:22 +00:00
