Merge pull request #2120 from prclibo:master

Merge pull request #2262 from SpecLad:merge-2.4

Merge pull request #2217 from ilya-lavrenov:tapi_superres

Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2

Merge pull request #2258 from ilya-lavrenov:tapi_video

Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt

Merge pull request #2255 from ilya-lavrenov:ocl_doc

Merge pull request #2253 from ilya-lavrenov:cuda

Merge pull request #2254 from ilya-lavrenov:opengl

some fixes and improvements in cv::matchTemplate

implemented OpenCL version of cv::updateMotionHistory

fix2 for OpenCL on/off

fix MACRO

Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game

one more ocl deletion

removed ocl from allmodules list

unused function in case of unavailable OpenGL

fixed unused function in case of unavailable CUDA

ported superres to T-API

Merge pull request #2249 from jet47:gpu-tests-disable

Merge pull request #2248 from jet47:gpu-npp-disable

Merge pull request #2247 from jet47:gpu-test-cufft

Merge pull request #2219 from ilya-lavrenov:createHanningWindow

optimized createHanningWindow

Merge pull request #2219 from ilya-lavrenov:createHanningWindow

Merge pull request #2218 from alalek:fix_defects_code_coverity

Merge pull request #2216 from ElenaGvozdeva:ocl_MOG2

Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector

Merge pull request #2232 from ilya-lavrenov:ABF_drop

removed ABF

Merge pull request #2228 from ilya-lavrenov:tapi_experiments

Merge pull request #2243 from ilya-lavrenov:ocl2trash

Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter

Merge pull request #2244 from ilya-lavrenov:tapi_device_cache

Merge pull request #2245 from ilya-lavrenov:redundant_sync

Merge pull request #2246 from alalek:intersection_loop_bug

Merge pull request #2242 from jet47:gpu-test-fix

disable gpu CvtColor.*2HSV tests:

possible bug in CPU version

disable gpu Subtract_Array test:

possible bug in CPU version

disable gpu Canny and HoughCircles perf tests:

it fails because driver terminates CUDA kernels after time out

disable NPP for GpuMat methods and for copyMakeBorder

disable some gpu tests if library was built without CUFFT

Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix

imgproc/intersection: fix loop index

redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked

Merge pull request #2240 from jet47:gpu-generalized-hough

cached commonly used device properties

Merge pull request #2238 from asmorkalov:ocv_test_package_reports

OCL module 2 trash

gpu test output files moved from cwd to temp folder

Reports path fix for opencv_run_all_tests.sh.in script.

Merge pull request #2223 from cosminBoaca:add_prob_result_bayes_classifier

Highgui test output fixes.

Useless output to console fixed;
Test output files moved from cwd to temp folder.

disable performance test for gpu generalized hough

Merge pull request #2237 from ivylee:lbph_chi_square_alt

fixed test

simplified cv::boxFilter OpenCL impl

Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer

Fixed alignment

Fixed alignment

Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier

Merge pull request #2220 from ilya-lavrenov:tapi_accumulate

Merge pull request #2226 from ilya-lavrenov:tapi_calcHist

workaround

Fixed broken alignment

Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier

moved kernelToStr to ocl.hpp

Merge pull request #2231 from asmorkalov:android_toolchain_update

added conditional compilation

Merge pull request #2224 from SpecLad:obsolete-immediate

Merge pull request #2229 from ilya-lavrenov:possible_memory_leak

Android toolchain file sync with original project.

Original project: https://github.com/taka-no-me/android-cmake/
Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a

fixed fp problem

added performance test

fix for PR 2196

eliminated possible memory leak

async

some experiments

added performance test

added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)

fix unintialized fields

fix memory management problem

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):

https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx

Merge pull request #2212 from SpecLad:hog-sample-const-mat

Merge pull request #2214 from cosminBoaca:add_returnDFVal_parallel_predict

Merge pull request #2221 from asmorkalov:ocv_test_install_custom

opencv_run_all_tests.sh script added to -tests package.

Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue #3401

fixed

implemented OpenCL version of cv::accumulate****

fixed warnings

optimized createHanningWindow

fixes for defects from code coverity

Merge pull request #2215 from asmorkalov:ocv_testpack_fix

Multiple fixes for tests deb package build.

Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.

Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid

fixed

Added ocl_Mog2

Added returnDFVal parameter to parallel CvSVM::predict function