Maksim Shabunin
6c0c0466c6
Tutorials: moved Megamind.avi files to samples/data folder
2016-02-12 13:44:14 +03:00
Maksim Shabunin
359acc0d33
Tutorials: moved imgcodecs and videoio tutorials to separate pages
2016-02-12 13:35:46 +03:00
Ishank gulati
24da1ba3dc
added videoio docs and tutorials
2015-12-26 10:48:01 +05:30
Alexander Alekhin
8d79285d02
Merge pull request #5840 from paroj:v4ldefault
2015-12-24 10:08:59 +00:00
Alexander Alekhin
5fa64235b1
Merge pull request #5860 from Dikay900:patch-1
2015-12-24 09:08:06 +00:00
Alexander Alekhin
9c58741dba
Merge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015
2015-12-23 16:16:31 +00:00
Alexander Alekhin
a4aeba37fb
Merge pull request #5866 from Dikay900:patch-2
2015-12-23 16:14:53 +00:00
Alexander Alekhin
8c545c055d
Merge pull request #5865 from Dikay900:fix_matcopy_shape
2015-12-23 16:14:36 +00:00
Alexander Alekhin
f26d0c5857
Merge pull request #5856 from Dikay900:fix_rgb2luv_doc
2015-12-23 16:14:06 +00:00
atinfinity
d16723f493
changed to find TBB library(VS2015)
2015-12-23 23:45:33 +09:00
Philip
1ba2286c6d
fix uninitialized matrix in EM::predict fixes #5443
...
fixes #5443
2015-12-23 11:19:48 +01:00
Dikay900
bb78b01ace
fix mat copy in shape
...
fixes #5643
2015-12-23 10:48:36 +01:00
Dikay900
a7d3e30404
fix probably copy paste like error in rgb2luv doc
...
fixes #5689
2015-12-22 22:45:51 +01:00
Alexander Alekhin
f550ddb3fd
Merge pull request #5854 from Dikay900:em_predict_fix
2015-12-22 15:15:53 +00:00
Philip
e85b23573b
[master] Fixed PCH warning during ARM crosscompilation
...
#5858 for master
2015-12-22 15:24:02 +01:00
Dikay900
4f3b58d1e7
fix reshape call not being an inplace method
...
fixes #5853 #4740
2015-12-21 21:10:35 +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
923632272f
Merge pull request #5848 from IshankGulati:broken-link-fix
2015-12-21 15:46:41 +00:00
Ishank gulati
fb63cbb74b
path to videocapture-get changed
2015-12-21 19:30:37 +05:30
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
Pavel Rojtberg
96654f0084
make sure cap_v4l is used by default on Linux
...
cap_v4l is better maintained and generally the code is in
better shape than cap_libv4l.
2015-12-20 01:19:48 +01: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
4e669f59a0
fix android pack
2015-12-18 17:38:04 +03:00
Alexander Alekhin
2f4b334ef2
fix MSVS2010 builds
2015-12-18 17:23:17 +03:00
Alexander Alekhin
94e4498cfd
Version for 3.1.0 release
2015-12-18 16:08:05 +03:00
Alexander Alekhin
b4432c4fd7
Merge pull request #5835 from alalek:fix_winpack
2015-12-18 13:02:18 +00: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
613b289325
python: add launch script for winpack python demo
2015-12-18 15:59:02 +03:00
Alexander Alekhin
4fa91e468b
Merge pull request #5834 from alalek:fix_winpack_include_path
2015-12-18 11:55:57 +00:00
Alexander Alekhin
34957bcfed
Merge pull request #5832 from alalek:python_samples
2015-12-18 11:38:27 +00:00
Alexander Alekhin
d34297b516
fix include path for windows package
2015-12-18 13:50:35 +03:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Alexander Alekhin
ec0e43a95b
Merge pull request #5801 from enpe:matlab-switch
2015-12-18 09:34:36 +00:00
Alexander Alekhin
a8e2922467
rename samples/{python2 -> python}
2015-12-18 11:00:32 +03:00
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
