Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

Browse Source 
* commit 'cc99b18ce30e6847bd9b29129755f63efd4f06fe':
  Use reinterpret_cast when an integer is cast to a pointer
This commit is contained in:
Narayan Kamath
2014-02-25 13:20:52 +00:00
committed by Android Git Automerger
parent 58908b02f3 cc99b18ce3
commit deaa6cc34d
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_opengl_GLES10.cpp
View File

@@ -111,7 +111,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
core/jni/android_opengl_GLES10Ext.cpp
View File

@@ -111,7 +111,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,

12
core/jni/android_opengl_GLES11.cpp
View File

@@ -111,7 +111,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,
@@ -578,7 +578,7 @@ android_glColorPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -679,7 +679,7 @@ android_glDrawElements__IIII
(GLenum)mode,
(GLsizei)count,
(GLenum)type,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
@@ -2302,7 +2302,7 @@ android_glNormalPointer__III
glNormalPointer(
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -2529,7 +2529,7 @@ android_glTexCoordPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -2937,7 +2937,7 @@ android_glVertexPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}

2
core/jni/android_opengl_GLES11Ext.cpp
View File

@@ -111,7 +111,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,

12
core/jni/android_opengl_GLES20.cpp
View File

@@ -111,7 +111,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,
@@ -1180,7 +1180,7 @@ android_glDrawElements__IIII
(GLenum)mode,
(GLsizei)count,
(GLenum)type,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
@@ -1804,7 +1804,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);
@@ -2132,7 +2132,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);
@@ -3212,7 +3212,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);
@@ -5985,7 +5985,7 @@ android_glVertexAttribPointer__IIIZII
(GLenum)type,
(GLboolean)normalized,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}

14
core/jni/android_opengl_GLES30.cpp
View File

@@ -111,7 +111,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,
@@ -370,7 +370,7 @@ android_glDrawRangeElements__IIIIII
(GLuint)end,
(GLsizei)count,
(GLenum)type,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -419,7 +419,7 @@ android_glTexImage3D__IIIIIIIIII
(GLint)border,
(GLenum)format,
(GLenum)type,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -470,7 +470,7 @@ android_glTexSubImage3D__IIIIIIIIIII
(GLsizei)depth,
(GLenum)format,
(GLenum)type,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -534,7 +534,7 @@ android_glCompressedTexImage3D__IIIIIIIII
(GLsizei)depth,
(GLint)border,
(GLsizei)imageSize,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -585,7 +585,7 @@ android_glCompressedTexSubImage3D__IIIIIIIIIII
(GLsizei)depth,
(GLenum)format,
(GLsizei)imageSize,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -2134,7 +2134,7 @@ android_glVertexAttribIPointer__IIIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}

16
core/jni/com_google_android_gles_jni_GLImpl.cpp
View File

@@ -129,7 +129,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,
@@ -4359,7 +4359,7 @@ android_glColorPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -4460,7 +4460,7 @@ android_glDrawElements__IIII
(GLenum)mode,
(GLsizei)count,
(GLenum)type,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
@@ -6099,7 +6099,7 @@ android_glNormalPointer__III
glNormalPointer(
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -6326,7 +6326,7 @@ android_glTexCoordPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -6756,7 +6756,7 @@ android_glVertexPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -7196,7 +7196,7 @@ android_glMatrixIndexPointerOES__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}
@@ -7232,7 +7232,7 @@ android_glWeightPointerOES__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
(GLvoid *)offset
reinterpret_cast<GLvoid *>(offset)
);
}