Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-09-11 12:52:33 -05:00 · 2020-10-07 09:09:37 +00:00
parent d5dce63254 62b5d37b6b
commit 39d5e14c1f
9 changed files with 96 additions and 33 deletions
--- a/modules/java/generator/gen_java.py
+++ b/modules/java/generator/gen_java.py
@@ -787,6 +787,7 @@ class JavaWrapperGenerator(object):
                            inCode = True
                        if "</code>" in line:
                            inCode = False
+                        line = line.replace('@result ', '@return ')  # @result is valid in Doxygen, but invalid in Javadoc
                        if "@return " in line:
                            returnTag = True