Merge https://github.com/Itseez/opencv

Merge pull request #1257 from SpecLad:merge-2.4

Merge branch 'master' into merge-2.4

Conflicts:
modules/photo/doc/inpainting.rst

Merge https://github.com/Itseez/opencv

Merge pull request #1253 from kamjagin:fixingCompilationOnOSX

adding std to cstdint typedef of uint32_t

defined uint for non-windows platforms too. replaced isnan for cvIsNaN.

Merge pull request #1265 from abidrahmank:misc_docs2

Merge pull request #1186 from SpecLad:dont-export-templates

Merge https://github.com/Itseez/opencv

Merge pull request #1149 from jet47:generalized-hough-refactoring

Merge pull request #1162 from jet47:cudev-integration

docs changes

docs changes

Merge pull request #1260 from SpecLad:no-cr-master

Replaced isfinite() with cvIsInf and cvIsNan

Adjusted the camera calibration sample to master API.

Merge https://github.com/Itseez/opencv

Fixed CR line endings in non_linear_svms.rst.

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

Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml

Merge pull request #1250 from denzp:opencl_detection_unix

properly set OpenCL lib search path

Merge pull request #1238 from SpecLad:cmake-min-ver

Inlined the getMD5 macro, which no longer saves us anything.

Merge pull request #1242 from asmorkalov:android_native_cam

Merge pull request #1235 from WonderRico:bugfix_dshow

fix _index / index

Merge pull request #1247 from StevenPuttemans:bugfix_3205

Merge pull request #1163 from kdrobnyh:Morphology

Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2

Merge pull request #1246 from StevenPuttemans:bugfix_3206

Added fix mentioned in bug #3206
VideoWriter memory leak solved.

bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140)

fix formating

Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample

Native camera libraries updated.

Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.

Merge pull request #1244 from vkocheganov:bugfix_3179

Fix unsequenced modifications (Bug #3179).

Removed extra {} in erosion and dilation functions

Removed obsolete CMake workaround.

Removed CMakeParseArguments.cmake, which we don't use.

It's part of CMake nowadays, too.

Removed OpenCVFindPkgConfig.cmake, since it's bundled with CMake now.

In fact, I don't think we actually use it... but I kept the include,
just in case.

Dropped OpenCVConfig.cmake - we don't use it anymore.

Removed CMake version checks that we don't need anymore.

Bumped minimal CMake version to 2.8.7.

Merge pull request #1233 from vpisarev:24_ipp_78

Fixed build of camera calibration android sample

polished the patch

Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation

Added extra comment to test buildbot

Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.

Merge pull request #1237 from SpecLad:xls-separate-wh

Added a new file for recording minimal dependency versions.

xls-report.py: separated image width and height for easier analysis.

Merge pull request #1189 from pengx17:2.4_sort_by_key

Update intersection.cpp

Added #ifdef _WIN32 for finite number testing

Merge pull request #1228 from vkocheganov:bug_3191

Merge pull request #1187 from kdrobnyh:mean_and_sum

Merge pull request #1230 from SpecLad:merge-2.4

Merge pull request #1231 from SpecLad:static-ts

Bug #3201 fix

disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)

Fixed compilation errors.

Fixed documentation errors.

Fix whitespace errors.

Make ts always static.

This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.

Merge pull request #1216 from alekcac:sphinx

Removed useless .*

Merge remote-tracking branch 'origin/2.4'

Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp

Fix unsequenced assignment (Bug #3191).

Merge pull request #1225 from apavlenko:fix_format_security

Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor

Merge pull request #1226 from apavlenko:fix_java_test_ellipse2poly

fixing java test after fix in OpenCV library

fixing compilation with `-Werror=format-security` enabled

Merge pull request #1079 from AlexeySpizhevoy:master

Merge pull request #1220 from asmorkalov:msmf_sizet_fix

Merge pull request #1221 from philippefoubert:branch_cmake_cmp0004

Merge pull request #1222 from philippefoubert:branch_2.4_pvapi

Merge pull request #1151 from jet47:gpubgsegm-refactoring

Solve the problem seen when using recent versions of CMake (such as 2.8.11): OpenCVConfig.cmake violates the policy CMP0004.

Symptoms:
CMake Error at CMakeLists.txt:10 (add_executable):
Target "my_app" links to item "C:/Program Files " which has leading
or trailing whitespace. This is now an error according to policy CMP0004.

This problem occurs when building on Windows when we depend on libraries located (for example) in "C:\Program Files (x86)..."

Difference in method definition and declaration fixed (Bug #3189).

Merge pull request #1219 from asmorkalov:winrt_neon

NEON instruction set enabled for WIN32 on ARM by default.

Update OpenCVDetectPython.cmake

On my MacOS the output of the sphinx-build binary is the following:

Error: Insufficient arguments.

Sphinx v1.2b1
Usage: /usr/local/bin/sphinx-build [options] sourcedir outdir [filenames...]

...

I have installed sphinx, but without this change HAVE_SPHINX==0 for me, so I can't build docs.

Merge pull request #1214 from StevenPuttemans:feature_3169_others

Merge pull request #1205 from asmorkalov:winrt_api_cert_fix

Added sample links in documentation for python2, ocl and gpu

Warning and review notes fixes.

WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.

Merge pull request #1212 from jet47:gpu-calc-hist

use NPP version for Fermi

optimized version of histEven for CV_8UC1

rewrite histEven test

compare cv::gpu::calcHist with cv::calcHist

Merge branch 'master' of https://github.com/nghiaho12/opencv

Added test cpp

Added test cpp

Merge https://github.com/Itseez/opencv

Keeping up to date

Finished test code, added image to the doc

WinRT API Certification fixes for core and contrib.