mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-05 22:19:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18519 from alalek:fix_javadoc

Browse Source
This commit is contained in:
Alexander Alekhin 2020-10-06 22:48:21 +00:00
commit d78d9bf151
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/include/opencv2/calib3d.hpp
View File

@ -2163,7 +2163,7 @@ final fundamental matrix. It can be set to something like 1-3, depending on the
point localization, image resolution, and the image noise. point localization, image resolution, and the image noise.
@param confidence Parameter used for the RANSAC and LMedS methods only. It specifies a desirable level @param confidence Parameter used for the RANSAC and LMedS methods only. It specifies a desirable level
of confidence (probability) that the estimated matrix is correct. of confidence (probability) that the estimated matrix is correct.
@param mask @param[out] mask optional output mask
@param maxIters The maximum number of robust method iterations. @param maxIters The maximum number of robust method iterations.
The epipolar geometry is described by the following equation: The epipolar geometry is described by the following equation:

1
modules/java/generator/gen_java.py
View File

@ -769,6 +769,7 @@ class JavaWrapperGenerator(object):
inCode = True inCode = True
if "</code>" in line: if "</code>" in line:
inCode = False inCode = False
line = line.replace('@result ', '@return ') # @result is valid in Doxygen, but invalid in Javadoc
if "@return " in line: if "@return " in line:
returnTag = True returnTag = True