Conflicts: modules/core/include/opencv2/core/operations.hpp modules/core/include/opencv2/core/version.hpp modules/core/src/gpumat.cpp modules/cudaimgproc/src/color.cpp modules/features2d/src/orb.cpp modules/imgproc/src/samplers.cpp modules/ocl/include/opencv2/ocl/matrix_operations.hpp modules/ocl/include/opencv2/ocl/ocl.hpp samples/ocl/facedetect.cpp |
||
|---|---|---|
| .. | ||
| boost.cpp | ||
| boost.h | ||
| cascadeclassifier.cpp | ||
| cascadeclassifier.h | ||
| CMakeLists.txt | ||
| features.cpp | ||
| haarfeatures.cpp | ||
| haarfeatures.h | ||
| HOGfeatures.cpp | ||
| HOGfeatures.h | ||
| imagestorage.cpp | ||
| imagestorage.h | ||
| lbpfeatures.cpp | ||
| lbpfeatures.h | ||
| traincascade_features.h | ||
| traincascade.cpp | ||