JavaCallbackEmitter.{emitCSetFuncPreCall, emitCAdditionalCode, emitJavaCallbackBodyPassJavaArguments}(): Fix exclusion of ad-hoc compound conversion for userParam

Passed CMethodBindingEmitter denotes the callback-function, including the binding.

The new iteration to handle the ad-hoc compound conversion,
introduced in commit ad69716fda64b517c33ed847c4b215ea398aac99 'callback without userData',
iterates over the callback-function argument list.
Hence it shall only exclude the ad-hoc compound conversion
if index != info.cbFuncUserParamIdx.

Dropping the addition exclusion 'i != info.setFuncUserParamIdx'.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java b/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java
index ed883fb..3f4b55a 100644
--- a/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java
+++ b/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java
@@ -116,7 +116,7 @@ public class CMethodBindingEmitter extends FunctionEmitter {
   // We need this in order to compute sizes of certain types
   protected MachineDataInfo machDesc;
 
-  private final CMethodBindingEmitter jcbCMethodEmitter;
+  private final CMethodBindingEmitter jcbFuncCMethodEmitter;
   private final JavaCallbackEmitter javaCallbackEmitter;
 
   /**
@@ -154,13 +154,13 @@ public class CMethodBindingEmitter extends FunctionEmitter {
     final JavaCallbackInfo javaCallback = cfg.setFuncToJavaCallbackMap.get(binding.getName());
     if( null != javaCallback ) {
         // jcbNativeBasename = CodeGenUtils.capitalizeString( javaCallback.setFuncName+javaCallback.cbSimpleClazzName.replace("_", "") );
-        jcbCMethodEmitter = new CMethodBindingEmitter(javaCallback.cbFuncBinding,
-                                                      unit, javaPackageName, javaClassName, isOverloadedBinding,
-                                                      isJavaMethodStatic, forImplementingMethodCall,
-                                                      forIndirectBufferAndArrayImplementation, machDesc, configuration);
+        jcbFuncCMethodEmitter = new CMethodBindingEmitter(javaCallback.cbFuncBinding,
+                                                          unit, javaPackageName, javaClassName, isOverloadedBinding,
+                                                          isJavaMethodStatic, forImplementingMethodCall,
+                                                          forIndirectBufferAndArrayImplementation, machDesc, configuration);
         javaCallbackEmitter = new JavaCallbackEmitter(cfg, binding, javaCallback, null);
     } else {
-        jcbCMethodEmitter = null;
+        jcbFuncCMethodEmitter = null;
         javaCallbackEmitter = null;
     }
     setCommentEmitter(defaultCommentEmitter);
@@ -415,7 +415,7 @@ public class CMethodBindingEmitter extends FunctionEmitter {
   @Override
   protected void emitAdditionalCode() {
     if( null != javaCallbackEmitter ) {
-        javaCallbackEmitter.emitCAdditionalCode(unit, jcbCMethodEmitter);
+        javaCallbackEmitter.emitCAdditionalCode(unit, jcbFuncCMethodEmitter);
     }
   }
 
@@ -427,7 +427,7 @@ public class CMethodBindingEmitter extends FunctionEmitter {
     emitBodyUserVariableDeclarations();
     emitBodyVariablePreCallSetup();
     if( null != javaCallbackEmitter ) {
-        javaCallbackEmitter.emitCSetFuncPreCall(unit, jcbCMethodEmitter);
+        javaCallbackEmitter.emitCSetFuncPreCall(unit, jcbFuncCMethodEmitter);
     }
     emitBodyCallCFunction();
     emitBodyUserVariableAssignments();