Ishank gulati [Thu, 17 Dec 2015 04:46:10 +0000 (10:16 +0530)]
added videoio docs and tutorials
Alexander Alekhin [Thu, 24 Dec 2015 10:08:58 +0000 (10:08 +0000)]
Merge pull request #5840 from paroj:v4ldefault
Alexander Alekhin [Thu, 24 Dec 2015 09:08:06 +0000 (09:08 +0000)]
Merge pull request #5860 from Dikay900:patch-1
Alexander Alekhin [Wed, 23 Dec 2015 16:16:31 +0000 (16:16 +0000)]
Merge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015
Alexander Alekhin [Wed, 23 Dec 2015 16:14:53 +0000 (16:14 +0000)]
Merge pull request #5866 from Dikay900:patch-2
Alexander Alekhin [Wed, 23 Dec 2015 16:14:36 +0000 (16:14 +0000)]
Merge pull request #5865 from Dikay900:fix_matcopy_shape
Alexander Alekhin [Wed, 23 Dec 2015 16:14:06 +0000 (16:14 +0000)]
Merge pull request #5856 from Dikay900:fix_rgb2luv_doc
atinfinity [Wed, 23 Dec 2015 14:45:33 +0000 (23:45 +0900)]
changed to find TBB library(VS2015)
Philip [Wed, 23 Dec 2015 10:19:48 +0000 (11:19 +0100)]
fix uninitialized matrix in EM::predict fixes #5443
fixes #5443
Dikay900 [Wed, 23 Dec 2015 09:48:36 +0000 (10:48 +0100)]
fix mat copy in shape
fixes #5643
Dikay900 [Tue, 22 Dec 2015 10:00:16 +0000 (11:00 +0100)]
fix probably copy paste like error in rgb2luv doc
fixes #5689
Alexander Alekhin [Tue, 22 Dec 2015 15:15:53 +0000 (15:15 +0000)]
Merge pull request #5854 from Dikay900:em_predict_fix
Philip [Tue, 22 Dec 2015 14:24:02 +0000 (15:24 +0100)]
[master] Fixed PCH warning during ARM crosscompilation
#5858 for master
Dikay900 [Mon, 21 Dec 2015 20:08:38 +0000 (21:08 +0100)]
fix reshape call not being an inplace method
fixes #5853 #4740
Alexander Alekhin [Mon, 21 Dec 2015 15:47:15 +0000 (15:47 +0000)]
Merge pull request #5843 from jia-kai:disable-dlopen-opencl
Alexander Alekhin [Mon, 21 Dec 2015 15:46:41 +0000 (15:46 +0000)]
Merge pull request #5848 from IshankGulati:broken-link-fix
Ishank gulati [Mon, 21 Dec 2015 13:06:59 +0000 (18:36 +0530)]
path to videocapture-get changed
Alexander Alekhin [Mon, 21 Dec 2015 11:24:46 +0000 (14:24 +0300)]
Merge tag '3.1.0'
OpenCV 3.1.0
jiakai [Mon, 21 Dec 2015 08:42:38 +0000 (16:42 +0800)]
define g_haveOpenCL only when HAVE_OPENCL is set
jiakai [Mon, 21 Dec 2015 04:04:00 +0000 (12:04 +0800)]
do not open libopencl by dlopen if HAVE_OPENCL is not set
Pavel Rojtberg [Sun, 20 Dec 2015 00:19:48 +0000 (01:19 +0100)]
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.
Maksim Shabunin [Fri, 18 Dec 2015 15:02:16 +0000 (18:02 +0300)]
Fix java version++
Maksim Shabunin [Fri, 18 Dec 2015 14:57:07 +0000 (17:57 +0300)]
Version++ for android
Alexander Alekhin [Fri, 18 Dec 2015 14:38:04 +0000 (17:38 +0300)]
fix android pack
Alexander Alekhin [Fri, 18 Dec 2015 14:23:17 +0000 (17:23 +0300)]
fix MSVS2010 builds
Alexander Alekhin [Fri, 18 Dec 2015 13:08:05 +0000 (16:08 +0300)]
Version for 3.1.0 release
Alexander Alekhin [Fri, 18 Dec 2015 13:02:18 +0000 (13:02 +0000)]
Merge pull request #5835 from alalek:fix_winpack
Alexander Alekhin [Fri, 18 Dec 2015 12:06:19 +0000 (15:06 +0300)]
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
Alexander Alekhin [Fri, 18 Dec 2015 12:00:24 +0000 (15:00 +0300)]
python: add launch script for winpack python demo
Alexander Alekhin [Fri, 18 Dec 2015 11:55:57 +0000 (11:55 +0000)]
Merge pull request #5834 from alalek:fix_winpack_include_path
Alexander Alekhin [Fri, 18 Dec 2015 11:38:27 +0000 (11:38 +0000)]
Merge pull request #5832 from alalek:python_samples
Alexander Alekhin [Fri, 18 Dec 2015 10:49:39 +0000 (13:49 +0300)]
fix include path for windows package
Vadim Pisarevsky [Fri, 18 Dec 2015 10:12:55 +0000 (10:12 +0000)]
Merge pull request #5821 from alalek:build_framework
Alexander Alekhin [Fri, 18 Dec 2015 09:34:36 +0000 (09:34 +0000)]
Merge pull request #5801 from enpe:matlab-switch
Alexander Alekhin [Thu, 17 Dec 2015 16:34:22 +0000 (19:34 +0300)]
rename samples/{python2 -> python}
Alexander Alekhin [Wed, 16 Dec 2015 13:36:03 +0000 (16:36 +0300)]
change links from samples/python2 to samples/python
Vadim Pisarevsky [Fri, 18 Dec 2015 07:20:53 +0000 (07:20 +0000)]
Merge pull request #5802 from bastelflp:py3samples_docstr
Vadim Pisarevsky [Fri, 18 Dec 2015 07:17:29 +0000 (07:17 +0000)]
Merge pull request #5825 from GregoryMorse:master
flp [Fri, 18 Dec 2015 00:34:57 +0000 (01:34 +0100)]
Removed outdated tutorial link
Gregory Morse [Thu, 17 Dec 2015 20:15:59 +0000 (21:15 +0100)]
merge Win10/VS2015 changes
Alexander Alekhin [Thu, 17 Dec 2015 17:46:37 +0000 (17:46 +0000)]
Merge pull request #5828 from mshabunin:CommandLineArgs
Vadim Pisarevsky [Thu, 17 Dec 2015 16:48:01 +0000 (16:48 +0000)]
Merge pull request #5810 from mshabunin:hal_interface
Alexander Alekhin [Thu, 17 Dec 2015 16:31:59 +0000 (16:31 +0000)]
Merge pull request #5829 from mshabunin:fix-version-check
ValeryTyumen [Sat, 1 Aug 2015 15:24:23 +0000 (20:24 +0500)]
Feature #3957
Vincent Rabaud [Sun, 6 Dec 2015 23:10:39 +0000 (00:10 +0100)]
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
Alexander Alekhin [Wed, 16 Dec 2015 14:28:03 +0000 (17:28 +0300)]
update osx and ios build_framework.py
Maksim Shabunin [Thu, 17 Dec 2015 11:52:50 +0000 (14:52 +0300)]
HAL samples readme file updated
Alexander Alekhin [Thu, 17 Dec 2015 11:54:28 +0000 (11:54 +0000)]
Merge pull request #5817 from alalek:fix_ocl_buffer_pool
Alexander Alekhin [Thu, 17 Dec 2015 11:53:39 +0000 (11:53 +0000)]
Merge pull request #5818 from alalek:android_set_visible
Alexander Alekhin [Thu, 17 Dec 2015 10:28:34 +0000 (10:28 +0000)]
Merge pull request #5827 from alalek:winrt_build_fixup
Maksim Shabunin [Thu, 17 Dec 2015 10:25:47 +0000 (13:25 +0300)]
HAL samples: renamed and added readme
Alexander Alekhin [Thu, 17 Dec 2015 10:25:10 +0000 (13:25 +0300)]
fix build
Maksim Shabunin [Tue, 15 Dec 2015 12:55:43 +0000 (15:55 +0300)]
HAL moved back to core
flp [Wed, 16 Dec 2015 21:01:18 +0000 (22:01 +0100)]
Print found calibration data
Nils Plath [Wed, 16 Dec 2015 20:53:02 +0000 (21:53 +0100)]
Simplified status update.
Maksim Shabunin [Wed, 16 Dec 2015 13:12:01 +0000 (13:12 +0000)]
Merge pull request #5811 from mshabunin:fix-java-moments
Alexander Alekhin [Wed, 16 Dec 2015 11:19:33 +0000 (14:19 +0300)]
android samples: force setVisibility (see #5812)
Alexander Alekhin [Wed, 16 Dec 2015 10:49:00 +0000 (13:49 +0300)]
ocl: fix buffer pool small allocations issue (fixes #5815)
Vadim Pisarevsky [Wed, 16 Dec 2015 10:37:55 +0000 (10:37 +0000)]
Merge pull request #5781 from jet47:fix-cuda-createContinuous
Vadim Pisarevsky [Wed, 16 Dec 2015 10:36:29 +0000 (10:36 +0000)]
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
Alexander Alekhin [Wed, 16 Dec 2015 10:05:34 +0000 (10:05 +0000)]
Merge pull request #5812 from qubick:master
Alexander Alekhin [Wed, 16 Dec 2015 07:54:51 +0000 (07:54 +0000)]
Merge pull request #5813 from alalek:fix_warning
Maksim Shabunin [Tue, 15 Dec 2015 13:38:00 +0000 (16:38 +0300)]
Simple Moments class for Java
qubick [Tue, 15 Dec 2015 19:35:21 +0000 (12:35 -0700)]
surfaceview import
Alexander Alekhin [Tue, 15 Dec 2015 19:06:11 +0000 (22:06 +0300)]
fix build warning (unreachable code) and exit error codes
qubick [Tue, 15 Dec 2015 18:38:56 +0000 (11:38 -0700)]
camera view was enabled to visible when the app launched
Alexander Alekhin [Tue, 15 Dec 2015 13:52:56 +0000 (13:52 +0000)]
Merge pull request #5809 from alalek:fixup
Alexander Alekhin [Tue, 15 Dec 2015 12:49:30 +0000 (15:49 +0300)]
fixup
Maksim Shabunin [Tue, 15 Dec 2015 12:24:36 +0000 (12:24 +0000)]
Merge pull request #5784 from alalek:distrib_fix
Cédric Rousseau [Tue, 15 Dec 2015 12:15:09 +0000 (13:15 +0100)]
Reverts "Set the default value of exposure_weight in createMergeMertens to 1.0" because it breaks source code compatibility and tests
This reverts commit
dbfd6a3dde93a36f90756a8b4a64f37f34869edf.
Vadim Pisarevsky [Tue, 15 Dec 2015 10:26:00 +0000 (10:26 +0000)]
Merge pull request #5800 from taketwo:fix-merge-debevec
Vadim Pisarevsky [Tue, 15 Dec 2015 10:24:38 +0000 (10:24 +0000)]
Merge pull request #5799 from alalek:fix_5066
Vadim Pisarevsky [Tue, 15 Dec 2015 10:16:21 +0000 (10:16 +0000)]
Merge pull request #5806 from IshankGulati:cv-merge-documentation
Cédric Rousseau [Tue, 15 Dec 2015 10:12:10 +0000 (11:12 +0100)]
Set the default value of exposure_weight in createMergeMertens to 1.0
Vadim Pisarevsky [Tue, 15 Dec 2015 10:11:59 +0000 (10:11 +0000)]
Merge pull request #5588 from T-Dunker:ScheimpflugModel
Cédric Rousseau [Tue, 15 Dec 2015 09:30:06 +0000 (10:30 +0100)]
Fixed the formula to compute the well-exposedness weight map.
Ishank gulati [Tue, 15 Dec 2015 05:26:02 +0000 (10:56 +0530)]
corrected cv::merge documentation
flp [Mon, 14 Dec 2015 23:33:55 +0000 (00:33 +0100)]
added docstring to python files
flp [Mon, 14 Dec 2015 23:33:24 +0000 (00:33 +0100)]
Added .gitignore for tmp files created by examples
flp [Mon, 14 Dec 2015 23:31:41 +0000 (00:31 +0100)]
Adapted for py2/py3 compatibility
Nils Plath [Mon, 14 Dec 2015 22:29:51 +0000 (23:29 +0100)]
Added switch to CMakeLists.txt in order to enable/disable Matlab.
Sergey Alexandrov [Mon, 14 Dec 2015 21:24:14 +0000 (22:24 +0100)]
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.
Vadim Pisarevsky [Mon, 14 Dec 2015 19:52:32 +0000 (19:52 +0000)]
Merge pull request #5796 from alalek:fix_5019
Vadim Pisarevsky [Mon, 14 Dec 2015 19:51:07 +0000 (19:51 +0000)]
Merge pull request #5798 from vpisarev:fixed_digits_py
Vadim Pisarevsky [Mon, 14 Dec 2015 16:54:22 +0000 (16:54 +0000)]
Merge pull request #5797 from alalek:fix_5018
Vadim Pisarevsky [Mon, 14 Dec 2015 16:50:40 +0000 (16:50 +0000)]
Merge pull request #5793 from alalek:precomp_add_cvconfig
Alexander Alekhin [Mon, 14 Dec 2015 15:13:57 +0000 (18:13 +0300)]
fixes #5066: laplacian: "y" may contain negative values
Alexander Alekhin [Mon, 14 Dec 2015 14:35:17 +0000 (14:35 +0000)]
Merge pull request #5795 from alalek:fix_5095
Thomas Dunker [Wed, 14 Oct 2015 10:07:28 +0000 (12:07 +0200)]
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
Vadim Pisarevsky [Mon, 14 Dec 2015 13:37:19 +0000 (16:37 +0300)]
fixed digits.py sample
Alexander Alekhin [Mon, 14 Dec 2015 12:04:02 +0000 (15:04 +0300)]
fixes #5019: python and java bindings become CMake modules (loadable plugins)
Vadim Pisarevsky [Mon, 14 Dec 2015 12:47:19 +0000 (12:47 +0000)]
Merge pull request #5790 from bastelflp:py3compatibility
Alexander Alekhin [Mon, 14 Dec 2015 12:14:23 +0000 (15:14 +0300)]
fixes #5018: fix framework links in opencv.pc (MacOS)
Alexander Alekhin [Mon, 14 Dec 2015 11:26:43 +0000 (14:26 +0300)]
UMat access flags (fixes #5095)
Alexander Alekhin [Mon, 14 Dec 2015 10:52:02 +0000 (13:52 +0300)]
workaround: cvconfig.h doesn't work with hal at this moment
Alexander Alekhin [Mon, 14 Dec 2015 10:34:30 +0000 (13:34 +0300)]
include "cvconfig.h"
flp [Sun, 13 Dec 2015 01:43:58 +0000 (02:43 +0100)]
Python samples adapted for Python3 compatibility
Common fixes:
- print function
- int / float division
- map, zip iterators in py3 but lists in py2
Known bugs with opencv 3.0.0
- digits.py, called via digits_video.py: https://github.com/Itseez/opencv/issues/4969
- gaussian_mix.py: https://github.com/Itseez/opencv/pull/4232
- video_v4l2.py: https://github.com/Itseez/opencv/pull/5474
Not working:
- letter_recog.py due to changed ml_StatModel.train() signature
Alexander Alekhin [Sat, 12 Dec 2015 12:15:41 +0000 (15:15 +0300)]
pkg-config: remove $<LINK_ONLY:...> expressions
Alexander Alekhin [Sat, 12 Dec 2015 12:02:10 +0000 (15:02 +0300)]
disable ts module if it is not used: BUILD_TESTS=OFF and BUILD_PERF_TESTS=OFF
Alexander Alekhin [Sat, 12 Dec 2015 11:56:59 +0000 (14:56 +0300)]
world build: fix modules instantiation order
opencv_hal before opencv_world
opencv_world before opencv_ts