Merge branch 'master' of code.opencv.org:opencv

Merge pull request #1047 from jet47:gpustream-remove-obsolete

Merge pull request #1046 from SpecLad:merge-2.4

Merge pull request #1036 from jet47:fix-gpu-deviceinfo

Merge pull request #1011 from wecacuee:master

Removed misleading comment and added the divisibility test to ::run function.

Merge pull request #1041 from abidrahmank:master

removed obsolete methods from gpu::Stream

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

Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp

Merge pull request #1024 from jet47:fix-gpuarithm-compilation

boxpoints documentation

Added missing python functions in highgui documentation

setMouseCallback
createTrackbar

Merge pull request #1028 from SpecLad:ocl-clahe-dtor

Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray

Merge pull request #1031 from pengx17:2.4_fix_converTo

Merge pull request #1025 from bitwangyaoyao:2.4_tests

Merge pull request #1022 from bitwangyaoyao:2.4_hog

Added cv2.boxPoints() functionality to Python bindings (Feature #2023)

http://www.code.opencv.org/issues/2023

eg:

In [3]: box = ((10,10),(5,5),0)

In [4]: cv2.boxPoints(box)
Out[4]:
array([[  7.5,  12.5],
       [  7.5,   7.5],
       [ 12.5,   7.5],
       [ 12.5,  12.5]], dtype=float32)

fix gpu::DeviceInfo compilation under linux

glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name

Merge pull request #1026 from SpecLad:ts-version-prop

Merge pull request #1014 from jet47:gpustereo-refactoring

Merge pull request #1015 from SpecLad:merge-2.4

Merge pull request #1033 from SpecLad:xls++

Merge pull request #1010 from jet47:gpufilters-refactoring

Revise naming for getOclMat function.

a bug fix in stereo_match sample

Add a workaround to interpolate between oclMat and Input/OutputArray.

Use log formatting as intended.

A few minor improvements to the XLS report generator.

* In comparison column headers, switched the order of labels, so that
  it's "to" vs "from".

* When a test was present, but not run successfully, put its status in
  the corresponding cell instead of coloring it gray.

Merge pull request #1027 from jet47:fix-cuda-4.2-build

Merge pull request #1017 from jet47:fix-gpu-warnings

removed obsolete API

Fix a bug of convertTo.
The bug was found that all 3-channel oclMat's were converted to
4-channel oclMat's after using convertTo function.

Merge pull request #954 from LeszekSwirski:24_fix-qtwindow

Give cv::ocl::CLAHE a virtual destructor, for the usual reasons.

fixed compilation with CUDA 4.2

Merge remote-tracking branch 'origin/2.4'

Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats

Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp

Make version-related test properties more useful.

Namely, normalize their names to a common convention and remove useless text
from their values.

Merge pull request #1023 from pengx17:2.4_fix_amd_path

revise ocl samples, add tvl1 sample

Merge pull request #1012 from apavlenko:fix_3077

Merge pull request #1016 from SpecLad:xls-report

Merge pull request #1020 from SpecLad:tests-record-more

fix gpuarithm module compilation (Bug #3103)

revise accuracy and perf tests

Fix cmake path finding for amd libs.
There is no WIN64 defined in the environment.

optimize hog

Merge pull request #1008 from ivan-korolev:fix_sift_bug_2892

Made tests record information about CPU features and Tegra optimization status.

Made tests record in the XML output which parallel framework was used.

fix gpu warnings with signed/unsigned char

Merge pull request #994 from asmorkalov:android_java_wrappers

Java/Python bindings for computeCorrespondEpilines added.

Simle Java test for computeCorrespondEpilines added.

Merge pull request #1007 from alekcac:i_camera

Made xls-report.py ignore tests that were not successful.

Made the order of tests in XLS reports deterministic.

In the XLS report, enabled word wrapping for header cells.

Otherwise, Excel ignores line breaks in them.

Added a new and improved version of the XLS report generator.

Updated testlog_parser.py to the latest version from the private repo.

updated documentation

updated licenses

fixed Kirill's comments

updated documentation

fix for #3077
removing "-fvisibility=hidden" gcc option due to lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT

support elementwise division for Matx with "/" operator.

switched to Input/Output Array in  reprojectImageTo3D & drawColorDisp

refactored DisparityBilateralFilter

refactored StereoConstantSpaceBP

refactored StereoBeliefPropagation

refactored StereoBM

refactored 1D Sum Filters

refactored Image Rank Filters

refactored Morphology Filters

refactored Separable Linear Filters

refactored Laplacian filter

refactored Linear Filter

refactored box filter

Added regression tests for SURF/SIFT (related to #2892)

Merge pull request #977 from jet47:gpucodec-refactoring

Merge pull request #978 from jet47:gpuarithm-refactoring

Merge pull request #996 from jet47:gpu-nvcuvid-libraries

Merge pull request #995 from jet47:fix-bug-2985

Merge pull request #999 from snosov1:unreliable-results-fix

Merge pull request #1005 from alekcac:doc_fix

Merge pull request #1004 from jet47:fix-bug-3068

Merge pull request #1003 from vhdirk:gstreamerfixes

Merge pull request #987 from jet47:bug-3085-fix

Merge pull request #983 from HapeMask:python3-compatibility

Merge pull request #969 from pengx17:2.4_binary_cache

Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows

Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure.

Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892

Merge pull request #1001 from ivan-korolev:fix_stitching_bug_2405

Fix bug with indices

fix for bug #3068 (PCA::computeVar for double input):

The matrix g  can have CV_32F or CV_64F type,  but g.at uses only float template.
This fix adds specialization for double type.

Fix a bug caused by NDEBUG macro; it is now removed.
Revise some descriptions of the enums.

Merge pull request #990 from asmorkalov:pthread_build_fix

Merge pull request #976 from PeterMinin:num_detections

Fixed a bug #2405

Merge pull request #998 from asmorkalov:android_cmake_mips_fix