Roman Donchenko 81eb4bd8be 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

2013-10-01 15:57:33 +04:00

..

checks

Converted tabs to spaces.

2013-08-21 18:59:26 +04:00

templates

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

cl2cpp.cmake

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenCVCompilerOptions.cmake

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

2013-08-27 19:15:47 +04:00

OpenCVCRTLinkage.cmake

/apicontainer added to linker flags on WinRT to fix api test issues.

2013-08-28 08:36:57 -07:00

OpenCVDetectAndroidSDK.cmake

Reenabled adding native app glue for Android samples.

2013-09-09 18:16:20 +04:00

OpenCVDetectApacheAnt.cmake

Fix ant/Java detection in cmake scripts

2013-03-29 18:29:40 +04:00

OpenCVDetectCStripes.cmake

fixed C= detection script

2012-10-10 16:15:27 +04:00

OpenCVDetectCUDA.cmake

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

2013-08-08 12:03:41 +04:00

OpenCVDetectCXXCompiler.cmake

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

OpenCVDetectOpenCL.cmake

properly set OpenCL lib search path

2013-08-12 18:25:01 +03:00

OpenCVDetectPython.cmake

Added plantuml extension

2013-09-12 10:41:21 +00:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

2013-02-06 14:43:57 +04:00

OpenCVExtraTargets.cmake

Drop outdated targets and fix solution folders

2013-03-25 21:57:53 +04:00

OpenCVFindIPP.cmake

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenCVFindLATEX.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindLibsGrfmt.cmake

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

2013-08-27 19:15:47 +04:00

OpenCVFindLibsGUI.cmake

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

2013-08-27 19:15:47 +04:00

OpenCVFindLibsPerf.cmake

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

OpenCVFindLibsVideo.cmake

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

2013-08-27 19:15:47 +04:00

OpenCVFindMatlab.cmake

Added TODO for the future of Matlab version sorting

2013-09-16 00:48:07 +10:00

OpenCVFindOpenEXR.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindOpenNI.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindWebP.cmake

This code is based on https://github.com/prasannatsm/opencv code.

2013-03-11 11:51:38 +04:00

OpenCVFindXimea.cmake

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenCVGenAndroidMK.cmake

Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

2013-02-22 11:57:42 +04:00

OpenCVGenConfig.cmake

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

2013-08-04 20:52:49 +02:00

OpenCVGenHeaders.cmake

Removed unused PACKAGE_* macros.

2013-07-11 14:30:46 +04:00

OpenCVGenInfoPlist.cmake

Fix building the iOS framework after I dropped the VERSION macro.

2013-08-06 18:56:36 +04:00

OpenCVGenPkgconfig.cmake

Removed useless VERSION macro (and CMake variable)

2013-07-11 14:30:46 +04:00

OpenCVMinDepVersions.cmake

Bumped minimal Python version to 2.6.

2013-08-23 18:46:54 +04:00

OpenCVModule.cmake

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

OpenCVPCHSupport.cmake

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

OpenCVUtils.cmake

Fix errors in usages of try_compile

2013-08-22 15:56:35 +04:00

OpenCVVersion.cmake

Added version status support into the build system.

2013-09-12 16:37:05 +04:00