Merge pull request #2255 from ilya-lavrenov:ocl_doc

11 years ago · 206df7fdb1
parent 82330a51bd f8dd9960af
commit 206df7fdb1
2 changed files with 1 additions and 2 deletions
--- a/modules/java/generator/rst_parser.py
+++ b/modules/java/generator/rst_parser.py
@ -1,7 +1,7 @@
 #!/usr/bin/env python

 import os, sys, re, string, fnmatch
-allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "ocl", "softcascade", "superres"]
+allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "softcascade", "superres"]
 verbose = False
 show_warnings = True
 show_errors = True
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@ -62,7 +62,6 @@ endif()

 add_subdirectory(c)
 add_subdirectory(cpp)
-add_subdirectory(ocl)
 # FIXIT: can't use cvconfig.h in samples: add_subdirectory(gpu)

 if(WIN32)