From 644de8f22a1045ae6df15dce7892fd00ab15d310 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 6 Oct 2020 04:28:25 +0000 Subject: [PATCH] java: fix javadoc generation --- modules/calib3d/include/opencv2/calib3d.hpp | 2 +- modules/java/generator/gen_java.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/calib3d/include/opencv2/calib3d.hpp b/modules/calib3d/include/opencv2/calib3d.hpp index e025a79ee0..7ce36c6fed 100644 --- a/modules/calib3d/include/opencv2/calib3d.hpp +++ b/modules/calib3d/include/opencv2/calib3d.hpp @@ -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. @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. -@param mask +@param[out] mask optional output mask @param maxIters The maximum number of robust method iterations. The epipolar geometry is described by the following equation: diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py index fe61c0be33..03075c5ae7 100755 --- a/modules/java/generator/gen_java.py +++ b/modules/java/generator/gen_java.py @@ -769,6 +769,7 @@ class JavaWrapperGenerator(object): inCode = True if "" in line: inCode = False + line = line.replace('@result ', '@return ') # @result is valid in Doxygen, but invalid in Javadoc if "@return " in line: returnTag = True