atinfinity
d16723f493
changed to find TBB library(VS2015)
10 years ago
Alexander Alekhin
f550ddb3fd
Merge pull request #5854 from Dikay900:em_predict_fix
10 years ago
Dikay900
4f3b58d1e7
fix reshape call not being an inplace method
...
fixes #5853 #4740
10 years ago
Alexander Alekhin
afdbd855ee
Merge pull request #5843 from jia-kai:disable-dlopen-opencl
10 years ago
Alexander Alekhin
923632272f
Merge pull request #5848 from IshankGulati:broken-link-fix
10 years ago
Ishank gulati
fb63cbb74b
path to videocapture-get changed
10 years ago
Alexander Alekhin
4cfe2b4dea
Merge tag '3.1.0'
...
OpenCV 3.1.0
10 years ago
jiakai
22599a2812
define g_haveOpenCL only when HAVE_OPENCL is set
10 years ago
jiakai
387214a3c5
do not open libopencl by dlopen if HAVE_OPENCL is not set
10 years ago
Maksim Shabunin
92387b1ef8
Fix java version++
10 years ago
Maksim Shabunin
8d1f5b5490
Version++ for android
10 years ago
Alexander Alekhin
4e669f59a0
fix android pack
10 years ago
Alexander Alekhin
2f4b334ef2
fix MSVS2010 builds
10 years ago
Alexander Alekhin
94e4498cfd
Version for 3.1.0 release
10 years ago
Alexander Alekhin
b4432c4fd7
Merge pull request #5835 from alalek:fix_winpack
10 years ago
Alexander Alekhin
3ee90a1ff4
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
10 years ago
Alexander Alekhin
613b289325
python: add launch script for winpack python demo
10 years ago
Alexander Alekhin
4fa91e468b
Merge pull request #5834 from alalek:fix_winpack_include_path
10 years ago
Alexander Alekhin
34957bcfed
Merge pull request #5832 from alalek:python_samples
10 years ago
Alexander Alekhin
d34297b516
fix include path for windows package
10 years ago
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
10 years ago
Alexander Alekhin
ec0e43a95b
Merge pull request #5801 from enpe:matlab-switch
10 years ago
Alexander Alekhin
a8e2922467
rename samples/{python2 -> python}
10 years ago
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
10 years ago
Vadim Pisarevsky
2ecb48921b
Merge pull request #5802 from bastelflp:py3samples_docstr
10 years ago
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
10 years ago
flp
0c5d9e18d1
Removed outdated tutorial link
10 years ago
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
10 years ago
Alexander Alekhin
03e74330fa
Merge pull request #5828 from mshabunin:CommandLineArgs
10 years ago
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
10 years ago
Alexander Alekhin
5021350082
Merge pull request #5829 from mshabunin:fix-version-check
10 years ago
ValeryTyumen
297808e6b9
Feature #3957
10 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
10 years ago
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
10 years ago
Maksim Shabunin
c04d62db8b
HAL samples readme file updated
10 years ago
Alexander Alekhin
437fbe2594
Merge pull request #5817 from alalek:fix_ocl_buffer_pool
10 years ago
Alexander Alekhin
ddd1a816a0
Merge pull request #5818 from alalek:android_set_visible
10 years ago
Alexander Alekhin
1f6893e4dc
Merge pull request #5827 from alalek:winrt_build_fixup
10 years ago
Maksim Shabunin
d214770d5b
HAL samples: renamed and added readme
10 years ago
Alexander Alekhin
0862e8e34c
fix build
10 years ago
Maksim Shabunin
84f37d352f
HAL moved back to core
10 years ago
flp
32737df1b5
Print found calibration data
10 years ago
Nils Plath
4474845dd5
Simplified status update.
10 years ago
Maksim Shabunin
3c6aa650a1
Merge pull request #5811 from mshabunin:fix-java-moments
10 years ago
Alexander Alekhin
491a3fdebc
android samples: force setVisibility (see #5812 )
10 years ago
Alexander Alekhin
6f2632ca2e
ocl: fix buffer pool small allocations issue ( fixes #5815 )
10 years ago
Vadim Pisarevsky
b2bb7d075a
Merge pull request #5781 from jet47:fix-cuda-createContinuous
10 years ago
Vadim Pisarevsky
3bbd22cb63
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
10 years ago
Alexander Alekhin
3b87e3fa20
Merge pull request #5812 from qubick:master
10 years ago
Alexander Alekhin
74cb74dc0a
Merge pull request #5813 from alalek:fix_warning
10 years ago