ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Merge "Use reinterpret_cast when an integer is cast to a pointer"

Browse Source
This commit is contained in:
Narayan Kamath 2014-02-25 13:05:49 +00:00 committed by Gerrit Code Review
commit aaa27fd5a0
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opengl/tools/glgen/src/JniCodeEmitter.java
View File

@ -1283,7 +1283,7 @@ public class JniCodeEmitter {
for (int i = 0; i < numArgs; i++) {
String typecast;
if (i == numArgs - 1 && isPointerOffsetFunc) {
typecast = "(GLvoid *)";
typecast = "reinterpret_cast<GLvoid *>";
} else {
typecast = "(" + cfunc.getArgType(i).getDeclaration() + ")";
}
@ -1297,6 +1297,8 @@ public class JniCodeEmitter {
if (cfunc.getArgType(i).isEGLHandle() &&
!cfunc.getArgType(i).isPointer()){
out.print(cfunc.getArgName(i)+"_native");
} else if (i == numArgs - 1 && isPointerOffsetFunc){
out.print("("+cfunc.getArgName(i)+")");
} else {
out.print(cfunc.getArgName(i));
}

2
opengl/tools/glgen/stubs/gles11/common.cpp
View File

@ -89,7 +89,7 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o
getBasePointerID, buffer);
if (pointer != 0L) {
*array = NULL;
return (void *) (jint) pointer;
return reinterpret_cast<void*>(pointer);
}
*array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,

2
opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.cpp
View File

@ -157,7 +157,7 @@ android_glGetActiveAttrib__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_ni
(GLsizei *)length,
(GLint *)size,
(GLenum *)type,
(char *)name
reinterpret_cast<char *>(name)
);
if (_typeArray) {
releasePointer(_env, _typeArray, type, JNI_TRUE);

2
opengl/tools/glgen/stubs/gles11/glGetActiveUniform.cpp
View File

@ -157,7 +157,7 @@ android_glGetActiveUniform__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_n
(GLsizei *)length,
(GLint *)size,
(GLenum *)type,
(char *)name
reinterpret_cast<char *>(name)
);
if (_typeArray) {
releasePointer(_env, _typeArray, type, JNI_TRUE);

2
opengl/tools/glgen/stubs/gles11/glGetShaderSource.cpp
View File

@ -85,7 +85,7 @@ android_glGetShaderSource__IILjava_nio_IntBuffer_2B
(GLuint)shader,
(GLsizei)bufsize,
(GLsizei *)length,
(char *)source
reinterpret_cast<char *>(source)
);
if (_array) {
releasePointer(_env, _array, length, JNI_TRUE);

2
opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
View File

@ -128,7 +128,7 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o
getBasePointerID, buffer);
if (pointer != 0L) {
*array = NULL;
return (void *) (jint) pointer;
return reinterpret_cast<void *>(pointer);
}
*array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,