Skip to content

Commit d78d9bf

Browse files
committed
Merge pull request opencv#18519 from alalek:fix_javadoc
2 parents a5f0fb6 + 644de8f commit d78d9bf

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

modules/calib3d/include/opencv2/calib3d.hpp

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

modules/java/generator/gen_java.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@ def gen_func(self, ci, fi, prop_name=''):
769769
inCode = True
770770
if "</code>" in line:
771771
inCode = False
772+
line = line.replace('@result ', '@return ') # @result is valid in Doxygen, but invalid in Javadoc
772773
if "@return " in line:
773774
returnTag = True
774775

0 commit comments

Comments
 (0)