platform/upstream/opencv.git
8 years agoadded wrapped load function for python as suggested by gat3way
Christoph Spörk [Mon, 11 Jan 2016 09:59:15 +0000 (10:59 +0100)]
added wrapped load function for python as suggested by gat3way

8 years agofixed a doxygen issue
Christoph Spörk [Thu, 7 Jan 2016 07:19:06 +0000 (08:19 +0100)]
fixed a doxygen issue

8 years agofixed ABI incompatibilities as proposed by alalek
Christoph Spörk [Thu, 7 Jan 2016 07:00:01 +0000 (08:00 +0100)]
fixed ABI incompatibilities as proposed by alalek

related to issue 4969
fixes issue 5891
fixes issue 5922

8 years agofixing issue #4969 of Itseez/opencv.
Christoph Spörk [Mon, 4 Jan 2016 14:47:26 +0000 (15:47 +0100)]
fixing issue #4969 of Itseez/opencv.

Someone forgot to wrap the load function for SVMs in the
corresponding ml python module. Fixed that.

8 years agoMerge pull request #5861 from alalek:fix_pkgconfig
Alexander Alekhin [Mon, 4 Jan 2016 06:58:19 +0000 (06:58 +0000)]
Merge pull request #5861 from alalek:fix_pkgconfig

8 years agoMerge pull request #5906 from berak:fix_marker
Alexander Alekhin [Mon, 4 Jan 2016 05:31:00 +0000 (05:31 +0000)]
Merge pull request #5906 from berak:fix_marker

8 years agoMerge pull request #5904 from GregoryMorse:master
Alexander Alekhin [Mon, 4 Jan 2016 05:30:28 +0000 (05:30 +0000)]
Merge pull request #5904 from GregoryMorse:master

8 years agoMerge pull request #5902 from alalek:fix_gpu_samples
Alexander Alekhin [Mon, 4 Jan 2016 05:29:57 +0000 (05:29 +0000)]
Merge pull request #5902 from alalek:fix_gpu_samples

8 years agoMerge pull request #5883 from alalek:fix_5876
Alexander Alekhin [Mon, 4 Jan 2016 05:28:41 +0000 (05:28 +0000)]
Merge pull request #5883 from alalek:fix_5876

8 years agoMerge pull request #5881 from alalek:fix_5878
Alexander Alekhin [Mon, 4 Jan 2016 05:27:37 +0000 (05:27 +0000)]
Merge pull request #5881 from alalek:fix_5878

8 years agoMerge pull request #5880 from alalek:fix_5863
Alexander Alekhin [Mon, 4 Jan 2016 05:27:22 +0000 (05:27 +0000)]
Merge pull request #5880 from alalek:fix_5863

8 years agoMerge pull request #5873 from paroj:cpprodrigues
Alexander Alekhin [Mon, 4 Jan 2016 05:27:00 +0000 (05:27 +0000)]
Merge pull request #5873 from paroj:cpprodrigues

8 years agofix cv::MARKER_TRIANGLE_UP
berak [Fri, 1 Jan 2016 09:10:01 +0000 (10:10 +0100)]
fix cv::MARKER_TRIANGLE_UP

8 years agoWinRT consistency
Gregory Morse [Thu, 31 Dec 2015 13:31:26 +0000 (14:31 +0100)]
WinRT consistency

8 years agogpu samples: fix REMOVE_ITEM error
Alexander Alekhin [Wed, 30 Dec 2015 23:24:54 +0000 (02:24 +0300)]
gpu samples: fix REMOVE_ITEM error

8 years agoadded regression test for #5876
Alexander Alekhin [Fri, 25 Dec 2015 13:02:47 +0000 (16:02 +0300)]
added regression test for #5876

8 years agoalso port Rodrigues in Affine to Matx expressions
Pavel Rojtberg [Fri, 25 Dec 2015 12:27:26 +0000 (13:27 +0100)]
also port Rodrigues in Affine to Matx expressions

so results are numerically equivalent

8 years agofix normalize in case of inplace operations
Alexander Alekhin [Fri, 25 Dec 2015 12:33:06 +0000 (15:33 +0300)]
fix normalize in case of inplace operations

fixes #5876

