* Make sure Parser exhausts all combinations of method parameter t…

…ypes even with duplicates (issue bytedeco/javacv#518)
bytedeco · Oct 10, 2016 · bf899dc · bf899dc
1 parent 076fd04
commit bf899dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Make sure `Parser` exhausts all combinations of method parameter types even with duplicates ([issue bytedeco/javacv#518](https://github.com/bytedeco/javacv/issues/518))
  * Make `Loader` cache libraries (in `~/.javacpp/cache/` by default) instead of using temporary files ([pull #120](https://github.com/bytedeco/javacpp/pull/120))
  * Have `Parser` annotate the `allocate()` functions and not the actual constructors ([issue bytedeco/javacpp-presets#297](https://github.com/bytedeco/javacpp-presets/issues/297))
  * Fix `Parser` handling of `class`, `struct`, or `union` types with variables declared in the same statement

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -1741,7 +1741,7 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
                 if (type.virtual && context.virtualize) {
                     break;
                 }
-            } else if (found && n / 2 > 0 && n % 2 == 0) {
+            } else if (found && n / 2 > 0 && n % 2 == 0 && n / 2 > Math.max(dcl.infoNumber, dcl.parameters.infoNumber)) {
                 break;
             }
             prevDcl.add(dcl);