actually use function names for generating cross references, fixes many sphinx warnings

git-svn-id: https://code.ros.org/svn/opencv/trunk@1843 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/doc2/plastex/find_function_names.sh b/opencv/doc2/plastex/find_function_names.sh
index cbabbf01a147074696c8a12c83ba5c9e3a5bf327..9dd8bb5a99b7cec77203b64ffea1d9783a5a5faa 100644 (file)
--- a/opencv/doc2/plastex/find_function_names.sh
+++ b/opencv/doc2/plastex/find_function_names.sh
@@ -3,5 +3,9 @@ grep ".. cfunction::" *.rst -h |
 python -c "import sys
 print \"opencv_function_names = [\"
 for line in sys.stdin.readlines():
-    print \"'%s',\" % line.split()[3].strip(' (')
+    fname = line.split()[3].strip(' (')
+    bpos = fname.find('(')
+    if bpos >= 0:
+        fname = fname[:bpos]
+    print \"'%s',\" % fname
 print \"]\"" > function_names.py

diff --git a/opencv/doc2/plastex/function_names.py b/opencv/doc2/plastex/function_names.py
index 0dc2fe6c5df7913ba7d75eb19c93ed97fb44d853..875cfe153f5d802d2970bd125f10f5de6210a316 100644 (file)
--- a/opencv/doc2/plastex/function_names.py
+++ b/opencv/doc2/plastex/function_names.py
@@ -188,12 +188,12 @@ opencv_function_names = [
 'cvCvtColor',
 'cvThreshold',
 'cvAdaptiveThreshold',
-'cvPyrDown(const',
-'cvPyrUp(const',
-'cvPyrSegmentation(IplImage*',
-'cvFloodFill(CvArr*',
-'cvFindContours(CvArr*',
-'cvStartFindContours(CvArr*',
+'cvPyrDown',
+'cvPyrUp',
+'cvPyrSegmentation',
+'cvFloodFill',
+'cvFindContours',
+'cvStartFindContours',
 'cvFindNextContour',
 'cvSubstituteContour',
 'cvEndFindContours',
@@ -205,7 +205,7 @@ opencv_function_names = [
 'cvHoughLines2',
 'cvHoughCircles',
 'cvDistTransform',
-'cvCreateHist(int',
+'cvCreateHist',
 'cvSetHistBinRanges',
 'cvReleaseHist',
 'cvClearHist',
@@ -263,11 +263,11 @@ opencv_function_names = [
 'cvCreateMat',
 'cvCreateMatHeader',
 'cvReleaseMat',
-'cvInitMatHeader(CvMat*',
-'cvMat(int',
+'cvInitMatHeader',
+'cvMat',
 'cvCloneMat',
-'cvCreateMatND(int',
-'cvCreateMatNDHeader(int',
+'cvCreateMatND',
+'cvCreateMatNDHeader',
 'cvReleaseMatND',
 'cvInitMatNDHeader',
 'cvCloneMatND',

diff --git a/opencv/doc2/plastex/renderer.py b/opencv/doc2/plastex/renderer.py
index 72d97d6e3135a0eef2093cdd03777cca95848da8..6008500aa21c92b2898a091beb50dd0ab4282595 100644 (file)
--- a/opencv/doc2/plastex/renderer.py
+++ b/opencv/doc2/plastex/renderer.py
@@ -229,8 +229,10 @@ class reStructuredTextRenderer(BaseRenderer):
     and if yes, generate the appropriate reference markup
     """
     name = name.strip()
-    if name[0:2] == 'cv' or name in opencv_function_names:
+    if name[0:2] == 'cv':
         return u":cfunc:`%s`" % self.fixup_funcname(name)
+    elif 'cv'+name in opencv_function_names:
+        return u":cfunc:`cv%s`" % self.fixup_funcname(name)
     elif name[0:2] == 'Cv' or name[0:3] == 'Ipl':
         return u":ctype:`%s`" % name
     elif name[0:2] == 'CV':