jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gtbX-master'

Browse source 
* gtbX-master:
  Add comment for non-const version
  Don't write-back buffer into Java array when calling const-ptr c function
  Prevent writeback of a const char* array through a director when using the byte[] %typemap.
This commit is contained in:
William S Fulton 2019-02-23 16:28:07 +00:00
commit 7fc81f4f85
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/java/java.swg
View file

@ -1383,12 +1383,12 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
%apply SWIGTYPE & { SWIGTYPE (CLASS::*const&) } %apply SWIGTYPE & { SWIGTYPE (CLASS::*const&) }
/* String & length */ /* String & length */
%typemap(jni) (char *STRING, size_t LENGTH) "jbyteArray" %typemap(jni) (const char *STRING, size_t LENGTH) "jbyteArray"
%typemap(jtype) (char *STRING, size_t LENGTH) "byte[]" %typemap(jtype) (const char *STRING, size_t LENGTH) "byte[]"
%typemap(jstype) (char *STRING, size_t LENGTH) "byte[]" %typemap(jstype) (const char *STRING, size_t LENGTH) "byte[]"
%typemap(javain) (char *STRING, size_t LENGTH) "$javainput" %typemap(javain) (const char *STRING, size_t LENGTH) "$javainput"
%typemap(freearg) (char *STRING, size_t LENGTH) "" %typemap(freearg) (const char *STRING, size_t LENGTH) ""
%typemap(in) (char *STRING, size_t LENGTH) { %typemap(in) (const char *STRING, size_t LENGTH) {
if ($input) { if ($input) {
$1 = ($1_ltype) JCALL2(GetByteArrayElements, jenv, $input, 0); $1 = ($1_ltype) JCALL2(GetByteArrayElements, jenv, $input, 0);
$2 = ($2_type) JCALL1(GetArrayLength, jenv, $input); $2 = ($2_type) JCALL1(GetArrayLength, jenv, $input);
@ -1397,10 +1397,10 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
$2 = 0; $2 = 0;
} }
} }
%typemap(argout) (char *STRING, size_t LENGTH) { %typemap(argout) (const char *STRING, size_t LENGTH) {
if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0); if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, JNI_ABORT);
} }
%typemap(directorin, descriptor="[B", noblock=1) (char *STRING, size_t LENGTH) { %typemap(directorin, descriptor="[B", noblock=1) (const char *STRING, size_t LENGTH) {
$input = 0; $input = 0;
if ($1) { if ($1) {
$input = JCALL1(NewByteArray, jenv, (jsize)$2); $input = JCALL1(NewByteArray, jenv, (jsize)$2);
@ -1409,9 +1409,14 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
} }
Swig::LocalRefGuard $1_refguard(jenv, $input); Swig::LocalRefGuard $1_refguard(jenv, $input);
} }
%typemap(javadirectorin, descriptor="[B") (const char *STRING, size_t LENGTH) "$jniinput"
%apply (const char *STRING, size_t LENGTH) { (char *STRING, size_t LENGTH) }
/* Enable write-back for non-const version */
%typemap(argout) (char *STRING, size_t LENGTH) {
if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
}
%typemap(directorargout, noblock=1) (char *STRING, size_t LENGTH) %typemap(directorargout, noblock=1) (char *STRING, size_t LENGTH)
{ if ($input && $1) JCALL4(GetByteArrayRegion, jenv, $input, 0, (jsize)$2, (jbyte *)$1); } { if ($input && $1) JCALL4(GetByteArrayRegion, jenv, $input, 0, (jsize)$2, (jbyte *)$1); }
%typemap(javadirectorin, descriptor="[B") (char *STRING, size_t LENGTH) "$jniinput"
%apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) } %apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) }
/* java keywords */ /* java keywords */