diff options
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/java/android/renderscript/Type.java | 3 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java index ce7f571..1b5f1a2 100644 --- a/rs/java/android/renderscript/Type.java +++ b/rs/java/android/renderscript/Type.java @@ -216,7 +216,6 @@ public class Type extends BaseObj { } /** - * @hide * Utility function for creating basic 1D types. The type is * created without mipmaps enabled. * @@ -240,7 +239,6 @@ public class Type extends BaseObj { } /** - * @hide * Utility function for creating basic 2D types. The type is * created without mipmaps or cubemaps. * @@ -266,7 +264,6 @@ public class Type extends BaseObj { } /** - * @hide * Utility function for creating basic 3D types. The type is * created without mipmaps. * diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 9b89eb9..352bd49 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -392,7 +392,7 @@ nContextSendMessage(JNIEnv *_env, jobject _this, jlong con, jint id, jintArray d jint len = 0; if (data) { len = _env->GetArrayLength(data); - ptr = _env->GetIntArrayElements(data, NULL); + jint *ptr = _env->GetIntArrayElements(data, NULL); } LOG_API("nContextSendMessage, con(%p), id(%i), len(%i)", (RsContext)con, id, len); rsContextSendMessage((RsContext)con, id, (const uint8_t *)ptr, len * sizeof(int)); |