Merge pull request #5843 from jia-kai:disable-dlopen-opencl
Merge pull request #5848 from IshankGulati:broken-link-fix
path to videocapture-get changed
Merge tag '3.1.0'
OpenCV 3.1.0
OpenCV 3.1.0
define g_haveOpenCL only when HAVE_OPENCL is set
do not open libopencl by dlopen if HAVE_OPENCL is not set
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.
cap_v4l is better maintained and generally the code is in
better shape than cap_libv4l.
Fix java version++
Version++ for android
fix android pack
fix MSVS2010 builds
Version for 3.1.0 release
Merge pull request #5835 from alalek:fix_winpack
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
python: add launch script for winpack python demo
Merge pull request #5834 from alalek:fix_winpack_include_path
Merge pull request #5832 from alalek:python_samples
fix include path for windows package
Merge pull request #5821 from alalek:build_framework
Merge pull request #5801 from enpe:matlab-switch
rename samples/{python2 -> python}
change links from samples/python2 to samples/python
Merge pull request #5802 from bastelflp:py3samples_docstr
Merge pull request #5825 from GregoryMorse:master
Removed outdated tutorial link
merge Win10/VS2015 changes
Merge pull request #5828 from mshabunin:CommandLineArgs
Merge pull request #5810 from mshabunin:hal_interface
Merge pull request #5829 from mshabunin:fix-version-check
Feature #3957
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
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
update osx and ios build_framework.py
HAL samples readme file updated
Merge pull request #5817 from alalek:fix_ocl_buffer_pool
Merge pull request #5818 from alalek:android_set_visible
Merge pull request #5827 from alalek:winrt_build_fixup
HAL samples: renamed and added readme
fix build
HAL moved back to core
Print found calibration data
Simplified status update.
Merge pull request #5811 from mshabunin:fix-java-moments
android samples: force setVisibility (see #5812)
ocl: fix buffer pool small allocations issue (fixes #5815)
Merge pull request #5781 from jet47:fix-cuda-createContinuous
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
Merge pull request #5812 from qubick:master
Merge pull request #5813 from alalek:fix_warning
Simple Moments class for Java
surfaceview import
fix build warning (unreachable code) and exit error codes
camera view was enabled to visible when the app launched
Merge pull request #5809 from alalek:fixup
fixup
Merge pull request #5784 from alalek:distrib_fix
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.
This reverts commit dbfd6a3dde93a36f90756a8b4a64f37f34869edf.
Merge pull request #5800 from taketwo:fix-merge-debevec
Merge pull request #5799 from alalek:fix_5066
Merge pull request #5806 from IshankGulati:cv-merge-documentation
Set the default value of exposure_weight in createMergeMertens to 1.0
Merge pull request #5588 from T-Dunker:ScheimpflugModel
Fixed the formula to compute the well-exposedness weight map.
corrected cv::merge documentation
added docstring to python files
Added .gitignore for tmp files created by examples
Adapted for py2/py3 compatibility
Added switch to CMakeLists.txt in order to enable/disable Matlab.
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.
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.
Merge pull request #5796 from alalek:fix_5019
Merge pull request #5798 from vpisarev:fixed_digits_py
Merge pull request #5797 from alalek:fix_5018
Merge pull request #5793 from alalek:precomp_add_cvconfig
fixes #5066: laplacian: "y" may contain negative values
Merge pull request #5795 from alalek:fix_5095
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
fixed digits.py sample
fixes #5019: python and java bindings become CMake modules (loadable plugins)
Merge pull request #5790 from bastelflp:py3compatibility
fixes #5018: fix framework links in opencv.pc (MacOS)
UMat access flags (fixes #5095)
workaround: cvconfig.h doesn't work with hal at this moment
include "cvconfig.h"
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
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
pkg-config: remove $<LINK_ONLY:...> expressions
disable ts module if it is not used: BUILD_TESTS=OFF and BUILD_PERF_TESTS=OFF
world build: fix modules instantiation order
opencv_hal before opencv_world
opencv_world before opencv_ts
opencv_hal before opencv_world
opencv_world before opencv_ts
warning fix (MSVS2015)
distrib: remove useless static files from shared distribution package
fix samples deps
some tutorials depends on contrib modules
some tutorials depends on contrib modules
cmake: DOWNLOAD_EXTERNAL_TEST_DATA option
Merge pull request #5351 from paroj:calibout
Merge pull request #5782 from alalek:update_libpng
Merge pull request #5616 from afriesen:lr_predict
calibrateCamera: do not require rvec and tvec to be vector<Mat>
if they are not we also do not need to allocate a local copy of the rvec
and tvec
if they are not we also do not need to allocate a local copy of the rvec
and tvec
calibrateCamera: only allocate and compute rvecs, tvecs when needed
also replace C defines with C++ enums
also replace C defines with C++ enums
NEON flags fix
libpng: re-apply patch
libpng: update 1.6.19 - November 12, 2015
Merge pull request #5691 from paroj:levmarqLU
Merge pull request #5783 from vpisarev:ml_fixes