Attachment 705 Details for Bug 1166 – patch to fix 1166 according to solution C: commit-e424c28-Fix-C.patch

[patch] patch to fix 1166 according to solution C: commit-e424c28-Fix-C.patch

commit-e424c28-Fix-C.patch (text/plain), 1.72 KB, created by Xerxes Rånby on 2015-07-08 22:20:40 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Xerxes Rånby

Created: 2015-07-08 22:20:40 CEST

Size: 1.72 KB

patch

obsolete

>commit e424c28f869269f5a22c22ef017230346b22847a
>Author: Xerxes RÃ¥nby <xerxes@gudinna.com>
>Date:   Wed Jul 8 22:06:32 2015 +0200
>
>    BUG 1166: Fix JavaEmitter JVMUtil_NewDirectByteBufferCopy
>    
>    Prevents jlong to jint truncation
>    when capacity is passed from jni to java.
>    
>    com.jogamp.common.nio.Buffers newDirectByteBuffer
>    and the underlying java.nio.ByteBuffer allocateDirect
>    only work with capacitys of int size.
>    
>    Signed-off-by: Xerxes RÃ¥nby <xerxes@gudinna.com>
>
>diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java
>index 60cd3f4..1952a43 100644
>--- a/src/java/com/jogamp/gluegen/JavaEmitter.java
>+++ b/src/java/com/jogamp/gluegen/JavaEmitter.java
>@@ -2501,7 +2501,7 @@ public class JavaEmitter implements GlueEmitter {
>     if (getConfig().emitImpl()) {
>       cWriter.println("#include <assert.h>");
>       cWriter.println();
>-      cWriter.println("static jobject JVMUtil_NewDirectByteBufferCopy(JNIEnv *env, void * source_address, jlong capacity); /* forward decl. */");
>+      cWriter.println("static jobject JVMUtil_NewDirectByteBufferCopy(JNIEnv *env, void * source_address, jint capacity); /* forward decl. */");
>       cWriter.println();
>     }
>     for (final String code : cfg.customCCode()) {
>@@ -2549,7 +2549,7 @@ public class JavaEmitter implements GlueEmitter {
>          "    return JNI_TRUE;\n"+
>          "}\n"+
>          "\n"+
>-         "static jobject JVMUtil_NewDirectByteBufferCopy(JNIEnv *env, void * source_address, jlong capacity) {\n"+
>+         "static jobject JVMUtil_NewDirectByteBufferCopy(JNIEnv *env, void * source_address, jint capacity) {\n"+
>          "    jobject jbyteBuffer;\n"+
>          "    void * byteBufferPtr;\n"+
>          "\n"+

Actions: View | Diff

Attachments on bug 1166: 699 | 700 | 702 | 704 | 705