[opencv] annotated tag 3.1.0 created (now 8f58d02)
Mattia Rizzolo
mattia at debian.org
Tue Oct 4 17:51:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a change to annotated tag 3.1.0
in repository opencv.
at 8f58d02 (tag)
tagging 92387b1ef8fad15196dd5f7fb4931444a68bc93a (commit)
replaces 3.0.0
tagged by Maksim Shabunin
on Fri Dec 18 18:02:25 2015 +0300
- Log -----------------------------------------------------------------
OpenCV 3.1.0
Aaron Simmons (1):
brining over fix in master (#4140) for libz import on 64-bit android
Abe Friesen (5):
- LogisticRegressionImpl::predict() was changed to return the predicted value and to only write to the OutputArray results if specified (no longer segfaults).
Removed unused variables.
Added cast to float to remove warning
- LogisticRegressionImpl::predict() was changed to return the predicted value and to only write to the OutputArray results if specified (no longer segfaults).
Merge branch 'lr_predict' of https://github.com/afriesen/opencv into lr_predict
Abhijit Kundu (1):
Added suuport for finding Intel TBB for Visual Studio 2013
Adam (1):
Correction of minor typo.
Adam Geitgey (1):
Prevent grabcut, houghcircles and houghlines python2 demos from running automatically while browsing demos in the demo list viewer
Adam Gibson (3):
Various Python samples updated for Python 2/3 compatibility.
Reverted _doc.py to Python 2-only version. Interim measure to prevent docs from failing during build, until all samples are updated with Python 2/3 compatibility.
Removed trailing whitespace from squares.py compatibility comment.
Adi Shavit (1):
Added call to clone() to avoid unexpected change to external data.
Adrian Clark (1):
Fixed crash in SSE implementation of FREAK descriptor when number of pairs is set to something other than 512.
AfterEight (1):
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
Alankar Kotwal (2):
Correct missing braces in operations_in_arrays.rst
Merge pull request #1 from alankarkotwal/bugfix
Aleksandr Petrikov (2):
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
fix bug 3733 for imgproc/filter.cpp
Alex Torres (2):
Fixes compilation errors when BUILD_CUDA_STUBS is ON
Fixes namespace error on cudaoptflow
Alexander Alekhin (312):
Merge pull request #2954 from ilya-lavrenov:doc_fix
ocl: fix pyrUp perf test
Merge pull request #3019 from alalek:ocl_fix_pyrUp_test
Merge pull request #3221 from asmorkalov:ocv_2.4.10_version_inc
Merge pull request #3418 from tstellarAMD:2.4-hog-crash-fix
Android: fix JavaCameraView implementation
Merge pull request #3683 from SeninAndrew:2.4
Merge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation
Merge pull request #3923 from ilya-lavrenov:typo
fix tests build (win,shared,world)
videoio: update ffmpeg backend
videoio: fix some issues in ffmpeg error processing
remove bindings generation for DetectionBasedTracker
ocl: added errors processing in OpenCL code generator, resolve space issue
fix support for pthreads parallel_for
fix issue 3891
Merge pull request #4123 from rajithr:patch-1
fix build without IPP (and empty 3rdparty)
Merge pull request #4125 from ruslo:interface.include.dirs
fix "non target" warning for "world" build
fix MatAllocator creation/destruction issues
Merge pull request #4132 from mshabunin:fix-java-package
Merge pull request #4072 from vladimir-dudnik:opencl-opencv-interop
Merge branch '2.4.8.x-prep' into 2.4
Merge branch '2.4.9.x-prep' into 2.4
Merge pull request #4143 from Dikay900:ffmpeg_dict
Merge pull request #4140 from mshabunin:fix-java-package
fix cyclic deps error (world,shared)
implement singleton lazy initialization
Merge pull request #4151 from lupustr3:pvlasov/ipp_alignment
Merge pull request #4105 from jayceelock:master
Merge pull request #4124 from ruslo:android.fix
Merge pull request #4156 from mshabunin:fix-neon-intrin
copyTo: fix for big data (4Gb+)
ocl: update generator scripts
ocl: autogenerated files for cl_gl.h
replacement for #4160
merge to resolve conflict
Merge pull request #4150 from alalek:opencv_org_issue_4428
remove legacy intermediate unused files
test vector processing
fix copyTo memory corruption, but the main problem is still here
Merge pull request #4127 from avershov:opengl-opencl-sample
Merge pull request #4168 from Dikay900:export_threadcontrol
update ffmpeg wrapper binaries
ocl: fix unaligned memory access
Merge pull request #4159 from alalek:vector_processing
issue 4457
workaround issue with MatExpr
Merge pull request #4169 from alalek:issue_4457
t-api: try to fix allocator fallback code paths
Merge pull request #4182 from vladimir-dudnik:update_dx_samples
fix wrong usage of status(), remove useless message in videoio
Merge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_flag_polarity
Merge pull request #4187 from SpecLad:chessboard-png
Merge pull request #4184 from alalek:fix_cmake_status
Merge pull request #4193 from jklontz:master
fix python cross-compilation
calib3d: normalize Rodrigues vector in perf test
Merge pull request #4206 from sturkmen72:patch-2
Merge pull request #4202 from PhilLab:patch-5
Merge pull request #4195 from wangyan42164:ocl_pyrlk
fix python cross-compilation
Merge pull request #4192 from avershov:opencl-opengl-buffer
Merge pull request #4004 from paroj:camera-api
Merge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample
fix GCC 4.9 warnings
Merge pull request #4219 from SpecLad:freak-missing-init
Merge pull request #4222 from mshabunin:fix-android-warnings
Merge pull request #4210 from wangyan42164:ocl_umat_convert
Merge pull request #4213 from mshabunin:hal-vextq
fix OpenCV code (bug 4006: #4862)
ocl: add map tests
fixes
tapi: datarace fixup for cvtColor
Merge pull request #5090 from SpecLad:autotune-crash
Merge pull request #5091 from jet47:gpu-sanity-epsilon
Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop
tapi: enable some disabled tests
fix build with Win7 SDK
Merge pull request #5097 from alalek:fix_build
Merge pull request #5107 from vladimir-dudnik:d3d-interop-upd
Merge pull request #5106 from vladimir-dudnik:opencl-opengl-upd
viz: fix precompiled headers definitions
Merge pull request #5096 from terfendail:2.4
vtk: disable on cross-compilation
Merge pull request #5118 from alalek:fix_viz_build
tapi: add test from issue 4380 (#5010)
Merge branch '2.4.10.x-prep' into 2.4
add tests from issue 4468 (#5062)
Merge pull request #5149 from Nerei:minor_comment_fix
Merge pull request #5146 from avershov:fix-issue-5122
Merge pull request #5124 from StevenPuttemans:fix_annotation_tool_2.4
Merge pull request #5125 from StevenPuttemans:fix_annotation_tool
Merge pull request #5132 from hewj03:master
more test loops (and disable tests - tests pass but require a lot of time)
Merge pull request #5135 from alalek:issue_4468
fix some functions for valid processing of empty string content (cstr_==0, len_==0)
fix opengl sample build on Linux (#5067)
Merge pull request #4239 from apavlenko:android_ocl_sample2
android samples: update way to attach native part of OpenCV
Merge pull request #5170 from mshabunin:add-android-pack
Merge pull request #5180 from boatx:bugfix/proper-conversion-of-numpy-array-to-mat
tutorial-4-opencl: enable build with OpenCV
Merge pull request #5179 from alalek:update_android_samples
Merge pull request #5167 from ruslo:suppress.vs.error
Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue
Merge pull request #5192 from D-Alex:master
Merge pull request #5156 from brunomorishita:fix_build
Merge pull request #5193 from ilya-lavrenov:valgrind_error
Merge pull request #5116 from lenlen:viz_improvement
c++ move semantics for cv::Ptr<>
c++ move semantics for cv::Mat
c++ move semantics for cv::Mat_
c++ move semantics for cv::UMat
fixes for MSVS compiler optimizer
Merge pull request #5194 from mshabunin:add-contrib-tutorials-root
Merge pull request #5185 from mshabunin:fix-rgbe-header-parse
Merge pull request #5208 from ilya-lavrenov:cmd
Merge pull request #5176 from vladimir-dudnik:master
Merge pull request #5212 from thebucc:master
Merge pull request #5203 from ilya-lavrenov:valgrind_error
Merge pull request #5199 from TheodoreT:tickmeter_update
Merge pull request #5094 from SpecLad:f2d-ts-rng
Merge pull request #5148 from StevenPuttemans:fix_4237
Merge pull request #5177 from lupustr3:pvlasov/tls_fixes
Merge pull request #5195 from mshabunin:warn-missing-contrib
Merge pull request #5223 from ilya-lavrenov:warpaffine_valgrind
Merge pull request #5161 from alalek:fix_string
Merge pull request #5226 from ilya-lavrenov:valgrind_memory_leak
Merge pull request #5222 from apavlenko:android_ocl_tutorial
Merge pull request #5171 from avershov:opencl-vaapi-interop
tls: fix access to array (out of bounds)
Merge pull request #5235 from philippefoubert:issue_5234
Merge pull request #5238 from LorenaGdL:master
samples: fix OpenCL detection / build warning
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
fix build with python3 only
Merge pull request #5246 from mshabunin:ccache-fix
Merge pull request #5250 from SpecLad:missing-conflicts
Merge pull request #5260 from vipul-sharma20:vipul-sharma20-docs
Merge pull request #5262 from jet47:gpu-stereobp-fix
Merge pull request #5274 from ilya-lavrenov:features2d
Merge pull request #5281 from ilya-lavrenov:ml2
Merge pull request #5285 from ilya-lavrenov:ml5
Merge pull request #5289 from ilya-lavrenov:flann
Merge pull request #5282 from mshabunin:mingw-51
update custom_ptr test
UMat: add perf test for custom ptr
Merge pull request #5297 from ilya-lavrenov:flann
Merge pull request #5300 from ilya-lavrenov:cuda_warnings
Merge pull request #5299 from ilya-lavrenov:core_hog
Merge pull request #5303 from berak:patch-3
Merge pull request #5316 from mshabunin:fix-contrib-tests
cmake: use copy_if_different
Merge pull request #5292 from alalek:tapi_custom_ptr
Merge pull request #5293 from alalek:tapi_custom_ptr_perf
ocl: workaround for getUMat()
Merge pull request #5325 from jet47:gpu-stereobp-fix
Merge pull request #5290 from ilya-lavrenov:cmake_bug
Merge pull request #5317 from alalek:workaround
ocl: correct disabling of OpenCL code
ocl: temporary restore OpenCL tls data (ocl.cpp without fix)
fix "unreachable code" warning
Merge pull request #5335 from Dikay900:ports_to_master
Merge pull request #5343 from paroj:boolean_algebra
Merge pull request #5360 from SpecLad:test2-fail-on-failed-download
Merge pull request #5355 from renatoGarcia:master
Merge pull request #5349 from lupustr3:pvlasov/tls_update
add some CommandLineParser tests
Merge pull request #5329 from paroj:cliparser
Merge pull request #5366 from taketwo:use-stream-in-bilateral-filter
Merge pull request #5361 from alalek:update_ffmpeg_support
Merge pull request #5341 from blebo:py3compat
Merge pull request #5372 from alalek:cmd_tests
Merge pull request #5371 from Dikay900:ports_to_master
Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix
fix perf tests
Merge pull request #5383 from alalek:fix_tests
fix perf tests
cmdparser: allow empty strings
fix Android camera datarace (mCameraFrameReady)
Merge pull request #5381 from robertxwu:Bugfix_for_issue_#_of_5145
Merge pull request #5379 from sturkmen72:patch-9
Merge pull request #5382 from paroj:parserthrow
Merge pull request #5363 from avershov:opencl-vaapi-detect
Merge pull request #5396 from alalek:pr_5377_squashed
fix #5264
Merge pull request #5295 from LorenaGdL:ml-svm_tutorials
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
Merge pull request #5391 from paroj:parser_nonempty
Merge pull request #5403 from sturkmen72:patch-9
move IPPICV binaries to GitHub opencv_3rdparty repository
disable String(int) ctor
Merge pull request #5406 from cbalint13:master
Merge pull request #5398 from asmorkalov:as/wrong-name-for-changelog-of-native-package
Merge pull request #5405 from lupustr3:pvlasov/ipp_functions_refactoring
Merge pull request #5415 from lupustr3:pvlasov/ipp_version_change
Merge pull request #5419 from lupustr3:pvlasov/ipp9_integration
Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes
Merge pull request #5436 from jet47:fix-cuda-normalize
Merge pull request #5399 from alalek:fix_5264
fix ffmpeg frame creation (fix #5439)
Merge pull request #5453 from paroj:capgstleak
Merge pull request #5429 from PhilLab:patch-6
ffmpeg: fix invalid NULL pointer access
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation
Merge pull request #5454 from alalek:fix_ffmpeg_priv_data
Merge pull request #5458 from berak:fix_putText
Merge pull request #5459 from aman11dhanpat:master
Merge pull request #5461 from berak:fix_putText_24
workaround for 32-bit OS on 64-bit x86 CPU
Merge pull request #5462 from alalek:fix_x86_detection
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
Merge pull request #5460 from sergiud:highgui-autosize-gtk3
Merge pull request #5468 from AVshokurov:master
Merge pull request #5470 from apavlenko:android_camera_gl_view
Merge pull request #5471 from StevenPuttemans:add_images_python_tutorials
cleanup <build>/src|gen folders to remove stalled/unused Java files
Merge pull request #5490 from ilya-lavrenov:mem-leak-calib3d
Merge pull request #5491 from ilya-lavrenov:video-writers-delete
android: force OpenCV library target to "android-21"
android: add targetSdkVersion="21"
Merge pull request #5486 from amroamroamro:fix_ml_randMVNormal
Merge pull request #5494 from asmorkalov:as/deb_copyright
Merge pull request #5498 from asmorkalov:as/copyright_headers
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
Merge pull request #5504 from aman11dhanpat:master
Merge pull request #5505 from a-andre:highguiheader
Merge pull request #5509 from spmallick:master
Merge pull request #5507 from rodrigob:patch-1
Merge pull request #5511 from paleozogt:android-64-bit
Merge pull request #5478 from alalek:fix_android_pack_build
export simple libs from OPENCV_LINKER_LIBS (fix #5541)
Merge pull request #5431 from MiguelAlgaba:em_one_cluster
Merge pull request #5545 from alalek:fix_linker_libs
Merge pull request #5552 from hyunkim9123:camshift-2.4
Merge pull request #5513 from jet47:ctest-extended-support
Merge pull request #5531 from mshabunin:fix-vs2015
Merge pull request #5568 from asmorkalov:as/legacy_c_deb_pack_dep
Merge pull request #5474 from paroj:v4l2ctrls
Merge pull request #5489 from paroj:v4l2noconvert
Merge pull request #5553 from pletessier:aspect-ratio
Merge pull request #5570 from paroj:qsliderfix
Merge pull request #5538 from micalan:JpegExif
Merge pull request #5370 from berak:fix_svm_autoTrain
Merge pull request #5574 from ilya-lavrenov:image-sequence-videocapture
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
Merge pull request #5641 from alalek:backport_5320
Merge pull request #5655 from janstarzy:2.4-canny-fix
Merge pull request #5652 from jet47:core-test-math-warning-fix
Merge pull request #5671 from PhilLab:patch-7
Merge pull request #5685 from lupustr3:pvlasov/ipp9_fixes
Merge pull request #5698 from lupustr3:pvlasov/ipp9_fixes
Merge pull request #4110 from LaurentBerger:Bug4370
Merge pull request #5714 from ajbernal:OCL_HOG_Fix
Merge pull request #5633 from mshabunin:doc-mser
Merge pull request #5708 from comdiv:#5707
Merge pull request #5727 from lupustr3:pvlasov/ipp_warnings_fix
ippicv: update 20151201 (9.0.1)
Merge pull request #5725 from alalek:ippicv_update_20151201
Merge pull request #5572 from paroj:nov4l1
Merge pull request #5742 from GabrieleDalmazzone:GabrieleDalmazzone-patch-1
Merge pull request #5747 from Sethur:patch-1
Merge 2.4 into master
pthreads: remove usage of non-POSIX PTHREAD_RECURSIVE_MUTEX_INITIALIZER* defines
checkRange fixes
Merge pull request #5723 from dtmoodie:win_gst
libpng: update 1.6.19 - November 12, 2015
libpng: re-apply patch
NEON flags fix
cmake: DOWNLOAD_EXTERNAL_TEST_DATA option
fix samples deps
distrib: remove useless static files from shared distribution package
warning fix (MSVS2015)
world build: fix modules instantiation order
disable ts module if it is not used: BUILD_TESTS=OFF and BUILD_PERF_TESTS=OFF
pkg-config: remove $<LINK_ONLY:...> expressions
include "cvconfig.h"
workaround: cvconfig.h doesn't work with hal at this moment
UMat access flags (fixes #5095)
fixes #5018: fix framework links in opencv.pc (MacOS)
fixes #5019: python and java bindings become CMake modules (loadable plugins)
Merge pull request #5795 from alalek:fix_5095
fixes #5066: laplacian: "y" may contain negative values
fixup
Merge pull request #5809 from alalek:fixup
fix build warning (unreachable code) and exit error codes
Merge pull request #5813 from alalek:fix_warning
Merge pull request #5812 from qubick:master
ocl: fix buffer pool small allocations issue (fixes #5815)
android samples: force setVisibility (see #5812)
fix build
Merge pull request #5827 from alalek:winrt_build_fixup
Merge pull request #5818 from alalek:android_set_visible
Merge pull request #5817 from alalek:fix_ocl_buffer_pool
update osx and ios build_framework.py
Merge pull request #5829 from mshabunin:fix-version-check
Merge pull request #5828 from mshabunin:CommandLineArgs
change links from samples/python2 to samples/python
rename samples/{python2 -> python}
Merge pull request #5801 from enpe:matlab-switch
fix include path for windows package
Merge pull request #5832 from alalek:python_samples
Merge pull request #5834 from alalek:fix_winpack_include_path
python: add launch script for winpack python demo
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
Merge pull request #5835 from alalek:fix_winpack
Version for 3.1.0 release
fix MSVS2010 builds
fix android pack
Alexander Duda (2):
cv::stereoRectify: fix segfault in case of empty distCoeffs
cvCreateCameraCapture: fix using preffered interface
Alexander Karsakov (7):
Fixed dst size
Revert changes by PR#2930 since it breaks logic of inverse mode.
Fixed getConversionInfo() for YUV2RGBA_* conversions
Fixed range for 'v' channel for 8U images.
Fixed range for 'v' channel for 8U images.
Fixed getConversionInfo() for YUV2RGBA_* conversions
Fixed getPolicy() method to make it thread-safe.
Alexander Nitsch (7):
Implement CMAKE_CURRENT_LIST_DIR for older CMake
Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
Fix MinGW detection on x86
Fix setting of architecture for MinGW builds
Fix MinGW architecture detection
Fix MinGW detection on x86
Remove local variables from CMAKE namespace
Alexander Petrikov (1):
Add CV_Assert (ndisp % 8 == 0) to NEON version
Alexander Smorkalov (126):
Initial Linux packages build rools for CPack.
Improvements in package build.
OpenCV version++
All installed files marked with component names for install customization.
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
Code review notes fixed.
Multiple fixes for tests deb package build.
opencv_run_all_tests.sh script added to -tests package.
OpenCV Manager version++.
Android toolchain file sync with original project.
Reports path fix for opencv_run_all_tests.sh.in script.
Highgui test output fixes.
Merge branch 'android_manager_version_inc4' into 2.4.8.1-prep
Absolute path to tests in opencv_run_app_tests.sh fixed.
Implicit testdata directory permissions setup added.
Tests install path fix for Android SDK.
project.properties file generation fixed for per-component installation.
Multiple improvements in OpenCV examples build.
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
OpenCV version++.
opencv_run_all_tests.sh implemented for Android SDK.
LICENSE and README files installation rules added.
Application pause/resume fix for Android sample NativeActivity.
Dead code removed as this cannot be null in Java.
Bug #3611 Initializing static cv::Mat with cv::Mat::zeros causes segmentation fault fixed.
Build fixes for CUDA 6.5
Build fixes for CUDA 6.5
Build fixes for CUDA 6.5
Deb package build fix for CUDA 6.5 and newer.
More accurate deb package build fix for CUDA 6.5 and newer.
Deb package build fix for CUDA 6.5 and newer.
More accurate deb package build fix for CUDA 6.5 and newer.
Deb package build fix for CUDA 6.5 and newer.
More accurate deb package build fix for CUDA 6.5 and newer.
Merge branch 'fix_androidcamera_preview_usage_bits' into 2.4
Android native camera rebuilt after sources update.
GCC 4.8 warning array subscript is above array bounds fixed.
GCC 4.8 warning array subscript is above array bounds fixed.
Several fixes for lintian varnings
Several fixes for lintian varnings
OpenCV version++.
Fix non-Android cross compilation with OpenCVConfig.cmake
GPU MatchTemplate32F test epsilon increased.
Python tests added to -tests deb package.
OpenCV version++.
Added implicit dependency from python and python-py to debian packages.
Exclude OpenCL tests from default test list for Android as they are experimental.
OpenCV Manager version++.
GStreamer 1.0 backport from master branch.
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
Test fisheye.rectify disabled for Tegra.
OpenCV Manager hardware detector workaround for not detected ARM SoC support.
Turn off superres accuracy tests if video i/o is not supported.
doc/check_docs2.py warnings fixes
Fixes for QNX 6.6 Neitrino support.
Version++.
Fix of HaarCascade GPU test for aarch64.
TBB updated to 4.3u2. Fix for aarch64 support.
Full AARCH64 support with NEON and new CUDA toolkit.
More accurate fix for libtiff and aarch64.
Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.
parallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h
More accurate AVX and AVX2 control.
OpenGL interop sample reworked not ot use cvconfig.h
parallel_do replaced with parallel_for_ in driver_gpu_multi sample.
driver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do
Build fixes for GPU samples.
GPU samples with NVIDIA specific API excluded from build if CUDA disabled.
Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.
Fixed -samples debian package dependencies.
TIFF support hack for aarch64 reverted.
Prevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.
Added OpenCV 3.0 compat header for TS module.
opencv_testing.sh script installation is removed as run tests script does the same thing.
Added dependency from numpy to debian package with python bindings.
Added Debian changelog installation step for Debian package generation.
Fixed samples install permissions for Debian packaging.
Debian package names replaced by lower case version to satisfy lintian.
Added Debian changelog to -tests package.
Android 5 support and aarch64-related fixes for Android Manager.
Build fix for case without TegraDetector.
OpenCV and OpenCV Manager version++
Merge pull request #3732 from StevenPuttemans:fix_4004_2.4
Merge pull request #3708 from StevenPuttemans:fix_traincascade_load_message
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir
Merge pull request #3739 from ilya-lavrenov:2_4_cc
Merge pull request #3735 from SpecLad:align-cpack-variables
Merge pull request #3677 from ilya-lavrenov:cuda_backport
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
Documentation update after iOS warnings fix in contrib/retina header.
Merge pull request #3893 from SpecLad:cuda-imported-targets
Added Debian changelog installation step for Debian package generation.
Added dependency from numpy to debian package with python bindings.
opencv_testing.sh script installation is removed as run tests script does the same thing.
Fixed samples install permissions for Debian packaging.
Debian package names replaced by lower case version to satisfy lintian.
Added Debian changelog to -tests package.
Merge pull request #3924 from jet47:gpu-fixes
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
Merge pull request #3989 from asmorkalov:as/tbb_dep
Merge pull request #3976 from SpecLad:rm-insertIframe
Merge pull request #3990 from jet47:cuda-bitwise-mask
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
OpenCV patch verison++.
Merge pull request #3785 from jet47:tiny-gpu-module
Precise default CUDA version for Tegra X1 chips.
Merge pull request #4033 from jet47:gpu-tests-fix
Merge pull request #4030 from asmorkalov:as/accurate_cuda_arch_aarch64
Version++.
Debian packages header update to fix conflict with OpenCV from deb repo.
Merge pull request #4034 from jet47:opencv_run_all_tests_unix
Merge pull request #4191 from SpecLad:irc-workaround
Merge pull request #5092 from etalanin:update-branch-to-2-4-12
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
Debian packages header update to fix conflict with OpenCV from deb repo.
Fixed wrong-name-for-changelog-of-native-package warning for deb packages.
Debian formatted copyright file added to all debian packages.
Added missing copyright headers.
Set of lintain warning fixes for -samples debian package.
Made samples build independent from nonfree module.
Fixed samples build with nonfree.
Merge pull request #5501 from asmorkalov:as/samples_lintian_fixes
Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples
Debian packages with legacy C headers added to list of conflicts, relpaces, etc.
Merge pull request #5713 from ilya-lavrenov:lintian
Build fix for QNX 6.6 neitrino.
Alexander Stohr (1):
not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt
AlexanderStohr (1):
fix VS2010 error with type mismatch due to volatile qualifier
Alexey Ershov (17):
OpenGL OpenCL sample
fixed cleanup, fixed unused context
eliminated unused function __OpenCLinitializeGL(), simplified query device logic
added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment
fixed memory leaks
added command line processing
change displaying of fps to time (ms)
applied changes proposed in 5122
implemented core support & sample
fallback path & sample timing implemented
separated UMat & Mat usage in interop/copy paths
fixed argument in call to {Input|Output}Array.getMat()
added run iteration without timing to complete internal initializations
changed call to getDefault: false to true in fallback initialization
sample changed to execute only one mode (interop on/off) per run
implemented sample build in fallback mode without interop
changed device detection procedure, added resizing surface to bigger size
Aman Verma (4):
Adding fix for issue 5451 "putText fails with empty std::string"
Fix for #5481, removing repeated/useless assignment in contours.cpp
Fix for #5495 : add setTrackbarMin
Fixing compilation errors in windows and mac
Amro (1):
fix randMVNormal in ML (#5469)
Anatoly Baksheev (2):
viz: fixed memory leak, issue 3961
minor comment fix
Andreas Franek (1):
Simplifies cross compilation with CUDA for ARM boards. CUDA arch is set for all ARM targets, --unresolved-symbols=ignore-in-shared-libs is set when cross-compiling for ARM and FindCUDA.cmake was adjusted to find shared library stubs within the CUDA toolkit.
Andreas Stührk (5):
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.
Fix test name.
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
TIFF loader: Pass buffer size to read functions.
Update link to information about Android platform.
Andrew Senin (2):
Fixing XIMEA parameters mapping (issue #4176)
Ximea camera fix (see issue #4235)
Andrey Kamaev (3):
silence cmake 3.0+ warnings on LOCATION attribute
Assorted fixes:
Fix Android build with the most resent android.toolchain.cmake
Andrey Pavlenko (35):
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
improving face-rec sample:
Merge pull request #3219 from mshabunin:png_iccp_strip_24
Merge pull request #3291 from asmorkalov:android_superres_video_check
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
Merge pull request #3726 from asmorkalov:ocv_version_inc4
fixing confusing variable naming in a sample code
adding test for `polylines()` call with empty Point-s vector and fix for crash in this case
Merge pull request #3961 from apavlenko:2.4_fix_polylines_empty
releasing native memory in Java converters
releasing native memory of temp `Mat` objects in generated Java code
Camera and Camera2 preview is rendered via OpenGL textures and can be modified on CPU via C++ code. No OpenCL yet.
adding OpenCL processing (Image2D-to-Image2D only, others will be added later)
adding OpenCV with TAPI (UMats)
minor fixes
excluding libOpenCL.so from the APK
adding displaying FPS
adding mode switching via menu
Android camera + OpenCL tutorial (for existing code at samples/android/tutorial-4-opencl)
Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6b21debd461808f584accbe7c42c869)
fixing 'map_unmap_counting'
making the test deepper
removing a garbage comment
fixing start faulure on some devices; syncronization improvements
adding `NO_PROCESSING` (i.e. just preview) mode
unused imports clean-up
giving a chance for OpenCL 1.1 devices
man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in `UMat::getMat()`
draft implementation of alternative CameraBridge via GLES
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView
minor fixes
fix build with CMake
Anton V. Shokurov (2):
Adds support for property CV_CAP_PROP_FOCUS in functions cvSetCaptureProperty and cvGetCaptureProperty.
The latest version (5.1.1) of the gnu compiler returns just its major version ("5") when given the "-dumpversion" argument. Gnu compiler developers don't consider this to be an error. A workaround for this case has been made.
Antonella Cascitelli (1):
Added new functionalities to viz module
Anush Elangovan (1):
Add Android ARMEABI_V7A_HARD for Hardfp support
Ariel Bernal (2):
Fix for #5590. OpenCL BilateralFilter implementation failes to
Fix for #5710. OpenCL HOG Object detect assigns the wrong SIMD size.
Artur Wieczorek (13):
Fixed compilation errors under VS 2010 and Win 7
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
CMake configuration for MSMF capture
Fixed MSMF video capture initialization
Fixed assertion warning in MSMF frame grabber
Fixed MSMF file capture error while opening the file containing unsupported video stream format
Fixed CMake issue with FFMPEG highgui configuration
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
Remove ATL dependency from MSMF capture code
Fixed selecting media type in DShow video capture.
Fixed media type GUID for I420 format in DShow capture.
Fixed getting CV_CAP_PROP_FOURCC property value
Fix determining bounding box of the edge collection in FillEdgeCollection().
Ashley Stacey (1):
Fix pdb file generation on Windows for CMake versions after 3.1.0.
Ashod Nakashian (1):
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
Balint Cristian (2):
Speedup AGAST nonmax-suppression.
Fix KAZE/AKAZE descriptors to use angle instead radians.
Belev (1):
Fix typo
Ben Hagen (2):
Do not blacklist GStreamer on Apple
store user-provided data in PlaneTracker class
Benoit Seguin (1):
Fixing a line where integer data was treated as floating point data.
Bert (1):
Update system.cpp
Boris Daskalov (1):
Fix a bad free space check in icvGrowSeq.
Bovaz (2):
sqrtf to std::sqrt
Merge pull request #1 from Bovaz/Bovaz-patch-1
Brian Park (1):
add input paramter checking that verifies the existance of the input files to stero_match example
Bruno Goncalves (2):
fix build error when both OpenNI and OpenNI2 are supported (issue 4918)
fix documentation code formulas
Camille (3):
bug fix 3696
bug fix 3381
bug fix 3381
Chris Kitching (1):
Make Mat assertion failures more helpful
Chris Mayo (1):
Act on INSTALL_PYTHON_EXAMPLES
Christian Richardt (1):
Fixed triangulation bug http://code.opencv.org/issues/4334.
ComFreek (1):
Corrected package name in tutorial
Craig Reynolds (1):
In cvAddText, construct QString from "text" using fromUtf8.
Cédric Rousseau (3):
Fixed the formula to compute the well-exposedness weight map.
Set the default value of exposure_weight in createMergeMertens to 1.0
Reverts "Set the default value of exposure_weight in createMergeMertens to 1.0" because it breaks source code compatibility and tests
Dan (14):
Added tutorials for using thrust.
Added thrust tutorial.
Improved thrust interop tutorial.
improved comments.
Missed one conversion of CV_TYPE to cv::DataType
More whitespace fixes.
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
Looks like something automatically added tabs back in after I already fixed the white space. :/
Improved consistency.
Corrected the case where channel == -1
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
Cherry pick failed to grab interface changes.
nullptr -> NULL
Gstreamer 1.0 on windows.
Dan Moodie (4):
Fixed tabs in whitespace.
Removed last trailing whitespace. Can't believe I missed it.
Updated input / output array to support std::vector<cv::cuda::GpuMat>
Clarified default allocator interface.
Daniel Stonier (2):
support invokation of cv windows from parallel threads to an external qt application.
make sure children are included in the moveToThread
Deanna Hood (1):
Return uncompressed support vectors for getSupportVectors on linear SVM (Bug #4096)
Dikay900 (10):
update openni sample comments referring #81
filename correction from #3217
use constant instead of value backported from #785
fix qt example on 2.4 with vs2010 and higher
fix one dict parameter in ffmpeg implementation (introduced while porting)
export thread control to python aswell
proposed change by psyill
PR #4003
changes to reflect 3.0 status
appropriate logic behind last accepted stage when rejectingLevels is true
Dinar Ahmatnurov (4):
added Cyrillic;
fixing issue with "ёЁ";
fix issue with font;
fixed issue with malformed UTF-8 string;
Dmitry Budnikov (1):
ipp_countNonZero build fix;
Dmitry Gribanov (1):
Feature based stitching's wave correction bugfix.
Dmitry Melnichenko (2):
Fix build of Java-Sbt sample
Change SURF to ORB in Java-Sbt sample to remove dependency on external non-free modules
Dominik Kleiser (5):
Bug #3800 - Resize viewport when CV_WINDOW_KEEPRATIO was set (Qt)
Fix the unit of angle for AKaze/Kaze KeyPoints
use floats for the calculation
use float for CV_PI
Merge remote-tracking branch 'origin/master' into angle_unit
Drew Jetter (1):
Fixed bug #3489: The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent.
E Braun (8):
regression test for bug 3172
fix for bug 3172
Revert "fix for bug 3172"
fix for bug 3172
regression test for bug 3172
fix for bug 3172
Revert "fix for bug 3172"
fix for bug 3172
Ehren Metcalfe (1):
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389)
Elad Joseph (4):
Update documentation in calib3d.hpp
Add HDR tutorial to the python tutorials
fixed whitespace
fixed whitespace
Elena Shipunova (3):
do not proceed with removing zero-length slice
do not proceed with removing zero-length slice
Fix in fisheye calibrate function: #5389
Enes Ateş (2):
XML file path correction
XML file path correction
Eric Sommerlade (1):
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
Evgeny Agafonchikov (1):
Adding test support for WINRT
Evgeny Talanin (2):
Increase version to 2.4.12
Increase Android Manager version
Firat Kalaycilar (1):
minor fix to make "updateBackgroundModel=false" option meaningful.
Florent (1):
Fixed histogram substraction bug with NEON instructions (arguments in wrong order).
GabrieleDalmazzone (1):
Race condition bug-fix in hog.cu
Gleb Gladilov (4):
Fixed minMaxLoc and test functions
Added test of minMaxLoc on filling with maximums of int
Fixed minMaxLoc and test functions
Added test of minMaxLoc on filling with maximums of int
Gregory Morse (3):
Update CMakeLists.txt
Update CMakeLists.txt
merge Win10/VS2015 changes
GregoryMorse (2):
Add VS2013 support
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, a [...]
Grigory Serebryakov (8):
Can create training set in PNG format
Typo in string fixed
Class naming update
Naming fixes and code beautification
No output image resize in case of PNG dataset
Documentation update: createsamples usage
Include for cvSameImage corrected
Warning on converting int to bool fixed
Hajo Nils Krabbenhöft (3):
fix crash for large BW tif images
buffer_size should be in bytes, not bits
Fixed crash when reading b/w tif images (fixes #5579)
HelenWong (1):
Fix#3714:Improve Display Image Tutorial
Hernan Badino (3):
Switched insertion of connected components in filterSpecklesImpl
Merge branch '2.4' of https://github.com/Itseez/opencv into Itseez-2.4
Merge branch 'Itseez-2.4' into Feature_3692_2.4
Ignas Daukšas (1):
Add cameraMatrix parameter to findEssentialMat and recoverPose
Igor Kuzmin (3):
fix for issue 3858 (remove unneeded #include's)
XIMEA cam support: use correct library for 64 bit Linux
XIMEA cam support: allow on OS X too
Ilya Lavrenov (68):
fixed bug #3341
fixed bug #3319
eliminated possible memory leak
fixed docs
TCP instead of UDP
attemp to fix dox warning
ability to enable OpenMP simultaneously with other parallel framework
update android.toolchain.cmake
fixed cross-compilation for Android with CUDA
backport from master
typo
suppress -Wclobbered warning
rmeoved unused functions
fixed find cuda for aarch64
fixed tests for aarch64
fixed warning
fixed Android mk generation for arm64-v8a
fixed OS names
fixed valgrind warning in polylines
fixed memory leak in core ds tests
fixed memory leaks in cvtyuv tests
fixed memory leaks in floodfill tests
fixed memory leaks in warpAffine tests
fixed uninitialized values warning in bad arg test class
fixed typo
repaired gstreamer camera capture:
typo
repaired GStreamer 0.10 version
added some property setting and getting
used proper method
fixed "Conditional jump or move depends on uninitialised value" warning
fixed memory leak caused by illegal memory access
fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp
fixed memory leak in descriptor regression tests
fixed memory leak in ml module
fixed memory leak in ANN
release filestorage before exception
fixed "Conditional jump or move depends on uninitialised value(s)" in GBD
fixed memory leak in GBTrees
fixed memory leak in flann index
fixed uninitialized memory writing/reading in flann
initialize padding of CvString with zeros
fixed warnings in gpu module
fix for corrent modules dependencies
fixed valgrind warning in polylines
fixed memory leak in core ds tests
fixed memory leaks in cvtyuv tests
fixed memory leaks in floodfill tests
fixed memory leaks in warpAffine tests
fixed typo
typo
fixed "Conditional jump or move depends on uninitialised value" warning
fixed memory leak caused by illegal memory access
fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp
fixed memory leak in descriptor regression tests
fixed memory leak in GBTrees
fixed "Conditional jump or move depends on uninitialised value(s)" in GBD
initialize padding of CvString with zeros
fixed uninitialized memory writing/reading in flann
fix for corrent modules dependencies
fixed memory leak in findHomography tests
delete video readers
allow to retrieve videocapture properties before first frame reading
fixed case when grabbing failed
return false in grabFrame failed in open method
GraphCut deprecated in 7.5 and removed in 8.0
added lintian overrides for debian packages
added suppression for python-script-but-no-python-dep
Ishank gulati (1):
corrected cv::merge documentation
Ishant Mrinal Haloi (4):
Update multi.cpp
Update driver_api_multi.cpp
Update cascadeclassifier_nvidia_api.cpp
Update driver_api_stereo_multi.cpp
Jaime Fernandez (1):
BUG: ndarray to Mat conversion with NPY_RELAXED_STRIDES set
Jan S. (Milania1) (2):
Added example to the documentation for the normalize() method
Added example to the documentation for the NormTypes enum (L1, L2, INF)
Jan Starzynski (1):
fix potential buffer overflow as in 3.0
Jay Bosamiya (1):
Fix typo
Jeremy Huddleston Sequoia (1):
Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5
Jie Yang (1):
Fix SVM::trainAuto (Bug #4464)
Joe Howse (1):
Cat face detection cascades
John Stowers (2):
fix digits.py to not ignore model parameters
remove picloud from digits_adjust
Jonas Vautherin (1):
Patch for NDK r10
Josh Klontz (1):
fixed conditional compilation of RGB2Gray<ushort> template specialization
Jüri Aedla (1):
Android camera qcom HAL doesn't like it when no consumer usage bits are set. Set a usage bit for preview BufferQueue.
Kauê de Moraes Vestena (1):
little fixes and correction of a conceptual error
Kazuki Matsuda (1):
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
Keita Kita (1):
Add documentation about detail of image type
Kevin Hughes (1):
squashed #823
LaurentBerger (6):
move data/detect_blob.png in samples/data
A new constant in adaptivethreshold is created to calculate
In adaptiveThreshold ADAPTIVE_THRES_GAUSSIAN_C gaussianBlur is computed using float
Test for adaptive thresh will give FAIL_BAD_ACCURACY for old
remove test
fixed #5005: stitching_detailed.cpp
Lectem (1):
fix mutex for uclibc
Leonid Beynenson (2):
Fixed bug in cv::detail::waveCorrect
Fixed bug which caused crash of GPU version of feature matcher in stitcher
LeonidBeynenson (1):
Added a TODO comment about changes which should be done in GpuMatcher::match
Leszek Swirski (1):
Fix reallocation of D buffer in gemm
Lorena García (12):
Update data.cpp
Whitespace error
Whitespace error
Indent fix
Small update of Colormap documentation
TrainData doc update
ml_svm_tutorials version note added
Change in links
Hit&Miss morphological operation
Fixed CV_Assert
Changed src matrix complement computation
Hit and Miss morphological op
Luis Díaz Más (2):
Fixing the bug #4244 that I just reported in code.opencv.org
Fix a bug that impede to set the trackbar pos using the Qt control panel
Maksim Shabunin (140):
Changed cmake python library search startegy for crosscompiling
Stripped iCCP chunk from png files
Fixed warning during cross compile for ARM
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
Merge pull request #3282 from asmorkalov:android_exclude_ocl
Merge pull request #3297 from asmorkalov:ocv_docs_fix
Fixed highgui drawing test
Basic doxygen documentation support
Merge pull request #3336 from BKNio:putText_develop2
iOS framework build script changes
Fixed iOS framework compilation warnings
iOS framework build script changes from master branch
Merge pull request #3417 from ilya-lavrenov:dox_warn
Python test: new options provide local test data paths
Some changes to make migration to 3.0 easier
Fixed memory leak in ML module
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4
Merge pull request #3969 from Dikay900:master_to_2_4
Merge tag '3.0.0'
Python generator: moved base class handling to the generate step
Fixed compilation of pthread-based parallel_for with gcc 4.4.3
Trying to fix flann python wrapper issue
NumpyAllocator: check reference count before actual release, revert flann changes
Merge pull request #4095 from alalek:hal_unresolved_symbols
Separate OpenCV.mk files for different ABIs
Updated android toolchain
Added interface libraries for android opencv_java
Increase android samples versions
Updated android manager readme file
Merge pull request #4128 from alalek:fix_noipp_build
Merge pull request #4134 from alalek:fix_get_target_property
Merge pull request #4133 from ruslo:interface.sample
Merge pull request #4103 from mtamburrano:master
Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms
Fixed build with CUDA
Merge pull request #4152 from mshabunin:fix-cuda-build
Fixed transpose intrinsic prefix for NEON
Merge pull request #4147 from alalek:fix_world_cyclic_deps
Merge pull request #4190 from sbokov:fixingStereoBMissue
Fixing GCC 4.9 warnings
Fixed loop check
v_extract universal intrinsic
Merge pull request #4196 from alalek:fix_python
Merge pull request #4220 from alalek:fix_gcc_warnings_2_4
Merge pull request #4211 from alalek:fix_python_2_4
Merge pull request #4179 from sbokov:improvingStereoSGBM
Merge pull request #4232 from berak:patch-2
Merge pull request #5093 from sturkmen72:patch-5
Merge pull request #5081 from sbokov:Adding_HAL_v_extract
Documentation: adding Google Custom search block to each header
Fixing possible corruption for big training data sizes
Android SDK build Initial
Fixed whitespace issue
Merge pull request #5168 from alalek:fix_5067
Merge pull request #5151 from mshabunin:fix-training-data-corruption
Merge pull request #5140 from PhilLab:patch-3
Fixed RGBE images header parsing (fixes #4885)
Added auto-generated root page for all contrib tutorials
Merge pull request #5154 from brunomorishita:patch-1
cmake: Added missing extra modules warning
Merge pull request #5114 from a-andre:missingHeader
Merge pull request #5231 from alalek:fix_tls
Disabling precompiled headers when ccache is detected
Fixed ccache detection condition
Merge pull request #5249 from alalek:build_with_python3_only
Some changes to support mingw-w64
fixup! Some changes to support mingw-w64
fixup! Some changes to support mingw-w64
Fixed: Concurrency static scheduler release failed
Merge pull request #5258 from sturkmen72:patch-6
Merge pull request #5321 from alalek:copy_if_different
Enabled pthreads backend for mingw
Merge pull request #5255 from berak:java_videowriter
HAL universal intrinsics tests and documentation
Warning fix
Merge pull request #5395 from enesates:patch-2
Merge pull request #5393 from enesates:patch-1
Visual Studio 2015 warning and test fixes
Merge pull request #5519 from hyunkim9123:camshift_py
Enable temp objects destruction test for VS versions less than 2015
Merge pull request #5432 from sturkmen72:patch-11
Merge pull request #5365 from sturkmen72:patch-2
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
Merge pull request #5500 from StevenPuttemans:fix_mask_notice_copyTo_2.4
Merge pull request #5533 from sturkmen72:patch-12
Merge pull request #5562 from rodrigob:patch-2
ts: refactor run.py script
Fixed cmake and build issues when using Visual Studio 2015
ts: refactor run.py script
Merge pull request #5384 from mshabunin:run-py-changes
Merge pull request #5575 from mshabunin:fix-vs2015-2.4
Added some documentation for MSER
Restore ts/gpu_perf.hpp, trying to compile with VS 2015
Merge pull request #5640 from mshabunin:restore-ts-gpu
Fix run.py test detection issues for debug VS configurations
run.py: issues with forced configuration fixed
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
Merge pull request #5672 from ilya-lavrenov:npp-graphcut
Merge pull request #5659 from jet47:cuda-wrap-stream-2.4
fixup! run.py: issues with forced configuration fixed
Merge pull request #5681 from sturkmen72:patch-3
Merge pull request #5665 from paroj:matx_norm
Merge pull request #5663 from bertmsk:patch-1
Merge pull request #5653 from jia-kai:fix-jpeg-exif
Merge pull request #5666 from mshabunin:vs-run-py
Merge pull request #5650 from hoangviet1985:fix_bug_5623
Merge pull request #5649 from hoangviet1985:solve_pow(x,3)=0_opencv300
Merge pull request #5525 from Milania1:doc_normTypes
Merge pull request #5448 from Milania1:doc_normalize
Merge pull request #5298 from slothspot:master
Merge pull request #5449 from rokm:stereo-fixes
Merge pull request #5658 from berak:akaze_fix
Merge pull request #5571 from jas0n1ee:master
Merge pull request #5720 from asmorkalov:as/cuda_qnx
HAL: improvements
HAL: fixed header path
Merge pull request #5741 from PolarNick239:master
Fixed some build issues
Fixed NEON compilation issue
Fix documentation warning
Merge pull request #3540 from AlexanderUsentsov:good_feature
Merge pull request #5756 from mshabunin:smooth_neon_fix
Coverity: uninitialized values in ExifEntry_t structure
Coverity: fixed some negative argument issues
Coverity: uninitialized fields in Stitcher
Coverity: memory leak in OpenEXR reader
Coverity: fixed uninitialized fields in test_goodfeaturetotrack
Coverity: fixed uninitialized field in ExifReader
Valgrind: do not use uninitialized data in optflow
Valgrind: fixed uninitialized image usage in descriptors regression tests
Merge pull request #5784 from alalek:distrib_fix
Simple Moments class for Java
Merge pull request #5811 from mshabunin:fix-java-moments
HAL moved back to core
HAL samples: renamed and added readme
HAL samples readme file updated
Version++ for android
Fix java version++
Manfred Georg (1):
set ffmpeg mutex to NULL on destruction.
Mansour Moufid (9):
Use the CMake find_library command to find the FFmpeg libraries.
Correct the new find_library commands.
Remove Apple-specific logic in finding the FFmpeg libraries.
Fix indentation of 98a157f5.
Add back the version variables removed in ab40630f.
Change some vector mask types to unsigned.
Cast some matrix sizes to type int.
Cast some image coordinates and sizes to double.
Cast a long integer to double explicitly.
ManuelFreudenreich (1):
changed hog to work with variable parameters and changed the hog sample to test it with more options
Marian Zajko (6):
XIMEA adapter update
Fixed whitespace issue
Removed whitespaces reported by buildbot.
Fixed parameter enumrators list order to retain binary compatibility.
Removed trailing whitespace.
Fixed downsampling parameter enumerator backward compatibility.
Martijn Liem (1):
Bugfix for bug #3767
Martin Ueding (1):
Add example data types for calibrateCamera call
Mat Moore (1):
Minor grammar improvements to documentation
Matteo Piovanelli (1):
Speedup of arcLength
Maxim Kostin (3):
Added dummy highgui WinRT implementation
Added support for highgui module on WinRT 8.1+
Updated sample to showcase highgui WinRT usage
Maximilien Cuony (1):
Fix typo in error for extrinsic parameters
Miguel Algaba (1):
Assert fix: allow one cluster as valid parameter
Mike Maraya (4):
Fixes resizeWindow() on OS X (Bug #3200)
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)
Revert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)"
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)
Milania1 (1):
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
Nghia Ho (1):
Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.
Nguyen Nguyen (6):
Exporting videoFileString to outside world
Fixed memory leak when recording video in iOS
Adding code to deal with audio output
Adding audio to opencv
temporary fixes
Revert support for audio
Nickolay Polyarniy (1):
stereoRectifyUncalibrated: assertion of input points shape fixed
Niklas Frisk (1):
Fixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
Nikolay Polyarniy (1):
ts module: includes moved out from cvtest namespace
Nils Plath (2):
Added switch to CMakeLists.txt in order to enable/disable Matlab.
Simplified status update.
Nisarg Thakkar (2):
Fixed doc for Bug #3887
Made some changes specefict to 4 channel images. Fixed step value for tptr
Oliver Lumby (1):
fix CvVideoCamera defaultfps
Pastafarianist (1):
Fixed typo
Patrik Huber (1):
Add support for VS2015
Pavel Rojtberg (45):
allow specifying apiPreference in VideoCapture when opening a file. Add
deny any other interfaces if someone is specified as preference
use simplified API selection logic in cvCreateCameraCapture as well
simplify 8point algorithm using Matx classes
add support for fisheye camera model
simplify error conditions
do not parse empty default values and improve error messages
has() should only test for the presence of the argument
ts/ts_perf: fix wrong has() usage
CommandLineParser: throw on programmer error
enable additional CommandLineParser tests
CommandLineParser: add special <none> value to disallow empty strings
fix wrong parsing of values containing '='
do not leak GstMapInfo
support setting focus and autofocus with V4L2
allow icvGetPropertyCAM_V4L to return zero
allow changing FPS and Image Size using V4L2
implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
simplify autosetup_capture_mode_v4l2 by using a for loop
remove additional V4L2 pixelformat defines
avoid needless copies during mjpeg decoding
replace custom yuyv_to_rgb24 implementation by cvtColor
add python sample to test/ showcase new cap_v4l2 features
fix wrong ifdef bracketing
cap_v4l: implement PROP_CONVERT_RGB
fix compilation with qt
remove support of Video4Linux1 API
v4l: Fixed memory leaks and inconsistent status return values
v4l: remove needless CvCaptureCAM_V4L_CPP wrapper
replace rgb24_to_rgb24 by tested cvtColor
replace yuv420p_to_rgb24 by tested and conformant cvtColor
replace uyvy_to_rgb24 by tested and conformant cvtColor
make CV_CAP_PROP_FORMAT consider the current channel count
use cpp functions in cvCalibrateCamera2 to make it more readable
use cpp functions in CvLevMarq::step for better readability
support for NORM_L2SQR in norm(Matx<..>)
clean up fisheye calibration code
switch mask type from vector<int> to vector<uchar>
add sampson distance error measure
update SOLVEPNP documentation
CvLevMarq: remove fixed rows instead of setting them to zero
CvLevMarq: add solve method to interface
calib3d: add CALIB_USE_LU to use LU decomposition in solver
calibrateCamera: only allocate and compute rvecs, tvecs when needed
calibrateCamera: do not require rvec and tvec to be vector<Mat>
Pavel Vlasov (20):
Proper IPP alignment;
Imgproc_Hist_MinMaxVal.accuracy fix;
Warning fix;
Accidentally removed tegra checks were returned;
TLS memory leaks were fixed;
TLS keys leak fix;
Fix for cmp16s condition during IPP compare type convert;
Some IPP functions were encapsulated;
IPP_VERSION_X100 was changed to:
IPP_VERSION_X100 was changed to:
Enables support of IPP 9.0.0;
IPPInitSingelton was added to contain IPP related global variables;
IPPInitSingelton initialization guards;
Fixes for IPP integration:
Fix for filter2D and IPP < 900
Condition update for 8u IPP in GaussianBlur. Bug was fixed in 9.0.1;
Fix for copy with mask 32s and 8u;
IPP Sobel getBufferSize wrong func fix;
Canny IPP Sobel getBufferSize wrong func fix;
Fixed warnings for IPP9+ build;
PhilLab (5):
Double precision for solvePnPRansac()
Added cast and removed formatting error
Added publication reference
Clarified DescriptorExtractor::compute
Fixed self-assignment in cv::Ptr::operator =
Philip Salvaggio (1):
Improved documentation for connectedComponentsWithStats.
Philipp Hasper (6):
Doc: Fixing indentation
Fixed buffer overflow in string handling
Update README.md
kmeans and one-dimensional vectors
Typo in CameraBridgeViewBase.java
Fixed mjpeg frame size attribution
Philippe FOUBERT (2):
Fix issue #5234 (UMat::convertTo when noScale)
Modification of the related tests in core/tests/ocl
Pierre Letessier (2):
Added CV_CAP_PROP_SAR properties to videoio module
Changed CV_FFMPEG_CAP_PROP_SAR_* values
Pierre Moulon (1):
Fix a typo error
Pierre-Emmanuel Viel (1):
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
Prof. Dr. Rudolf Haussmann (4):
Changes to be committed:
Merge remote-tracking branch 'upstream/2.4' into 2.4
Merge remote-tracking branch 'upstream/2.4' into 2.4
Changes to be committed:
Raaj (1):
Update facedetect.cpp
RafaRuiz (1):
Update lkdemo.cpp because of memory leak
Rafael Sadowski (1):
fix cmake OpenBSD linker libs
Renato Florentino Garcia (3):
Remove an unneeded semicolon.
Correct a typo.
Fix behavior of Matx 12 and 16 args constructors.
René (1):
Fix bug in distanceATS_L1_8u and typos.
Richard Yoo (3):
Changes to support Intel AVX/AVX2 in cvResize().
Modifications to support dynamic vector dispatch.
Enable Intel AVX/AVX2 compilation on Windows.
Robbert Klarenbeek (1):
Fix algorithm setter argument validation for uchar(cherry picked from commit e21c6e19db0183e40d12b6634aec2d1923496336)
Rodrigo Benenson (2):
CommandLineParser missing gpu option
mush -> must
Rohit Rawat (1):
Fixing bug in NAryMatIterator documentation(Bug #3787).
Rok Mandeljc (5):
cudastereo: reprojectImageTo3D: enabled CV_32S and CV_32F disparity formats
cudastereo: drawColorDisp: enabled CV_32S and CV_32F disparity formats
calib3d: improve documentation of reprojectImageTo3D
cudastereo: updated documentation for reprojectImage3D and drawColorDisp
cudastereo: document lack of fractional bits in 16-bit signed format for StereoBeliefPropagation
Roman Donchenko (63):
Fixed MinGW build by declaring the minimal required Windows version.
Merge pull request #2558 from asmorkalov:ocv_matop_init_fix
Merge pull request #2883 from berak:b_3756_24
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
Merge pull request #2903 from mmaraya:2.4
Merge pull request #2955 from SpecLad:find-libv4l2
Merge pull request #2975 from asmorkalov:ocv_cuda_6.5_fix
Merge pull request #2815 from Aletheios:Bugfix#3705
Merge pull request #3156 from sergregory:CreateSamplesMod
Merge pull request #3263 from asmorkalov:python_tests_package_lintian
Merge pull request #3287 from asmorkalov:android_manager_version_inc5
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp
Fix uninitialized memory reads and memory leaks in StereoGC
NCV.cu: include <algorithm>
Fix memory leaks appearing when cvOpenFileStorage throws
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
Merge pull request #3497 from SpecLad:fs-open-fail-leak
Merge pull request #3506 from doltac:typofix
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
Don't install documentation if it isn't built
Fix a memory leak in CvCapture_FFMPEG::close
Remove useless CPACK_*_COMPONENT_INSTALL variables
Merge pull request #3693 from SpecLad:no-absolute-destinations
Merge pull request #3695 from SpecLad:fix-hdc-tautology
Install data and test data on Windows
cap_msmf.hpp: fix a warning about nNull being unused
Add a script to run all tests on Windows
Update the CPack variables to match the changes in asmorkalov/CMake#1
Add component display names
Mark the libs component required
Turn ocv_convert_to_lib_name into a function
Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
Use imported targets for linking to CUDA
Fix uninitialized memory reads and memory leaks in StereoGC
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
Fix a memory leak in CvCapture_FFMPEG::close
Remove useless CPACK_*_COMPONENT_INSTALL variables
Update the CPack variables to match the changes in asmorkalov/CMake#1
Add component display names
Mark the libs component required
Remove insertIframe.js
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
Add ARM64 packaging support
CV_ChessboardDetectorTimingTest: don't ignore missing test data
Refactor a section of icvRotatingCalipers to work around a GCC bug
FREAK: add missing field initialization
flann: fix AutotunedIndex crashing if a KDTree index is selected
NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()
Add missing packages to the Debian conflict list
Only conflict with packages corresponding to modules that are built
Refactor a section of icvRotatingCalipers to work around a GCC bug
flann: fix AutotunedIndex crashing if a KDTree index is selected
NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()
test2.py: remove unused imports
test2.py: fail if a downloaded image can't be decoded
test2.py: switch from urllib to urllib2
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
Add ARM64 packaging support
Add missing packages to the Debian conflict list
Only conflict with packages corresponding to modules that are built
Ruslan Baratov (5):
Doc: fix definition of macro CV_MAKETYPE
Fix `cmake -E touch classes.jar' step
Add OpenCV_INCLUDE_DIRS to INTERFACE_INCLUDE_DIRECTORIES target property
Update samples/cpp/example_cmake: no need to use `include_directories`
Suppress error message of execute_process
S. Garrido (1):
completing and fixing gen_pattern.py for 2.4 branch
Samuel Martin (3):
cmake: fix gstreamer check conditions
core: fix x86 PIC code compilation
cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation
Samyak Datta (1):
C++ sample code to detect facial features
Seon-Wook Park (25):
spatialGradient: Add test class and Sobel proxy method
spatialGradient: Add asserts
spatialGradient: Add non-SSE version
spatialGradient: Vectorise inner area
spatialGradient: Less vector loads
spatialGradient: Reduce temporary vectors
spatialGradient: Add basic perf test
spatialGradient: Remove unnecessary index calculation
spatialGradient: Doc, fix dangling newline error
spatialGradient: Per row in outer loop
Support non continuous, BORDER_REPLICATE
spatialGradient: HAL-accelerated
spatialGradient: Make nosse version faster
spatialGradient: Don't dynamically alloc C array, use vector
spatialGradient: Remove an unnecessary branch in nosse code
spatialGradient: Process 1 row at a time in SSE
spatialGradient: Suppress uninitialised j warnings
spatialGradient: Re-introduce 2-rows at a time
spatialGradient: Move vector decl into loop
spatialGradient: L/R border handling outside. Kernelize.
spatialGradient: Change ordering of vector loads
spatialGradient: Remove pointers caching
spatialGradient: Remove 4 loads in inner loop
spatialGradient: Add CV_SSE2 check
spatialGradient: Make kern args const&
Sergey Alexandrov (2):
Use stream argument when launching bilateral filter kernel
Do not modify input parameter in MergeDebevec
Sergiu Dotenco (2):
videoio: fixed segmentation fault at frame size change
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
Sethur (1):
Fixed duplicate PATH in TBB_DEFAULT_INCLUDE_DIRS
Seunghoon Park (3):
fixing bug #3345
fixing bug #3345. don't use BORDER_ISOLATED alone. it should be combined with some border type
fixing bug #3345. use norm to make sure two matrices are the same.
Simon Heinen (1):
squashed #3729
Stefan Cornelius (1):
Fix processing of SunRaster images with negative maplength
Stephen Mell (1):
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
Steven Puttemans (1):
Fix
StevenPuttemans (47):
fixed two models, adding xml identifier to correct position
added extra warning about the automatic parameter loading for traincascade application when the param.xml file already exists
fixing bug 3777
fixing setting the locale back to what should be expected
fixing GT and GE comparison symbol
fix blobdetector
Fixing errors
fixing some wrong CPP prefixes - still old interface
fixing dependencies
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
fixing SVM negative value rounding
adding extra buffer parameter
added extra BUFFERSIZE doc and getter
fix wrong property name and corresponding documentation
pulling most recent models
add extra to FeatureDetector docs
fix bug 2432 for 2.4 branch
remove an unused #endif
fixing tutorial errors
adding a universal OpenCV based annotation tool for cascade classifier training
fixing wrong model sizes
fix message of preloaded parameters
fix bug 3714 2.4 branch
add remarks for iOS tutorial
add fit ellipse technique notice
fix annotation tool, add auto make of tool
fixing model size, typo in previous PR
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
fixing undesired behaviour
update cmakelists of annotation tool
adding usage information
upgrade traincascade default memory
extra camera specific information for IP settings
add the possibility to add traincascade accuracy
Fixing all wrong uses of RGB channels instead of the OpenCV BGR standard
add checks on input parameters for valid path and folder
add checks for valid input data given to parameters
change as suggested by original programmer and user of ecc software
fix py_matcher tutorial
add link to contributing guidelines
add link to contributing guidelines
adding markers to OpenCV for 2.4 branch
adding markers to OpenCV
removing unexisting functionality in ML header
adding missing images from python tutorials, like chessboard.png, simple.jpg, home.jpg, fly.png, ...
adding extra explanation for mask parameter
adding extra explanation for mask parameter
Suleyman TURKMEN (20):
Update imgproc.hpp
Update imgproc.hpp
Update imgproc.hpp
Update mat.hpp
new function imread_reduced()
Update window_w32.cpp
Update how_to_scan_images.cpp
documentation patch
documentation patch
Update drawing.cpp
Update drawing.cpp
Update window_w32.cpp
Update how_to_scan_images.cpp
adding new flags to imread to load image reduced
Update imgcodecs.hpp
Update camera_calibration_and_3d_reconstruction.rst
Update imgproc.hpp
Update face detection samples
Update imgcodecs.hpp
Documentation patch for cv::mixChannels
Teng Cao (3):
calculate innTilted only for Haar::ALL mode
Update haarfeatures.cpp
Update haarfeatures.cpp
Thomas Dunker (1):
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
Thomas Gabrowski (1):
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
Thomas Weisbach (1):
iOS: fix crash from overrelease in UIImageToMat
Tian Zhi (1):
fixed the type inconsistent with document.
Tim D. Smith (1):
Don't explicitly link Python on OS X
Tom Stellard (4):
ocl: Don't use 'inline' attribute on functions
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
ocl: Fix crash during destruction of gauss_w_lut object in hog.cpp
ocl: Move static oclMat variables into FarnebackOpticalFlow class
Tsukasa Sugiura (2):
Fix LineAA in case of 4 channel
Fix LineAA in case of 4 channel
Vadim Pisarevsky (400):
Merge pull request #2930 from akarsakov:dft_dst_size_fix
Merge pull request #2908 from mmaraya:bug_3737
Merge pull request #2972 from apavlenko:24_face_rec_sample
Merge pull request #2971 from ruslo:docfix
Merge pull request #2957 from cambyse:2.4
Merge pull request #2959 from StevenPuttemans:add_notice_loaded_parameters
Merge pull request #2780 from hbadino:Feature_3692_2.4
Merge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result
Merge pull request #2966 from PhilLab:patch-2
Merge pull request #2965 from soulslicer:patch-2
Merge pull request #2909 from StevenPuttemans:bugfix_profileface_model
Merge pull request #2970 from PhilLab:patch-3
Merge pull request #2898 from PhilLab:2.4
Merge pull request #2980 from akarsakov:revert_dft_dst_fix
Merge pull request #2984 from cambyse:2.4
Merge pull request #2948 from PhilLab:patch-1
Merge pull request #2985 from StevenPuttemans:fix_3777_redo
Merge pull request #3001 from asmorkalov:cuda_6.5_support
Merge pull request #2997 from mojoritty:bugfix_3767
Merge pull request #2836 from s98felix:2.4
Merge pull request #2816 from ehren:avcapturesession_leak
hopefully fixed Python tests
Merge pull request #3014 from vpisarev:fix_python_tests
Merge pull request #2968 from LeonidBeynenson:bugfix_crash_gpu_feature_matcher_in_stitcher
Merge pull request #3026 from jet47:fix-gpu-resize-linear
Merge pull request #3046 from StevenPuttemans:fix_Qt_locale
Merge pull request #3058 from PhilLab:patch-2
Merge pull request #3076 from vpisarev:fix_small_filters
Merge pull request #2827 from Alexander-Petrikov-ELVEES-NEOTEK:neon-stereobm
Merge pull request #3093 from asmorkalov:ocv_array_bound_fix
Merge pull request #3108 from LeszekSwirski:fix-gemm-buf-allocate-2.4
Merge pull request #3118 from akarsakov:fix_cvtcolor_perf
Merge pull request #3120 from StevenPuttemans:fix_bug3863
Merge pull request #3137 from akarsakov:fix_cvtcolor_luv_rgb
Merge pull request #3143 from jet47:cuda-cvt-color-fix
Merge pull request #3109 from jet47:gpu-test-fixes
Merge pull request #3147 from asmorkalov:ocv_deb_lintian_fixes
Merge pull request #3164 from jet47:fix-cuda-lut
Merge pull request #3178 from jimcamel:freak_sse_bugfix
Merge pull request #3197 from asmorkalov:python_tests_package
Merge pull request #3194 from stonier:2.4
Merge pull request #3202 from parafin:bug_3858-2.4
Merge pull request #3204 from parafin:ximea_unix-2.4
Merge pull request #3228 from PhilLab:patch-4
Merge pull request #3225 from jormansa:bug_#3631
Merge pull request #3222 from dmitrygribanov:dg/2.4-stitching-wave-correction-bugfix
Merge pull request #2047 from GregoryMorse:patch-4
Merge pull request #3212 from mshabunin:python_cross_build_2.4
Merge pull request #2711 from GregoryMorse:patch-5
Merge pull request #3236 from vpisarev:fix_traincascade
Merge pull request #3235 from Atanahel:gbt_bugfix
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
Merge pull request #3238 from vpisarev:bfmatcher_fix
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
Merge pull request #3240 from a-wi:MSMF_compilation_errors
Merge pull request #3243 from a-wi:MSMF_linking_error
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
Merge pull request #3251 from a-wi:MSMF_camera_errors
Merge pull request #3255 from bhack:fix_cuda_macosx
Merge pull request #3262 from StevenPuttemans:fix_window_param
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
Merge pull request #3260 from a-wi:MSMF_file_error
Merge pull request #3266 from mshabunin:arm_warning
Merge pull request #3319 from Trundle:tiff_infinite_rowsperstrip
Merge pull request #3316 from nisargthakkar:Bug3887
Merge pull request #3311 from BarneyBear:2.4-drawMatches-flag-fix
Merge pull request #3309 from nisargthakkar:Thickness1NoLineCV_AA
Merge pull request #3298 from a-wi:DShow_capture
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
Merge pull request #3327 from JonasVautherin:patch_cmake_android_r10
Merge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator
Merge pull request #3329 from taka-no-me:patch-1
Merge pull request #3265 from BKNio:putText_develop
Merge pull request #3331 from tSed:opencv-2.4.x/fix-x86-PIC-compilation
Merge pull request #3337 from tstellarAMD:2.4-ocl-context-cleanup-fix
Merge pull request #3340 from AdLantis:2.4
Merge pull request #3346 from Nerei:fixed_memory_leak_in_viz
Merge pull request #3341 from jet47:deb-package-lib-symlinks
Merge pull request #3350 from Trundle:fix_some_tiff_crashes
Merge pull request #3356 from jet47:ctest-support
Merge pull request #3366 from jet47:fix-gpu-cuda-7.0
Merge pull request #3363 from asmorkalov:qnx_support
Merge pull request #3362 from mshabunin:fix-drawing-24
Merge pull request #3364 from mshabunin:doxygen-docs-24
Merge pull request #3382 from StevenPuttemans:fix_3982
Merge pull request #3376 from vriera:2.4
Merge pull request #3294 from mshabunin:fix-ios-warnings-24
Merge pull request #3305 from tSed:opencv-2.4.x/opencv.pc-generation-refactoring
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds
Merge pull request #3414 from SpecLad:vg-stereogc
Merge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params
Merge pull request #3421 from SpecLad:ncv-algorithm
Merge pull request #3427 from tstellarAMD:2.4-farneback-crash-fix
Merge pull request #3425 from StevenPuttemans:fix_firewire_buffersize
Merge pull request #3419 from samyak-268:2.4
Merge pull request #3433 from StevenPuttemans:fix_whitebalance_naming
Merge pull request #3447 from a-wi:Fill_ellipse_arc
Merge pull request #3445 from jet47:get-rid-of-cuda-h
Merge pull request #3488 from jeremyhu:PR-4048
Merge pull request #3480 from mshabunin:python-test-24
Merge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements
Merge pull request #3498 from ilya-lavrenov:omp
Merge pull request #3522 from ilya-lavrenov:update_android_toolchain_cmake
Merge pull request #3515 from StevenPuttemans:fix_FeatureDetector_docs
Merge pull request #3500 from StevenPuttemans:fix_2432_2.4
Merge pull request #3514 from mshabunin:compat-24
Merge pull request #3511 from mattip:2.4
Merge pull request #3484 from euphrat:gmg_update_fix
Merge pull request #3471 from HelenWong:FixBug3714
Merge pull request #3545 from jet47:gpu-match-template-tests
Merge pull request #3543 from MatMoore:2.4
Merge pull request #3534 from taka-no-me:build_fixes
Merge pull request #3562 from asmorkalov:ocv_aarch64
Merge pull request #3565 from mshabunin:ml-leak-24
Merge pull request #3578 from asmorkalov:ocv_avx
Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
Merge pull request #3604 from asmorkalov:ocv_samples_package
Merge pull request #3620 from asmorkalov:native_samples_install
Merge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2
Merge pull request #3623 from Trundle:fix_android_link
Merge pull request #3621 from asmorkalov:ts_master_comapat_header
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4
Merge pull request #3613 from asmorkalov:aarch64_tiff
Merge pull request #3468 from StevenPuttemans:fix_models
Merge pull request #3631 from StevenPuttemans:fix_samples
Merge pull request #3641 from cbenhagen:patch-2
Merge pull request #3648 from SpecLad:get_policy-ts
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
Merge pull request #3649 from StevenPuttemans:fix_tutorials
Merge pull request #3659 from asmorkalov:debian_changelog_stub
Merge pull request #3658 from asmorkalov:numpy_dependency
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh
Merge pull request #3660 from asmorkalov:samples_install_permissions
Merge pull request #3662 from StevenPuttemans:fix_models
Merge pull request #3671 from jet47:disable-gpu-match-template-tests
Merge pull request #3672 from asmorkalov:debian_lower_case
Merge pull request #3676 from asmorkalov:changelog_for_tests
Merge pull request #3674 from jet47:colorize-run-test-script-2.4
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
Merge pull request #3680 from jet47:fix-run-tests-script-2.4
Merge pull request #3689 from jet47:test-script-optional-color-2.4
Merge pull request #3697 from tomi44g:2.4
Merge pull request #3698 from SpecLad:avcodec-free-frame
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
Merge pull request #3699 from SpecLad:rm-component-install
Merge pull request #3705 from SpecLad:unused-nNull
Merge pull request #3707 from alalek:fix_android_camera
Merge pull request #3704 from SpecLad:win-install-data
Merge pull request #3723 from SpecLad:run-all-tests-windows
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
Merge pull request #3710 from asmorkalov:aarc64_manager_android_5
Merge pull request #3653 from StevenPuttemans:add_annotationtool
Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
Merge pull request #3768 from jet47:gpumat-set-to
Merge pull request #3765 from jet47:gpu-hog-fix
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
Merge pull request #3756 from eliteraspberries:cast-double
Merge pull request #3745 from nitsch:fix-mingw-detection
Merge pull request #3755 from eliteraspberries:mat-size-sign
Merge pull request #3754 from eliteraspberries:unsigned-mask
Merge pull request #3761 from StevenPuttemans:fix_smile_model
Merge pull request #3774 from JoeHowse:2.4
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
Merge pull request #3815 from StevenPuttemans:add_camera_IP_regulations
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
Merge pull request #3824 from Milania1:tutorial_hough_lines_fix
Merge pull request #3843 from piponazo:BugFix4244
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
Merge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir
Merge pull request #3834 from asmorkalov:retina_docs_fix
Merge pull request #3850 from piponazo:2.4
Merge pull request #3865 from tdsmith:2.4-python-linkage
Merge pull request #3805 from nitsch:fix-mingw-cmake-config
Merge pull request #3855 from polarfuchs99:2.4
Merge pull request #3886 from beahacker:2.4
Merge pull request #3852 from renko:multithread_cl_not_studio_generator
Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives
Merge pull request #3770 from jet47:gpu-hog-tests
Merge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4
Merge pull request #3900 from apavlenko:doc_fix_imwrite
Merge pull request #3904 from SeninAndrew:2.4
Merge pull request #3898 from greensea:2.4
Merge pull request #3908 from jet47:gpu-wrap-border-mode
Merge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4
Merge pull request #3949 from ilya-lavrenov:clobbered_warning
Merge pull request #3953 from ilya-lavrenov:cuda_unused
Merge pull request #3956 from ilya-lavrenov:cuda_aarch64
Merge pull request #3963 from Dikay900:2_4_diff_to_master
Merge pull request #3965 from Dikay900:2_4_diff_to_master_2
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
Merge pull request #3959 from jet47:gpu-fixes
Merge pull request #3946 from zjulujia:bugfix_for_hog_detectMultiScale_with_weights
Merge pull request #3981 from patrikhuber:vs2015-support
Merge pull request #3975 from StevenPuttemans:RGB_doc_fixing_2.4
Merge pull request #3829 from ippei-i:2.4-flann-lsh-addable-index
Merge pull request #4041 from ilya-lavrenov:warning_fix
Merge pull request #4037 from Lectem:patch-1
Merge pull request #4042 from ilya-lavrenov:android_mk
Merge pull request #4008 from cr333:triangulation_fix_2.4
Merge pull request #4061 from ilya-lavrenov:android
Merge pull request #4057 from apavlenko:24_java_memory_release
Merge pull request #4003 from uwinsoftware:2.4
Merge pull request #4085 from berak:patch-3
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
fixed compile warnings; hopefully fixed test failures
Merge pull request #4116 from alalek:fix-pthread-pf
Merge pull request #4121 from sbokov:addingAloeGT
Merge pull request #4112 from sturkmen72:patch-1
Merge pull request #4119 from D-Alex:master
Merge pull request #4088 from howtobeahacker:2.4
Merge pull request #4109 from alalek:fix_build_dbt_bindings
Merge pull request #4104 from SpecLad:arm64-packaging
Merge pull request #4107 from SpecLad:libav-compat
Merge pull request #4108 from Reen:patch-1
Merge pull request #4122 from alalek:fix_issue_3891
Merge pull request #4090 from MSOpenTech:highgui_winrt
Merge pull request #4114 from alalek:ocl_generator_error_processing
Merge pull request #4100 from alalek:fix_ffmpeg
Merge pull request #4093 from mshabunin:python-bases
Merge pull request #4099 from sash-kan:fix.2822
Merge pull request #4115 from themightyoarfish:MatToUIImage_transparency
Merge pull request #4136 from alalek:fix_matallocator_destruction
Merge pull request #4142 from sturkmen72:patch-2
Merge pull request #4137 from asmorkalov:as/ros_conflict
Merge pull request #4111 from mshabunin:fix-flann-access
Merge pull request #4146 from LaurentBerger:MvDetectBlobPNG
Merge pull request #4135 from lupustr3:ipp_code_refactoring
Merge pull request #4161 from alalek:restore_data_file
Merge pull request #4155 from MSOpenTech:highgui_contrib
Merge pull request #4153 from stefan-cornelius:master
Merge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340
Merge pull request #4139 from swook:spatial_gradient
Merge pull request #4166 from sbokov:fixingStereoBMissue
Merge pull request #4064 from MSOpenTech:test-contrib
Merge pull request #4117 from jaimefrio:relaxed_strides
Merge pull request #4164 from kalistratovag:parallel_mjpeg
Merge pull request #4167 from berak:patch-2
Merge pull request #4172 from alalek:ocl_minmaxloc_unaligned
Merge pull request #4173 from kalistratovag:mjpeg_encoder_coverity_warnings
Merge pull request #4158 from alalek:fix-bigdata-copyto
Merge pull request #4174 from yangj1e:fix_svm_trainauto
Merge pull request #4171 from jet47:install-cudev-test
Merge pull request #4154 from alalek:ffmpeg_update_via_binary_repo
Merge pull request #4207 from alalek:fix_calib3d_test
Merge pull request #4201 from sturkmen72:new_function_imread_reduced
Merge pull request #4189 from vladimir-dudnik:update_dx_samples
Merge pull request #4197 from themightyoarfish:projectPointsDocBugfix
Merge pull request #4181 from themightyoarfish:findEssMatDocTypoFix
Merge pull request #4204 from gladilov-gleb:minMaxLocBugFix
Merge pull request #4215 from renatoGarcia:master
Merge pull request #4217 from wangyan42164:ocl_pyrlk_mul
Merge pull request #4183 from paroj:8point
Merge pull request #5102 from nzjrs:fix-python-digits
Merge pull request #5087 from alexst07:cuda_contrib
Merge pull request #4233 from alalek:fix_4006
Merge pull request #5130 from alalek:issue_4380
Merge pull request #4149 from LaurentBerger:ThreshGaussianFloat
Merge pull request #5128 from ageitgey:ag-prevent-demos-from-autorunning
Merge pull request #5117 from mshabunin:adding-google-search
Merge pull request #5201 from alalek:move_semantics
Merge pull request #5143 from alankarkotwal:2.4
Merge pull request #4212 from ludv1x:master
Merge pull request #5142 from StevenPuttemans:fix_4230
Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module)
Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps
Merge pull request #4176 from alalek:issue_4461
Merge pull request #5241 from alalek:fix_sample_opencl
Merge pull request #5115 from ManuelFreudenreich:hog_variable
Merge pull request #4200 from Astero92:#3800
Merge pull request #4199 from AVshokurov:master
Merge pull request #5232 from sturkmen72:patch-6
Merge pull request #5242 from apavlenko:fix_releasing_temp_umat
Merge pull request #5098 from powderluv:master
Merge pull request #5269 from eladj:patch-1
Merge pull request #5261 from apavlenko:android_ocl_sample_improvements
Merge pull request #5280 from ilya-lavrenov:ml
Merge pull request #5283 from ilya-lavrenov:ml3
Merge pull request #5284 from ilya-lavrenov:ml4
Merge pull request #5315 from elenash:core_remove_slice
Merge pull request #5312 from sturkmen72:patch-2
Merge pull request #5302 from berak:patch-2
Merge pull request #5313 from sturkmen72:patch-5
Merge pull request #5301 from vtsatskin:patch-1
Merge pull request #5304 from paroj:calib_feye
Merge pull request #5294 from LorenaGdL:master
Merge pull request #5327 from mshabunin:mingw-fix
Merge pull request #5339 from blebo:patch-1
Merge pull request #5337 from Dikay900:tbb_cmake_visibility
Merge pull request #5333 from UnaNancyOwen:fix3_LineAA
Merge pull request #5334 from UnaNancyOwen:fix2_LineAA
Merge pull request #5272 from avershov:opencl-vaapi-fallback
Merge pull request #5358 from StevenPuttemans:contributing_guidelines_master
Merge pull request #5359 from StevenPuttemans:contributing_guidelines_2.4
Merge pull request #5344 from psalvaggio:master
Merge pull request #5324 from mshabunin:hal-tests
Merge pull request #5346 from art-programmer:art-programmer-patch-1
Merge pull request #5357 from fxtentacle:ha-2.4.11
Merge pull request #5320 from berak:lda_fix
Merge pull request #5409 from kauevestena:patch-1
Merge pull request #5408 from alalek:move_ippicv_binaries
Merge pull request #5402 from sturkmen72:patch-10
Merge pull request #5385 from alalek:fix_android_camera_datarace
Merge pull request #5548 from berak:patch-2
Merge pull request #5543 from aman11dhanpat:master
Merge pull request #5542 from renatoGarcia:matx_constructors
Merge pull request #5532 from grundman:patch-2
Merge pull request #5539 from sturkmen72:patch-14
Merge pull request #5610 from n3011:patch-4
Merge pull request #5609 from n3011:patch-3
Merge pull request #5608 from n3011:patch-2
Merge pull request #5600 from grundman:patch-3
Merge pull request #5598 from ajbernal:ocl_bilateral_bugfix
Merge pull request #5595 from mshabunin:fix-bitonal-tif
Merge pull request #5592 from berak:python_rect2d
Merge pull request #5602 from ChrisKitching:clearerMatErrors
Merge pull request #5587 from lupustr3:pvlasov/ipp_cond_update
Merge pull request #5582 from sizeofvoid:master
Merge pull request #5515 from LorenaGdL:hitAndMiss
Merge pull request #5512 from edgarriba:gdal_lan
Merge pull request #5607 from n3011:patch-1
Merge pull request #5586 from mshabunin:run-py-changes-2.4
Merge pull request #5487 from Wangyida:python
Merge pull request #5386 from StevenPuttemans:add_markers
Merge pull request #5484 from PolarNick239:master
Merge pull request #5518 from Bovaz:master
Merge pull request #5392 from elenash:fisheye_fix
Merge pull request #5388 from alalek:disable_invalid_string_usage
Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix
Merge pull request #5646 from brossetti:patch-1
Merge pull request #5645 from jia-kai:master
Merge pull request #5638 from hoangviet1985:fix_bug_5623
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4
Merge pull request #5605 from hoangviet1985:fix_bug_5599
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function
Merge pull request #5597 from andy-held:cmakecudacross
Merge pull request #5340 from alalek:ocl_off
Merge pull request #5480 from dtmoodie:vecgpumat
Merge pull request #5674 from mshabunin:mac-fix-2.4
Merge pull request #5654 from mshabunin:ios-framework
Merge pull request #5635 from mzajko:xi_update
Merge pull request #5682 from ilya-lavrenov:lintian-overrides
Merge pull request #5390 from StevenPuttemans:add_markers_2.4
Merge pull request #5644 from hoangviet1985:splitError
Merge pull request #5661 from mbarann:fix_msmf_write_vertically_flipped_video
Merge pull request #5620 from paroj:calibratecpp
Merge pull request #5400 from dtmoodie:thrust_tutorial
Merge pull request #5751 from mikanbako:fix-document
Merge pull request #5743 from mshabunin:hal_extend
Merge pull request #5731 from teng88:patch-1
Merge pull request #5704 from sturkmen72:patch-3
Merge pull request #5651 from hoangviet1985:fix_solvePoly_3.0.0
Merge pull request #5717 from jet47:cuda-maxwell-fixes
Merge pull request #5759 from grundman:patch-1
Merge pull request #5735 from Astero92:angle_unit
Merge pull request #5755 from teng88:patch-4
Merge pull request #5757 from alalek:merge-2.4
Merge pull request #5660 from jet47:cuda-wrap-stream-3.0
Merge pull request #5758 from eladj:py_tutorial_hdr
Merge pull request #5670 from askourik:opencv_agast_tree
Merge pull request #5765 from alalek:pthread_mutex_init
Merge pull request #5230 from PhilLab:patch-4
Merge pull request #5773 from GregoryMorse:master
Merge pull request #5748 from songyuncen:fix#5745
Merge pull request #5770 from emiswelt:master
Merge pull request #5768 from cbalint13:kaze_akaze
Merge pull request #5774 from mshabunin:coverity_fixes
Merge pull request #5675 from paroj:fisheyecalib
Merge pull request #5309 from paroj:sampsonDist
Merge pull request #4086 from IgnasD:cameraMat_five-point
Merge pull request #5362 from Dikay900:cascade_reject_stage
Merge pull request #5657 from tianzhi0549:fixed-the-type-inconsistent-with-document
Merge pull request #5776 from alalek:checkRange_fixes
Merge pull request #5767 from dtmoodie:cpu_mat_memory_allocator
applying patch by rxtsolar: https://github.com/Itseez/opencv/pull/5422 for the master branch (even though it's actually not that important here)
couple of small fixes in rtrees variable importance calculation
fixed the upper boundary when calling checkRange (thanks to alalek)
Merge pull request #5783 from vpisarev:ml_fixes
Merge pull request #5691 from paroj:levmarqLU
Merge pull request #5616 from afriesen:lr_predict
Merge pull request #5782 from alalek:update_libpng
Merge pull request #5351 from paroj:calibout
Merge pull request #5790 from bastelflp:py3compatibility
fixed digits.py sample
Merge pull request #5793 from alalek:precomp_add_cvconfig
Merge pull request #5797 from alalek:fix_5018
Merge pull request #5798 from vpisarev:fixed_digits_py
Merge pull request #5796 from alalek:fix_5019
Merge pull request #5588 from T-Dunker:ScheimpflugModel
Merge pull request #5806 from IshankGulati:cv-merge-documentation
Merge pull request #5799 from alalek:fix_5066
Merge pull request #5800 from taketwo:fix-merge-debevec
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
Merge pull request #5781 from jet47:fix-cuda-createContinuous
Merge pull request #5810 from mshabunin:hal_interface
Merge pull request #5825 from GregoryMorse:master
Merge pull request #5802 from bastelflp:py3samples_docstr
Merge pull request #5821 from alalek:build_framework
Valentin Tsatskin (1):
Fix variable names in python color spaces tutorial
ValeryTyumen (1):
Feature #3957
Vicente Olivert Riera (2):
superres: Fix return value VideoFrameSource_GPU
superres: Fix return value VideoFrameSource_GPU
Viet Dinh (19):
fix bug #5599
fix bug #5599
fix whitespace errors
fix whitespace errors
fix whitespace errors
update fixing bug #5599
fix whitespace errors
update test_math.cpp
even more correct
fix compile errors
deal with type casting issues
casting warning
std::cbrt could not be found
fix solveCubic
optimize code
mac osx compile errors
Merge remote-tracking branch 'Itseez/2.4' into fix_bug_5599
mac compile error
clean up
Vijay Pradeep (8):
Fixing race condition by expanding resultsMutex lock section
solvePnPRansac now accepts a seed and is deterministic
overload instead of default arg for ABI backwards compatibility. rng_seed is now 'int' to support python port
Whitespace fix
Now using default arg instead of overloads
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
Fixing race condition by expanding resultsMutex lock section
Vincent Rabaud (2):
get code to compile on Ubuntu Saucy
Properly check for version in find_package
Vipul Sharma (1):
fixed the URL under Additional Resources
Vitaliy Lyudvichenko (1):
Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes
Vitaly Tuzov (4):
Added more resize_area tests to ensure right rounding behavior for half and quarter downscaling
Resize area result verification moved to the separate function
Added more resize_area tests to ensure right rounding behavior for half and quarter downscaling
Resize area result verification moved to the separate function
Vladimir Dudnik (14):
OpenCV-OpenCL interop (PR #4072):
simplified sample's interface (remove odd "no processing" branch, add print to screen for processing mode)
compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping)
changed output from fps to time (in msec). Notes for dx10 and dx11: the first measure is wrong (zero), the followiing are correct; measured time includes output text to surface.
fix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov
add test for bug 4006: #4862
d3d11-nv12 interop
finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat.
update opencl-opengl interop sample (remove odd no processing branch)
fixed not initialized nv12_cpu_copy surface, remove odd code
fixed download/upload for non contiguous umat
enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect)
fixed typo in OpenCLAllocator.upload method (wrong step used)
add condition to skip unmapping for internally allocated host memory. this should fix map_unmap_counting UMat test.
Vladimir Kolesnikov (2):
Not block PDB file in multithreaded build on Windows.
Not block PDB file in multithreaded build on Windows.
Vladislav Vinogradov (146):
split CUDA Hough sources
disable CUDA generalized Hough Transform
disable performance test for gpu generalized hough(cherry picked from commit 063d8b421136b2ed0f537c663b89828f6a2b263c)
gpu test output files moved from cwd to temp folder(cherry picked from commit 49731ad5303a714302ff053aaeb32900845304bf)
disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c)
disable NPP for GpuMat methods and for copyMakeBorder(cherry picked from commit 316d49fc0fb7a609ebb0a65efc207faea6b978a4)
disable gpu Canny and HoughCircles perf tests:
disable gpu Subtract_Array test:
disable gpu CvtColor.*2HSV tests:
Revert "disable gpu Subtract_Array test:"
Revert "disable gpu CvtColor.*2HSV tests:"
fix epsilons for several gpu tests
Revert "disable CUDA generalized Hough Transform"
Revert "disable gpu Canny and HoughCircles perf tests:"
fixed several bugs in CUDA Canny implementation:
fix GpuMat::copyTo method with mask:
fix #3477:
turn on CUDA part of nonfree module on Android for non-dynamic build(cherry picked from commit d8f7377122a65512db2f443535a9d01ea336470c)
turn on CUDA part of stitching module on Android for non-dynamic build(cherry picked from commit a138e5a6a585e9dfc686d76b9769adeff02672b3)
update stitching sample
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)(cherry picked from commit a098fb1803a6bd4d6ebe58c4a1dd0f2dfea464ab)
save previous values of LOCAL_* variables and restore them at the end(cherry picked from commit 286fe261d07a7faf481ac907c6f09b3fece4aa64)
fix nonfree module compilation without CUDA(cherry picked from commit 3e1f74f2cafc5c38d0e64928149edb87d9b28d28)
decrease input size for several gpu tests to fix "timed out" error:
increase epsilon for AlphaComp sanity test for integer input(cherry picked from commit 9e69e2a07a9798d75a0949ab2b4ad063dd84e8f2)
temporary disable perf test for StereoBeliefPropagation(cherry picked from commit eb247d826f04673a23e4d050ee5cf0395bde82c2)
temporary disable performance test for alphaComp function(cherry picked from commit 1ce5165cb7ccabdd0280970e3f1b6bc180055a3d)
fix cv::subtract function:
fix output matrix allocation in cv::subtract(cherry picked from commit 629461c83652e2416ccb6c8685a0788bb6fb15f5)
fix cv::gpu::resize for INTER_LINEAR, now it produces the same result as CPU version
increase epsilon for TVL1 sanity test
increase epsilon for ResizeSameAsHost test
use downscaled frames in FGDStatModel test
fix BGR->BGR5x5 color convertion
fix CUDA cvtColor after corresponding change in CPU version
increase epsilon for TVL1 sanity test
increase epsilon for ResizeSameAsHost test
use downscaled frames in FGDStatModel test
fix BGR->BGR5x5 color convertion
fix CUDA LUT implementation
fix CUDA LUT implementation
fix cv::gpu::resize for INTER_LINEAR, now it produces the same result as CPU version
fix CUDA cvtColor after corresponding change in CPU version
fix OpenCVConfig.cmake template - missing parentheses
fix installation layout for debian packages:
turn on testing support in root binary directory
rewrite add_test command for accuracy tests:
disable CTest target for opencv_test_viz:
add CTest targets for sanity tests
determine test category (Public vs Extra) based on module location
avoid pointer arithmetic on register memory in color conversion
increase epsilons for some tests, which functions use floating point arithm
minor fix for StereoCSBP data cost compute kernel and test
avoid pointer arithmetic on register memory in color conversion
increase epsilons for some tests, which functions use floating point arithm
minor fix for StereoCSBP data cost compute kernel and test
get rid of cuda.h usage
fix tests for gpu::matchTemplate:
fix ocv_add_module CMake macro:
disable gpu::matchTemplate tests
colorize opencv_run_all_tests_unix.sh script output
fix opencv_run_all_tests_unix.sh script:
make color output in run_test script optional
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
fix gpu HOG implementation:
fix GpuMat::setTo implementation
fix tests for gpu HOG
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)
make NVIDIA tests verbose by default
fix BruteForceMatcher resource distribution
increase epsilons for some sanity tests
fix installation layout for debian packages:
get rid of cuda.h usage
fix tests for gpu::matchTemplate:
disable gpu::matchTemplate tests
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
fix GpuMat::setTo implementation
fix gpu HOG implementation:
fix tests for gpu HOG
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)
make NVIDIA tests verbose by default
fix BruteForceMatcher resource distribution
increase epsilons for some sanity tests
increase epsilon for solvePnPRansac function
fix racecheck warning in scanRows kernel
use border extrapolation for central pixel in pyrDown
disable Video_PyrLKOpticalFlowDense performance test
disable several heavy performance tests
Bug #4315 : fix CUDA bitwise operations with mask
increase epsilon for solvePnPRansac function
fix racecheck warning in scanRows kernel
use border extrapolation for central pixel in pyrDown
disable Video_PyrLKOpticalFlowDense performance test
disable several heavy performance tests
Bug #4315 : fix CUDA bitwise operations with mask
introduce BUILD_TINY_GPU_MODULE CMake option
reduce separable filter instantiates for tiny build
reduce filter2d instantiates for tiny build
reduce bilateral filter instantiates for tiny build
reduce brute_force_matcher instantiates for tiny build
reduce add_weighted instantiates for tiny build
reduce element_operations instantiates for tiny build
reduce stereobm instantiates for tiny build
reduce warp instantiates for tiny build
reduce remap instantiates for tiny build
reduce resize instantiates for tiny build
reduce pyramids instantiates for tiny build
reduce matrix_reductions instantiates for tiny build
reduce copy_make_border instantiates for tiny build
reduce color instantiates for tiny build
fixed seg faults
turn on some instantiates that required for other primitives
turn on stereob instantiates that required for tests
fix accuracy tests in tiny mode
fix performance tests in tiny mode
fix tests compilation issue on Windows
use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
use fixed seed for RNG in gpu SolvePnPRansac test
do not loose logs from nvidia tests
check that current directory has write access
save tests console output to separate log files
exclude dates from report names
use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
use fixed seed for RNG in gpu SolvePnPRansac test
do not loose logs from nvidia tests
add opencv_test_cudev to installation package
increase epsilon for some GPU sanity tests
fix potential out-of-border access in gpu StereoBeliefPropagation
fix for gpu::StereoBeliefPropogation:
revert previous change in gpu::StereoBeliefPropogation
add extra checks to data_step_down to prevent out-of-border access
check that current directory has write access
save tests console output to separate log files
exclude dates from report names
fix cuda::normalize (dtype < 0) case
assing labels to targets and sources
add CTest support to build tree
fix signed/unsigned comparison warning in core/test/test_math.cpp
add cv::gpu::StreamAccessor::wrapStream method
cuda::StreamAccessor::wrapStream and cuda::EventAccessor::wrapEvent
fix BORDER_WRAP processing on Maxwell generation
increase epsilons in some tests:
disable sanity tests for AlphaComp and PyrLKOpticalFlowDense
fix #5780 : `cv::cuda::createContinuous`effectively ignores its `cols` argument
Wangyida (1):
python modification for Point3D
Wenju He (1):
fix adaptiveThreshold mean
WilhelmHannemann (3):
Bugfix brute_force_match.cl (Bug #2837): wrong results for non-float descriptors in OpenCL BruteForceMatcher
Bugfix brute_force_match.cl (see http://code.opencv.org/issues/2837): wrong results for non-float descriptors in OpenCL BruteForceMatcher
Merge branch 'bugfix_brute_force_match_cl' of https://github.com/WilhelmHannemann/opencv into bugfix_brute_force_match_cl
Yan Wang (3):
Optimize pyrlk.
Move coefficient (32.0f) to the end of every iteration.
It is unnecessary to use fma() if no scaling.
Yang Fan (1):
ENH: explicitly declared outputFilename to surpress error C2668
Ying Xiong (1):
Silence cmake 3.0+ warnings about MACOSX_RPATH
Youssef Kashef (1):
add unit test around Mat::push_back()
a-andre (3):
install new headers like "opencv2/core.hpp"
fix documentation builder warnings
install opencv2/highgui.hpp header
aletheios (1):
Bugfix #3705: params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
alexander barakin (aka sash-kan) (1):
fix icvCloseCAM_V4L wrong order of code blocks
art-programmer (1):
Update em.cpp
askourik (6):
Add treelookups for nonintel
added comments and test perl examples for agast tree version
Merge branch 'opencv_agast_tree' of https://github.com/askourik/opencv into opencv_agast_tree
Added new function definition in AGAST module header for tree-optimized version
removed code duplication for non-intel platforms
removing code duplicates and replace unsigned long by uint32_t
ausentso (1):
added test for goodFeaturesToTrack;
berak (15):
added missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756)
http://code.opencv.org/issues/4359 2.4 branch
fix plausability check, #issue 4429
Update ml.hpp
enable VideoWriter class for java
Update PnPProblem.cpp
Update cloning_gui.cpp
remove usage of obsolete _dataAsRows flag
initialize temp_train_samples in SVM::autoTrain
fix zero length std::string in putText()
fix zero length std::string in putText()
update python features2d tutorials
add Rect2d to python bindings
remove usage of obsolete _dataAsRows flag
AKAZE: check channels instead of type in detectAndCompute
bhack (1):
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
boatx (1):
Fixing typo in variable name.
brossetti (1):
fixed bug on left mouse button click
comdiv (1):
32bit BITFIELDS compresion codec support #5707 Fixed
doltac (1):
Fixed typos in latentSVM detector demo.
edgarriba (5):
load multi/hyperspectral images with using gdal
add support for float32 and float 64
set GA_Update flag in order remove ERROR 8: band 1: Attempt to write to read only dataset inGDALRasterBand::Fill()
Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
set GA_ReadOnly flag again since test error
emiswelt (1):
Changed parameter order of cv::stereoRectify in documentation,
flp (6):
Python samples adapted for Python3 compatibility
Adapted for py2/py3 compatibility
Added .gitignore for tmp files created by examples
added docstring to python files
Print found calibration data
Removed outdated tutorial link
greensea (1):
Fix a segment fault issue in cascade classfier
grundman (4):
Fix racy modification of ForThread::m_state during invocation of stop()
Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
Update imgwarp.cpp
Update imgwarp.cpp
hoangviet1985 (4):
The right signs give the right results
squash
squash
remove redundant code
howtobeahacker (2):
fix bug 4269
correct covariation matrix formula in Harris corner detector
ippei ito (11):
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
Fix unused-parameter Warning
Fix compile error on linux change cv::InputArray& to cv::InputArray
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
Test accuracy for Pull Request # 3829
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
Test accuracy for PR#3829.Fix warning on gcc, comment out INIT_RANDOM_SEED for same result each ran.
Test accuracy for PR#3829.Fix WOrder warning on gcc
Test accuracy for PR#3829
Merge remote-tracking branch 'origin/2.4-flann-lsh-addable-index' into 2.4-flann-lsh-addable-index
instead of "using namespace cv" put all the tests into cv:: namespace.
jayceelock (2):
Changed to allow for ISO page size selection, checkerboard pattern now centres itself properly in middle of the page
Fixed gen_pattern.py file permission back to 755
jiakai (3):
check boundary in ExifReader
check for exifSize
check offset in ExifReader::getString
jisli (2):
update ffmpeg support
fix header problem(can't find cstdint) on OSX platform
jormansa (1):
bug fixed
kalistratovag (2):
Implementing parallel mjpeg encoder.
Removing deadcode blocks, redudant variable & initializing all vars in constructor
lujia (2):
bugfix_for_hog_detectMultiScale_with_weights
bugfix_for_hog_detectMultiScale_with_weights
manuele (1):
Enable NEON optimization for cvRound on newer devices
mattip (1):
export thread control to generated wrappers
mbarann (1):
MSMF expects a bottom-up video frame, so the buffer pointer must point to the end of the data and the stride needs to be negative
micalan (1):
Camera orientation handling is added for jpeg files
michaelveth (1):
Update OpenCVFindMatlab.cmake
niederb (1):
Fixed variable importance in rtrees
paul.kim (2):
Fix the issue in mouse click event
Fix the issue in mouse click event
qubick (2):
camera view was enabled to visible when the app launched
surfaceview import
quentin (1):
Add -L for CUDA libs path to pkg-config
rajithr (1):
Fixing resource leaks
robertxwu (2):
re-submit
findChessboardCorners causes crash due to out-of-bounds memory corruption.
sbokov (7):
Added ground-truth disparity map for 'aloe'
Fixing uninitialized memory access problem
Fixing possible invalid memory access in validateDisparity
Adding new HAL-accelerated MODE_SGBM_3WAY
Fixing StereoSGBM ROI
Merge pull request #1 from Itseez/master
Replacing SSE with v_extract
scorneli (1):
Fix processing of SunRaster images with negative maplength
songyuncen (6):
try to fix : enclosing circle always larger than 1.0
change the algorithm of minimum enclosing circle with EMO Welzl's method
remove compile warnings in shapedescr.cpp
build failed, trailing whitespace.
build failed, trailing whitespace.
Merge remote-tracking branch 'origin/fix#5745' into fix#5745
spmallick (1):
Update window_QT.h
teng88 (1):
Update cascadeclassifier.cpp
thebucc (1):
Fix for bug #5007: moved definition of Size_MatDepth_t and Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer to where they are needed and live in a different namespace (possibly the reason why the fix works).
themightyoarfish (4):
Fixed alpha preservation when converting 4-channel Mat to UIImage
fixed copy-paste errors
Fixed typo in doc for findEssentialMat
Fixed documentation bug for projectPoints: Distortion coefficients cannot actually be NULL
theodore (2):
bug fix fro the TickMeter class
1e-3 -> 1e3
ttagu99 (1):
findcontour_example check image empty
ultrafro (1):
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class
unknown (3):
Fixed typos in comments
Fixed C++11 compatibility warning
Function for drawing arrows
侯骥 (1):
Update MatchTemplate_Demo.cpp
-----------------------------------------------------------------------
No new revisions were added by this update.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list