* In addition to direct NIO buffers, also accept as function argumen…

…ts non-direct ones backed by arrays (issue bytedeco/javacpp-presets#36)
bytedeco · Feb 18, 2015 · ab7237e · ab7237e
1 parent 52b7ee1
commit ab7237e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * In addition to direct NIO buffers, also accept as function arguments non-direct ones backed by arrays ([issue bytedeco/javacpp-presets#36](https://github.com/bytedeco/javacpp-presets/issues/36))
  * Fix `@Virtual` callback functions defined inside a `@Namespace`
  * Adjust `TokenIndexer` and `Parser` to handle `#if`, `#ifdef`, `#ifndef`, `#elif`, `#else`, and `#endif` preprocessor directives more appropriately, even when placed in the middle of declarations
  * Append `@Documented` to annotation types to have them picked up by Javadoc

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Generator.java b/src/main/java/org/bytedeco/javacpp/tools/Generator.java
@@ -334,6 +334,7 @@ boolean classes(boolean handleExceptions, boolean defineAdapters, String classPa
         out.println("static jfieldID JavaCPP_limitFID = NULL;");
         out.println("static jfieldID JavaCPP_capacityFID = NULL;");
         out.println("static jmethodID JavaCPP_initMID = NULL;");
+        out.println("static jmethodID JavaCPP_arrayMID = NULL;");
         out.println("static jmethodID JavaCPP_toStringMID = NULL;");
         out.println();
         out.println("static inline void JavaCPP_log(const char* fmt, ...) {");
@@ -805,6 +806,11 @@ boolean classes(boolean handleExceptions, boolean defineAdapters, String classPa
         out.println("    if (JavaCPP_initMID == NULL) {");
         out.println("        return JNI_ERR;");
         out.println("    }");
+        out.println("    JavaCPP_arrayMID = JavaCPP_getMethodID(env, " +
+                jclasses.index(Buffer.class) + ", \"array\", \"()Ljava/lang/Object;\");");
+        out.println("    if (JavaCPP_arrayMID == NULL) {");
+        out.println("        return JNI_ERR;");
+        out.println("    }");
         out.println("    JavaCPP_toStringMID = JavaCPP_getMethodID(env, " +
                 jclasses.index(Object.class) + ", \"toString\", \"()Ljava/lang/String;\");");
         out.println("    if (JavaCPP_toStringMID == NULL) {");
@@ -1100,6 +1106,24 @@ void parametersBefore(MethodInformation methodInfo) {
                         out.println("    jint size" + j +
                                 " = arg" + j + " == NULL ? 0 : env->GetDirectBufferCapacity(arg" + j + ");");
                     }
+                    if (methodInfo.parameterTypes[j] != Buffer.class) {
+                        // given the component type, we can also fetch the array of non-direct buffers
+                        String S = methodInfo.parameterTypes[j].getSimpleName();
+                        S = S.substring(0, S.length() - 6);
+                        String s = Character.toLowerCase(S.charAt(0)) + S.substring(1);
+                        out.println("    j" + s + "Array arr" + j + " = NULL;");
+                        out.println("    if (arg" + j + " != NULL && ptr" + j + " == NULL) {");
+                        out.println("        arr" + j + " = (j" + s + "Array)env->CallObjectMethod(arg" + j + ", JavaCPP_arrayMID);");
+                        out.println("        if (env->ExceptionOccurred() != NULL) {");
+                        out.println("            env->ExceptionClear();");
+                        out.println("        } else {");
+                        out.println("            ptr" + j + " = arr" + j + " == NULL ? NULL : env->Get" + S + "ArrayElements(arr" + j + ", NULL);");
+                        if (adapterInfo != null || prevAdapterInfo != null) {
+                            out.println("            size" + j + " = env->GetArrayLength(arr" + j + ");");
+                        }
+                        out.println("        }");
+                        out.println("    }");
+                    }
                 } else {
                     out.println("arg" + j + ";");
                     logger.warn("Method \"" + methodInfo.method + "\" has an unsupported parameter of type \"" +
@@ -1607,6 +1631,13 @@ void parametersAfter(MethodInformation methodInfo) {
                     String S = Character.toUpperCase(s.charAt(0)) + s.substring(1);
                     out.println("env->Release" + S + "ArrayElements(arg" + j + ", (j" + s + "*)ptr" + j + ", 0);");
                 }
+            } else if (Buffer.class.isAssignableFrom(methodInfo.parameterTypes[j])
+                    && methodInfo.parameterTypes[j] != Buffer.class) {
+                out.print("    if (arr" + j + " != NULL) ");
+                String S = methodInfo.parameterTypes[j].getSimpleName();
+                S = S.substring(0, S.length() - 6);
+                String s = Character.toLowerCase(S.charAt(0)) + S.substring(1);
+                out.println("env->Release" + S + "ArrayElements(arr" + j + ", (j" + s + "*)ptr" + j + ", 0);");
             }
         }
     }