Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ba975e7 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit '7fe5978b':
  Use reinterpret_cast when an integer is cast to a pointer
parents 5bf28c1e 7fe5978b

core/jni/android_opengl_GLES10.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/jni/android_opengl_GLES10Ext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/jni/android_opengl_GLES11.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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)

    );

}

core/jni/android_opengl_GLES11Ext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/jni/android_opengl_GLES20.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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)

    );

}