ocl: fix CL_RUNTIME_EXPORT for master branch

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

Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp

Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles

Merge pull request #1572 from emchristiansen:includeLimits

Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk

Merge pull request #1566 from SpecLad:Wshadow-openni

Merge pull request #1 from ImAlsoGreg/master

add include limits, for compilers that dont add it implicitly

add include limits, for compilers that dont add it implicitly

adds include to fix build

added plain branch to HoughCircle perf test

Merge pull request #1564 from alalek:cl_runtime_fix_32bit

Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update

fixed mog2

Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix

Merge pull request #1565 from SpecLad:cmake-new-ptr

Merge pull request #1562 from ilya-lavrenov:ocl_integral

fixed pyrlk optical flow

Merge pull request #1532 from alalek:stereo_csbp

Merge pull request #1536 from asmorkalov:android_ndk_r9_master

Merge pull request #1558 from SpecLad:Wparentheses-equality

Merge pull request #1559 from SpecLad:Wnull-conversion

fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit

Fix a -Wshadow warning in cap_openni.cpp.

Merge pull request #1535 from asmorkalov:android_ndk_r9

Merge pull request #1554 from pablospe:fix_viz_module_compilation

Merge pull request #1563 from ilya-lavrenov:ocl_arithm

Adapt cap_openni.cpp to the new Ptr.

Merge pull request #1553 from pablospe:doc_include_directories_cmake

ocl: stereo_csbp: divUp -> roundUp

autogenerated code

ocl: runtime, fix 32-bit builds

fixed ocl::integral and enabled perf test for it

refactored arithm binary operations in order to make them more scalable

Merge pull request #1561 from alalek:ocl_refactoring

ocl: update module documentation

ocl: update ocl samples

ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp

ocl: merge with upstream/2.4

ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable

ocl: file-based ProgramCache refactoring

ocl: move program names into opencl_kernels.hpp

ocl: split initialization.cpp into 3 files: context, operations, programcache

removed ocl::minMax_buf, updated doc (operation on matrices)

Merge pull request #1555 from ilya-lavrenov:ocl_convertC3C4

Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.

Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.

Merge pull request #1527 from vpisarev:shape_module

Android NDK r9 support. x64 NDK support fix for MacOS X.

Android NDK r9 support. x64 NDK support fix for MacOS X.

fixed convertC3C4 and convertC4C3 functions in case cols == 1

Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)

After commit c7bbd1a, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation.

Merge pull request #1507 from pengx17:2.4_fix_test

Merge pull request #1542 from alalek:cl_runtime

removed invalid comment

Merge pull request #1543 from SpecLad:name-enum

Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm

Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not

Merge pull request #1550 from SpecLad:flann-uninit-master

ocl: cl_runtime: added autogenerated code

ocl: dynamic load of OpenCL libraries

Support functions from OpenCL 1.1 / OpenCL 1.2

enabled ocl::norm perf test

Merge pull request #1547 from SpecLad:gtest-1.7

Cherry-picked mariusmuja/flann@8c8b0e0cb879666797ab2ac51b9ee438bf84a183.

Original author: me.

fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2

Cherry-picked mariusmuja/flann@b615f2694723fe402b8bbe50d77e622beff7f171.

Original author: Alex Wilson.

Revert "Fixed a bug in FLANN resulting in uninitialized accesses."

This reverts commit a9975b144a22e76228125eb0a25f78ec13db6815, to prepare
for cherry-picking upstream's solution.

Merge pull request #1541 from SpecLad:merge-2.4

Updated Google Test to 1.7.0.

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

Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~

Merge pull request #1529 from vpisarev:polyfit_accuracy_2

Merge pull request #1451 from adrians:neon-pull2

Merge pull request #1474 from f-morozov:for_pr

Merge pull request #1533 from alalek:perf_test_update_relative_error_message

Merge pull request #1519 from ilya-lavrenov:ocl_minMax

Merge pull request #1526 from vpisarev:linedetector_python

Merge pull request #1525 from asmorkalov:ocv_custom_libv4l

Named FastFeatureDetector::Type to allow its use in makePtr.

It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278>.

removed test_norm.cpp from ocl tests

Merge pull request #1530 from alalek:perf_tests_sanity_check_nothing

Merge branch 'master' into merge-2.4

Conflicts:
doc/tutorials/definitions/tocDefinitions.rst

Merge pull request #1209 from nghiaho12:master

ocl: perf test: disable MOG2 (random hungs), enable upload/download

perf tests: added SANITY_CHECK_NOTHING()

Emergency fix: rename a conflicting label in the tutorials.

Merge remote-tracking branch 'origin/2.4'

Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp

Merge pull request #1315 from dbloisi:add_bs_tutorial

Removed trailing whitespace

Merge remote-tracking branch 'upstream/master'

fixed and extended ocl::norm

Merge pull request #1512 from Exocoder:pre-gtk3

Change true for TRUE

The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.

perf test: update error message about relative error

some more attempts to fix compile bug on Android

Merge pull request #1429 from nzjrs:fix-sketcher

Merge pull request #1457 from pengx17:2.4_oclsvm

Merge pull request #1477 from nzjrs:python-gethardwaresupport

Merge pull request #1488 from abidrahmank:py_tutorials

fixed ocl::meanStddev and created accuracy test for this function

Merge pull request #1509 from perping:2.4_docs