Roman Donchenko 6b5ac42a9b 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

2013-08-13 12:56:39 +04:00

..

checks

Fix whitespace errors.

2013-08-06 18:07:00 +04:00

templates

Fix whitespace errors.

2013-08-06 18:07:00 +04:00

cl2cpp.cmake

discard comments in kernels.cpp

2013-03-26 12:01:01 +08:00

OpenCVCompilerOptions.cmake

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

2013-06-10 18:18:01 +04:00

OpenCVCRTLinkage.cmake

Warning and review notes fixes.

2013-08-02 04:10:56 -07:00

OpenCVDetectAndroidSDK.cmake

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

2013-08-08 12:03:41 +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

Fix cmake path finding for amd libs.

2013-06-19 11:31:42 +08:00

OpenCVDetectPython.cmake

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

2013-08-13 12:56:39 +04: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

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

2013-08-06 18:31:06 +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

Removed obsolete CMake workaround.

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

OpenCVFindLibsGUI.cmake

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

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

OpenCVFindLibsPerf.cmake

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

OpenCVFindLibsVideo.cmake

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04: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

Fixed Ximea cameras support

2013-06-11 21:17:31 +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

OpenCVGenPkgconfig.cmake

Removed useless VERSION macro (and CMake variable)

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

OpenCVMinDepVersions.cmake

Bumped minimal CMake version to 2.8.7.

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

OpenCVModule.cmake

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

OpenCVPCHSupport.cmake

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

OpenCVUtils.cmake

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

2013-06-14 15:46:25 +04:00

OpenCVVersion.cmake

Consistently use 4-digit library version

2013-01-18 14:57:55 +04:00