summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/Type.java3
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java
index 7bdd360..7283814 100644
--- a/rs/java/android/renderscript/Type.java
+++ b/rs/java/android/renderscript/Type.java
@@ -218,7 +218,6 @@ public class Type extends BaseObj {
}
/**
- * @hide
* Utility function for creating basic 1D types. The type is
* created without mipmaps enabled.
*
@@ -242,7 +241,6 @@ public class Type extends BaseObj {
}
/**
- * @hide
* Utility function for creating basic 2D types. The type is
* created without mipmaps or cubemaps.
*
@@ -268,7 +266,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 80a5da2..c4e19a1 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));