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

Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt

Merge pull request #1646 from alalek:ocl_fix_msvc11

Merge pull request #1575 from jet47:gpu-buffer-pool

Merge pull request #1540 from jet47:gpuarithm-cudev

Merge pull request #1492 from jet47:gpucodec-cudev

Merge pull request #1534 from jet47:fix-cuda-5.0-build

Merge pull request #1556 from jet47:fix-bug-3296

Merge pull request #1650 from jet47:fix-gpu-bgsegm-sample

Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative

Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix

Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations

Merge pull request #1633 from ilya-lavrenov:ocl_imgproc

fixed ocl::Laplacian for case when scale != 1

missed initialization of kernel size

Merge pull request #1651 from ilya-lavrenov:misprint

added reflect, reflect101, replicate, wrap border types to ocl::remap

misprint

fix bug in gpu bgsegm sample

create `d_fgimg` matrix before cleaning.

made more demonstrative message about test fails

ocl: workaround for msvc11 bug

"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.

Merge pull request #1587 from alalek:opencl_khronos_headers

Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix

Merge pull request #1641 from jet47:imshow-opengl-fix

Merge pull request #1642 from alalek:cmake_cleanup_targets

refactored ocl matrix operations accuracy tests

enabled double in copyMakeBorder kernel

rewrote ocl::remap

fixed ocl::copyMakeBorder

added ROI support to ocl::convolve

added ROI support to ocl::columnSum

added ROI support to ocl::CLAHE

refactored all the tests in ocl/test/test_imgproc.cpp

ocl: update autogenerated code

ocl: force to use Khronos OpenCL headers

added Khronos OpenCL 1.2 header files

Merge pull request #1640 from alalek:ocl_fix_exp_test

Merge pull request #1626 from ilya-lavrenov:ocl_filters

Updated ffmpeg_vesion.cmake after #1516.

cmake: cleanup OpenCVModules_TARGETS from cache

This will allow to disable modules between cmake runs

fix imshow under Windows with OpenGL support:

we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow

ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow

Merge tag '2.4.6.2' into 2.4

OpenCV 2.4.6.2 (Tegra detection and native camera update)

Merge pull request #1636 from ilya-lavrenov:ocl_loop_times

Merge pull request #1369 from StevenPuttemans:fix_featuretracker

Merge pull request #1516 from akarsakov:new_ffmpeg_build

made LOOP_TIMES as a command line option with default value=1

Updated build of ffmpeg library (v 2.0.2). Builded with mingw (gcc 4.6.1) with
folowing additional options: --enable-w32threads, --arch=i686 (for 32-bit
library, workaround for http://trac.ffmpeg.org/ticket/2363)

Merge pull request #1637 from SpecLad:run-py-java-fix

refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter

Merge pull request #1613 from alalek:ocl_cvtcolor

Merge pull request #1632 from alalek:cmake_find_package_build_dir

Merge pull request #1635 from alalek:cmake_fix_export_java

Merge pull request #1634 from alalek:cmake_fix_cuda_linker_deps

ocl: rewrite CvtColor tests, added roi support

Fix running Java tests with run.py on everything other than Windows.

Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.

The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.

cmake: fix linker deps for CUDA

cmake: add opencv_java into list of exported targets (fix for android)

Merge pull request #1631 from alalek:merge-2.4

Merge pull request #1375 from jet47:gpu-examples-build

cmake: restore find_package() for build directory

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

* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
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/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp

Merge pull request #1630 from SpecLad:java-deprecated-assert

Merge pull request #1627 from SpecLad:java-version-no-inline

Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.

We don't use it, anyway.

In Java bindings, wrap version constants into functions to prevent inlining.

Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.

This arranges that by turning constant values into function calls, which no
longer count as a constant expression.

Merge pull request #1620 from SpecLad:record-build-type

Merge pull request #1625 from ilya-lavrenov:to_string

replaced to_string by cv::format

Record OpenCV build type among the test properties.

Because apparently I love running performance tests for debug builds.

Merge pull request #1622 from a0byte:2.4

Merge pull request #1573 from alalek:perf_simple_strategy

Merge pull request #1617 from ilya-lavrenov:ocl_info

Fixed typo in document.

Signed-off-by: Han Qiang <a0byte@gmail.com>

demonstrative device info output

Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint

Merge pull request #1612 from alalek:ocl_fix_string_info

Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization

Merge pull request #1616 from ilya-lavrenov:ocl_cvtColor

Merge pull request #1450 from adrians:neon-pull3

misprint in disabling ocl::svm

some optimization of binary ocl::bitwise operations

ocl::cvtColor works with ROI properly

perf: added simple collection strategy

ocl: fix for get string info from OpenCL

Merge pull request #1611 from che-burashco:master

Merge pull request #1610 from alalek:ocl_fix_perf_kalman

Merge pull request #1608 from alalek:fix_warn_upd_haar

Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup

Merge pull request #1606 from ilya-lavrenov:ocl_imgproc

Merge pull request #1602 from alalek:ocl_test_dump_info

Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas

Fix a typo in kernel size

ocl: reverted type of perf test params for Kalman filter

refactored ocl/src/imgproc.cpp

fft cleanup ignoring

disable SVM when AMD BLAS is not available

Merge pull request #1605 from alalek:ocl_fixes

ocl: fix warnings from GCC 4.8, update Haar

ocl: dump device info in tests

ocl: fix CV_EXPORTS usage (misplaced in functions declarations)