diff options
| author | Jason Sams <rjsams@android.com> | 2010-10-14 17:58:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-14 17:58:39 -0700 |
| commit | 639017920f925ee88de06f7ffabc2cb5d97a272b (patch) | |
| tree | 46274985f45eef21a02913473be9c852fe5afb7b | |
| parent | c900a79b95e357b0746b1816e3c68bbd3ed9ea78 (diff) | |
| parent | 9c25aee52672f9c8908e062bde502341c189970e (diff) | |
| download | frameworks_base-639017920f925ee88de06f7ffabc2cb5d97a272b.zip frameworks_base-639017920f925ee88de06f7ffabc2cb5d97a272b.tar.gz frameworks_base-639017920f925ee88de06f7ffabc2cb5d97a272b.tar.bz2 | |
Merge "Fix object cast."
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index d9ff62d..16d5bfe 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -112,7 +112,7 @@ static void nObjDestroy(JNIEnv *_env, jobject _this, RsContext con, jint obj) { LOG_API("nObjDestroy, con(%p) obj(%p)", con, (void *)obj); - rsObjDestroy(con, (uint32_t)obj); + rsObjDestroy(con, (void *)obj); } |