Merge 2.4 into master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 8 Dec 2015 07:24:54 +0000 (10:24 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 8 Dec 2015 07:24:54 +0000 (10:24 +0300)
commitd86d8ed909171998246e48089fac340084fe60a9
tree85ec0e313e9b8ec03c4cde12dbe1c139fcd6c02c
parent4448cbffd2320a19e45acbe8e1e2dbb5cbff55dd
parent681df8403606a8baa48a0bddb7a18a8b858f20ef
Merge 2.4 into master

PR #2968: cce2d99 8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher

The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.

PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.

PR #3190
fix blobdetector

PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.

PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h

PR #3792: afdf319
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function

PR #5490: ec5244a
fixed memory leak in findHomography tests

PR #5491: 0d5b739
delete video readers

PR #5574

PR #5202
15 files changed:
3rdparty/tbb/CMakeLists.txt
CMakeLists.txt
apps/traincascade/cascadeclassifier.cpp
apps/traincascade/cascadeclassifier.h
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVUtils.cmake
modules/calib3d/test/test_homography.cpp
modules/features2d/src/blobdetector.cpp
modules/stitching/src/matchers.cpp
modules/videoio/src/cap.cpp
modules/videoio/src/cap_gstreamer.cpp
modules/videoio/src/cap_images.cpp
modules/videoio/test/test_ffmpeg.cpp
samples/gpu/CMakeLists.txt
samples/gpu/opengl.cpp