8 years agosolve videoio/src/cap_mjpeg_decoder.cpp compiling problem using VS 2008
HMM@T430s-x64 [Fri, 25 Dec 2015 06:03:10 +0000 (14:03 +0800)]
solve videoio/src/cap_mjpeg_decoder.cpp compiling problem using VS 2008

fixes #5878

8 years agofeatures2d agast: clear in/out keypoints container
Alexander Alekhin [Fri, 25 Dec 2015 10:48:00 +0000 (13:48 +0300)]
features2d agast: clear in/out keypoints container

fixes #5863

8 years agocalib3d: port Rodrigues to cpp primitives
Pavel Rojtberg [Thu, 24 Dec 2015 17:46:29 +0000 (18:46 +0100)]
calib3d: port Rodrigues to cpp primitives

8 years agoMerge pull request #5840 from paroj:v4ldefault
Alexander Alekhin [Thu, 24 Dec 2015 10:08:58 +0000 (10:08 +0000)]
Merge pull request #5840 from paroj:v4ldefault

8 years agoMerge pull request #5860 from Dikay900:patch-1
Alexander Alekhin [Thu, 24 Dec 2015 09:08:06 +0000 (09:08 +0000)]
Merge pull request #5860 from Dikay900:patch-1

8 years agoMerge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015
Alexander Alekhin [Wed, 23 Dec 2015 16:16:31 +0000 (16:16 +0000)]
Merge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015

8 years agoMerge pull request #5866 from Dikay900:patch-2
Alexander Alekhin [Wed, 23 Dec 2015 16:14:53 +0000 (16:14 +0000)]
Merge pull request #5866 from Dikay900:patch-2

8 years agoMerge pull request #5865 from Dikay900:fix_matcopy_shape
Alexander Alekhin [Wed, 23 Dec 2015 16:14:36 +0000 (16:14 +0000)]
Merge pull request #5865 from Dikay900:fix_matcopy_shape

8 years agoMerge pull request #5856 from Dikay900:fix_rgb2luv_doc
Alexander Alekhin [Wed, 23 Dec 2015 16:14:06 +0000 (16:14 +0000)]
Merge pull request #5856 from Dikay900:fix_rgb2luv_doc

8 years agochanged to find TBB library(VS2015)
atinfinity [Wed, 23 Dec 2015 14:45:33 +0000 (23:45 +0900)]
changed to find TBB library(VS2015)

8 years agofix uninitialized matrix in EM::predict fixes #5443
Philip [Wed, 23 Dec 2015 10:19:48 +0000 (11:19 +0100)]
fix uninitialized matrix in EM::predict fixes #5443

fixes #5443

8 years agofix mat copy in shape
Dikay900 [Wed, 23 Dec 2015 09:48:36 +0000 (10:48 +0100)]
fix mat copy in shape
fixes #5643

8 years agofix probably copy paste like error in rgb2luv doc
Dikay900 [Tue, 22 Dec 2015 10:00:16 +0000 (11:00 +0100)]
fix probably copy paste like error in rgb2luv doc
fixes #5689

8 years agoMerge pull request #5854 from Dikay900:em_predict_fix
Alexander Alekhin [Tue, 22 Dec 2015 15:15:53 +0000 (15:15 +0000)]
Merge pull request #5854 from Dikay900:em_predict_fix

