mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-19 03:50:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,559 Commits 6 Branches 127 Tags 3 GiB
9b70c44f00
Commit Graph

18559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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