4f1aed98de
Conflicts: .gitignore modules/contrib/src/detection_based_tracker.cpp modules/core/include/opencv2/core/core.hpp modules/core/include/opencv2/core/internal.hpp modules/core/src/gpumat.cpp modules/core/src/opengl.cpp modules/gpu/src/cuda/safe_call.hpp modules/highgui/src/cap.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/kmeans.cpp modules/ocl/src/svm.cpp modules/ocl/test/test_objdetect.cpp samples/ocl/adaptive_bilateral_filter.cpp
OpenCV: Open Source Computer Vision Library
Resources
- Homepage: http://opencv.org
- Docs: http://docs.opencv.org
- Q&A forum: http://answers.opencv.org
- Issue tracking: http://code.opencv.org
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.
