jiakai
387214a3c5
do not open libopencl by dlopen if HAVE_OPENCL is not set
9 years ago
Alexander Alekhin
b4432c4fd7
Merge pull request #5835 from alalek:fix_winpack
9 years ago
Alexander Alekhin
3ee90a1ff4
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
9 years ago
Alexander Alekhin
613b289325
python: add launch script for winpack python demo
9 years ago
Alexander Alekhin
4fa91e468b
Merge pull request #5834 from alalek:fix_winpack_include_path
9 years ago
Alexander Alekhin
34957bcfed
Merge pull request #5832 from alalek:python_samples
9 years ago
Alexander Alekhin
d34297b516
fix include path for windows package
9 years ago
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
9 years ago
Alexander Alekhin
ec0e43a95b
Merge pull request #5801 from enpe:matlab-switch
9 years ago
Alexander Alekhin
a8e2922467
rename samples/{python2 -> python}
9 years ago
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
9 years ago
Vadim Pisarevsky
2ecb48921b
Merge pull request #5802 from bastelflp:py3samples_docstr
9 years ago
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
9 years ago
flp
0c5d9e18d1
Removed outdated tutorial link
9 years ago
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
9 years ago
Alexander Alekhin
03e74330fa
Merge pull request #5828 from mshabunin:CommandLineArgs
9 years ago
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
9 years ago
Alexander Alekhin
5021350082
Merge pull request #5829 from mshabunin:fix-version-check
9 years ago
ValeryTyumen
297808e6b9
Feature #3957
9 years ago
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
9 years ago
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
9 years ago
Maksim Shabunin
c04d62db8b
HAL samples readme file updated
9 years ago
Alexander Alekhin
437fbe2594
Merge pull request #5817 from alalek:fix_ocl_buffer_pool
9 years ago
Alexander Alekhin
ddd1a816a0
Merge pull request #5818 from alalek:android_set_visible
9 years ago
Alexander Alekhin
1f6893e4dc
Merge pull request #5827 from alalek:winrt_build_fixup
9 years ago
Maksim Shabunin
d214770d5b
HAL samples: renamed and added readme
9 years ago
Alexander Alekhin
0862e8e34c
fix build
9 years ago
Maksim Shabunin
84f37d352f
HAL moved back to core
9 years ago
flp
32737df1b5
Print found calibration data
9 years ago
Nils Plath
4474845dd5
Simplified status update.
9 years ago
Maksim Shabunin
3c6aa650a1
Merge pull request #5811 from mshabunin:fix-java-moments
9 years ago
Alexander Alekhin
491a3fdebc
android samples: force setVisibility (see #5812 )
9 years ago
Alexander Alekhin
6f2632ca2e
ocl: fix buffer pool small allocations issue ( fixes #5815 )
9 years ago
Vadim Pisarevsky
b2bb7d075a
Merge pull request #5781 from jet47:fix-cuda-createContinuous
9 years ago
Vadim Pisarevsky
3bbd22cb63
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
9 years ago
Alexander Alekhin
3b87e3fa20
Merge pull request #5812 from qubick:master
9 years ago
Alexander Alekhin
74cb74dc0a
Merge pull request #5813 from alalek:fix_warning
9 years ago
Maksim Shabunin
5ebc7f0b72
Simple Moments class for Java
9 years ago
qubick
5502f0b45d
surfaceview import
9 years ago
Alexander Alekhin
8f60740205
fix build warning (unreachable code) and exit error codes
9 years ago
qubick
1434f55cb9
camera view was enabled to visible when the app launched
9 years ago
Alexander Alekhin
0d9938dab5
Merge pull request #5809 from alalek:fixup
9 years ago
Alexander Alekhin
31d0dcf28e
fixup
9 years ago
Maksim Shabunin
574280cd3a
Merge pull request #5784 from alalek:distrib_fix
9 years ago
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
.
9 years ago
Vadim Pisarevsky
1e443a6ea6
Merge pull request #5800 from taketwo:fix-merge-debevec
9 years ago
Vadim Pisarevsky
f93a4dfbc9
Merge pull request #5799 from alalek:fix_5066
9 years ago
Vadim Pisarevsky
34129d8e83
Merge pull request #5806 from IshankGulati:cv-merge-documentation
9 years ago
Cédric Rousseau
dbfd6a3dde
Set the default value of exposure_weight in createMergeMertens to 1.0
9 years ago
Vadim Pisarevsky
c5d4ecae37
Merge pull request #5588 from T-Dunker:ScheimpflugModel
9 years ago