Open Source Computer Vision Library
Go to file
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
3rdparty Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
apps Replace an incorrect usage of Ptr with a simple vector. 2013-09-05 19:02:59 +04:00
cmake Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
data fixed malformed XML 2013-09-19 16:32:32 -04:00
doc Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
include Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
modules Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
platforms Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
samples Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
.gitattributes Made changes to OpenCVFindMatlab suggested by SpecLad 2013-09-14 13:32:15 +10:00
.gitignore Merge pull request #1427 from SpecLad:merge-2.4 2013-09-10 18:28:20 +04:00
CMakeLists.txt Merge pull request #1384 from hbristow:matlab_public 2013-09-19 10:25:02 +04:00
index.rst GSoC Python Tutorials 2013-09-23 13:41:14 +05:30
README.md Updated README.md 2013-07-30 18:51:53 +04:00

OpenCV: Open Source Computer Vision Library

Resources

Contributing

Please read before starting work on a pull request: http://code.opencv.org/projects/opencv/wiki/How_to_contribute

Summary of guidelines:

  • One pull request per issue;
  • Choose the right base branch;
  • Include tests and documentation;
  • Clean up "oops" commits before submitting;
  • Follow the coding style guide.

Donate OpenCV project Donate OpenCV project