8 years agopkg-config: modules list contains only OpenCV modules (fixes #5852)
Alexander Alekhin [Tue, 22 Dec 2015 14:10:33 +0000 (17:10 +0300)]
pkg-config: modules list contains only OpenCV modules (fixes #5852)

8 years ago[master] Fixed PCH warning during ARM crosscompilation
Philip [Tue, 22 Dec 2015 14:24:02 +0000 (15:24 +0100)]
[master] Fixed PCH warning during ARM crosscompilation

#5858 for master

8 years agofix reshape call not being an inplace method
Dikay900 [Mon, 21 Dec 2015 20:08:38 +0000 (21:08 +0100)]
fix reshape call not being an inplace method
fixes #5853 #4740

8 years agoMerge pull request #5843 from jia-kai:disable-dlopen-opencl
Alexander Alekhin [Mon, 21 Dec 2015 15:47:15 +0000 (15:47 +0000)]
Merge pull request #5843 from jia-kai:disable-dlopen-opencl

8 years agoMerge pull request #5848 from IshankGulati:broken-link-fix
Alexander Alekhin [Mon, 21 Dec 2015 15:46:41 +0000 (15:46 +0000)]
Merge pull request #5848 from IshankGulati:broken-link-fix

8 years agopath to videocapture-get changed
Ishank gulati [Mon, 21 Dec 2015 13:06:59 +0000 (18:36 +0530)]
path to videocapture-get changed

8 years agoMerge tag '3.1.0'
Alexander Alekhin [Mon, 21 Dec 2015 11:24:46 +0000 (14:24 +0300)]
Merge tag '3.1.0'

OpenCV 3.1.0

8 years agodefine g_haveOpenCL only when HAVE_OPENCL is set
jiakai [Mon, 21 Dec 2015 08:42:38 +0000 (16:42 +0800)]
define g_haveOpenCL only when HAVE_OPENCL is set

8 years agodo not open libopencl by dlopen if HAVE_OPENCL is not 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

8 years agomake sure cap_v4l is used by default on Linux
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.

8 years agoFix java version++
Maksim Shabunin [Fri, 18 Dec 2015 15:02:16 +0000 (18:02 +0300)]
Fix java version++

8 years agoVersion++ for android
Maksim Shabunin [Fri, 18 Dec 2015 14:57:07 +0000 (17:57 +0300)]
Version++ for android

8 years agofix android pack
Alexander Alekhin [Fri, 18 Dec 2015 14:38:04 +0000 (17:38 +0300)]
fix android pack

8 years agofix MSVS2010 builds
Alexander Alekhin [Fri, 18 Dec 2015 14:23:17 +0000 (17:23 +0300)]
fix MSVS2010 builds

8 years agoVersion for 3.1.0 release
Alexander Alekhin [Fri, 18 Dec 2015 13:08:05 +0000 (16:08 +0300)]
Version for 3.1.0 release

8 years agoMerge pull request #5835 from alalek:fix_winpack
Alexander Alekhin [Fri, 18 Dec 2015 13:02:18 +0000 (13:02 +0000)]
Merge pull request #5835 from alalek:fix_winpack

8 years agoffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
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)

8 years agopython: add launch script for winpack python demo
Alexander Alekhin [Fri, 18 Dec 2015 12:00:24 +0000 (15:00 +0300)]
python: add launch script for winpack python demo

8 years agoMerge pull request #5834 from alalek:fix_winpack_include_path
Alexander Alekhin [Fri, 18 Dec 2015 11:55:57 +0000 (11:55 +0000)]
Merge pull request #5834 from alalek:fix_winpack_include_path

8 years agoMerge pull request #5832 from alalek:python_samples
Alexander Alekhin [Fri, 18 Dec 2015 11:38:27 +0000 (11:38 +0000)]
Merge pull request #5832 from alalek:python_samples

8 years agofix include path for windows package
Alexander Alekhin [Fri, 18 Dec 2015 10:49:39 +0000 (13:49 +0300)]
fix include path for windows package

8 years agoMerge pull request #5821 from alalek:build_framework
Vadim Pisarevsky [Fri, 18 Dec 2015 10:12:55 +0000 (10:12 +0000)]
Merge pull request #5821 from alalek:build_framework

8 years agoMerge pull request #5801 from enpe:matlab-switch
Alexander Alekhin [Fri, 18 Dec 2015 09:34:36 +0000 (09:34 +0000)]
Merge pull request #5801 from enpe:matlab-switch

8 years agorename samples/{python2 -> python}
Alexander Alekhin [Thu, 17 Dec 2015 16:34:22 +0000 (19:34 +0300)]
rename samples/{python2 -> python}

8 years agochange links from samples/python2 to samples/python
Alexander Alekhin [Wed, 16 Dec 2015 13:36:03 +0000 (16:36 +0300)]
change links from samples/python2 to samples/python

8 years agoMerge pull request #5802 from bastelflp:py3samples_docstr
Vadim Pisarevsky [Fri, 18 Dec 2015 07:20:53 +0000 (07:20 +0000)]
Merge pull request #5802 from bastelflp:py3samples_docstr

8 years agoMerge pull request #5825 from GregoryMorse:master
Vadim Pisarevsky [Fri, 18 Dec 2015 07:17:29 +0000 (07:17 +0000)]
Merge pull request #5825 from GregoryMorse:master

8 years agoRemoved outdated tutorial link
flp [Fri, 18 Dec 2015 00:34:57 +0000 (01:34 +0100)]
Removed outdated tutorial link

8 years agomerge Win10/VS2015 changes
Gregory Morse [Thu, 17 Dec 2015 20:15:59 +0000 (21:15 +0100)]
merge Win10/VS2015 changes

8 years agoMerge pull request #5828 from mshabunin:CommandLineArgs
Alexander Alekhin [Thu, 17 Dec 2015 17:46:37 +0000 (17:46 +0000)]
Merge pull request #5828 from mshabunin:CommandLineArgs

8 years agoMerge pull request #5810 from mshabunin:hal_interface
Vadim Pisarevsky [Thu, 17 Dec 2015 16:48:01 +0000 (16:48 +0000)]
Merge pull request #5810 from mshabunin:hal_interface

8 years agoMerge pull request #5829 from mshabunin:fix-version-check
Alexander Alekhin [Thu, 17 Dec 2015 16:31:59 +0000 (16:31 +0000)]
Merge pull request #5829 from mshabunin:fix-version-check

8 years agoFeature #3957
ValeryTyumen [Sat, 1 Aug 2015 15:24:23 +0000 (20:24 +0500)]
Feature #3957

8 years agoProperly check for version in find_package
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

8 years agoupdate osx and ios build_framework.py
Alexander Alekhin [Wed, 16 Dec 2015 14:28:03 +0000 (17:28 +0300)]
update osx and ios build_framework.py

8 years agoHAL samples readme file updated
Maksim Shabunin [Thu, 17 Dec 2015 11:52:50 +0000 (14:52 +0300)]
HAL samples readme file updated

8 years agoMerge pull request #5817 from alalek:fix_ocl_buffer_pool
Alexander Alekhin [Thu, 17 Dec 2015 11:54:28 +0000 (11:54 +0000)]
Merge pull request #5817 from alalek:fix_ocl_buffer_pool

8 years agoMerge pull request #5818 from alalek:android_set_visible
Alexander Alekhin [Thu, 17 Dec 2015 11:53:39 +0000 (11:53 +0000)]
Merge pull request #5818 from alalek:android_set_visible

8 years agoMerge pull request #5827 from alalek:winrt_build_fixup
Alexander Alekhin [Thu, 17 Dec 2015 10:28:34 +0000 (10:28 +0000)]
Merge pull request #5827 from alalek:winrt_build_fixup

8 years agoHAL samples: renamed and added readme
Maksim Shabunin [Thu, 17 Dec 2015 10:25:47 +0000 (13:25 +0300)]
HAL samples: renamed and added readme

8 years agofix build
Alexander Alekhin [Thu, 17 Dec 2015 10:25:10 +0000 (13:25 +0300)]
fix build

8 years agoHAL moved back to core
Maksim Shabunin [Tue, 15 Dec 2015 12:55:43 +0000 (15:55 +0300)]
HAL moved back to core

8 years agoPrint found calibration data
flp [Wed, 16 Dec 2015 21:01:18 +0000 (22:01 +0100)]
Print found calibration data

8 years agoSimplified status update.
Nils Plath [Wed, 16 Dec 2015 20:53:02 +0000 (21:53 +0100)]
Simplified status update.

8 years agoMerge pull request #5811 from mshabunin:fix-java-moments
Maksim Shabunin [Wed, 16 Dec 2015 13:12:01 +0000 (13:12 +0000)]
Merge pull request #5811 from mshabunin:fix-java-moments

8 years agoandroid samples: force setVisibility (see #5812)
Alexander Alekhin [Wed, 16 Dec 2015 11:19:33 +0000 (14:19 +0300)]
android samples: force setVisibility (see #5812)

8 years agoocl: fix buffer pool small allocations issue (fixes #5815)
Alexander Alekhin [Wed, 16 Dec 2015 10:49:00 +0000 (13:49 +0300)]
ocl: fix buffer pool small allocations issue (fixes #5815)

8 years agoMerge pull request #5781 from jet47:fix-cuda-createContinuous
Vadim Pisarevsky [Wed, 16 Dec 2015 10:37:55 +0000 (10:37 +0000)]
Merge pull request #5781 from jet47:fix-cuda-createContinuous

8 years agoMerge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
Vadim Pisarevsky [Wed, 16 Dec 2015 10:36:29 +0000 (10:36 +0000)]
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo

8 years agoMerge pull request #5812 from qubick:master
Alexander Alekhin [Wed, 16 Dec 2015 10:05:34 +0000 (10:05 +0000)]
Merge pull request #5812 from qubick:master

8 years agoMerge pull request #5813 from alalek:fix_warning
Alexander Alekhin [Wed, 16 Dec 2015 07:54:51 +0000 (07:54 +0000)]
Merge pull request #5813 from alalek:fix_warning

8 years agoSimple Moments class for Java
Maksim Shabunin [Tue, 15 Dec 2015 13:38:00 +0000 (16:38 +0300)]
Simple Moments class for Java

8 years agosurfaceview import
qubick [Tue, 15 Dec 2015 19:35:21 +0000 (12:35 -0700)]
surfaceview import

8 years agofix build warning (unreachable code) and exit error codes
Alexander Alekhin [Tue, 15 Dec 2015 19:06:11 +0000 (22:06 +0300)]
fix build warning (unreachable code) and exit error codes

8 years agocamera view was enabled to visible when the app launched
qubick [Tue, 15 Dec 2015 18:38:56 +0000 (11:38 -0700)]
camera view was enabled to visible when the app launched

8 years agoMerge pull request #5809 from alalek:fixup
Alexander Alekhin [Tue, 15 Dec 2015 13:52:56 +0000 (13:52 +0000)]
Merge pull request #5809 from alalek:fixup

8 years agofixup
Alexander Alekhin [Tue, 15 Dec 2015 12:49:30 +0000 (15:49 +0300)]
fixup

8 years agoMerge pull request #5784 from alalek:distrib_fix
Maksim Shabunin [Tue, 15 Dec 2015 12:24:36 +0000 (12:24 +0000)]
Merge pull request #5784 from alalek:distrib_fix

8 years agoReverts "Set the default value of exposure_weight in createMergeMertens to 1.0" becau...
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.

8 years agoMerge pull request #5800 from taketwo:fix-merge-debevec
Vadim Pisarevsky [Tue, 15 Dec 2015 10:26:00 +0000 (10:26 +0000)]
Merge pull request #5800 from taketwo:fix-merge-debevec

8 years agoMerge pull request #5799 from alalek:fix_5066
Vadim Pisarevsky [Tue, 15 Dec 2015 10:24:38 +0000 (10:24 +0000)]
Merge pull request #5799 from alalek:fix_5066

8 years agoMerge pull request #5806 from IshankGulati:cv-merge-documentation
Vadim Pisarevsky [Tue, 15 Dec 2015 10:16:21 +0000 (10:16 +0000)]
Merge pull request #5806 from IshankGulati:cv-merge-documentation

8 years agoSet the default value of exposure_weight in createMergeMertens to 1.0
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

8 years agoMerge pull request #5588 from T-Dunker:ScheimpflugModel
Vadim Pisarevsky [Tue, 15 Dec 2015 10:11:59 +0000 (10:11 +0000)]
Merge pull request #5588 from T-Dunker:ScheimpflugModel

8 years agoFixed the formula to compute the well-exposedness weight map.
Cédric Rousseau [Tue, 15 Dec 2015 09:30:06 +0000 (10:30 +0100)]
Fixed the formula to compute the well-exposedness weight map.

8 years agocorrected cv::merge documentation
Ishank gulati [Tue, 15 Dec 2015 05:26:02 +0000 (10:56 +0530)]
corrected cv::merge documentation

8 years agoadded docstring to python files
flp [Mon, 14 Dec 2015 23:33:55 +0000 (00:33 +0100)]
added docstring to python files

8 years agoAdded .gitignore for tmp files created by examples
flp [Mon, 14 Dec 2015 23:33:24 +0000 (00:33 +0100)]
Added .gitignore for tmp files created by examples