summaryrefslogtreecommitdiffstats
path: root/rs/jni
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-03-08 00:07:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-08 00:07:01 +0000
commit449571c45e47e9b8d118c59dbd909b0d512f7e6d (patch)
tree965c6738611279e208cf244ad29798a1dc3616a2 /rs/jni
parentec89c1ea731256cd0d71ee58733b2855e1e6e4fa (diff)
parent26f1a53838b2c8b77c0995801dcc1c7816c47f16 (diff)
downloadframeworks_base-449571c45e47e9b8d118c59dbd909b0d512f7e6d.zip
frameworks_base-449571c45e47e9b8d118c59dbd909b0d512f7e6d.tar.gz
frameworks_base-449571c45e47e9b8d118c59dbd909b0d512f7e6d.tar.bz2
am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '26f1a53838b2c8b77c0995801dcc1c7816c47f16': [RenderScript] Add missing variable
Diffstat (limited to 'rs/jni')
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 0bad827..fa7b2bc 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -1311,6 +1311,8 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong _alloc,
ALOGD("nAllocationElementRead, con(%p), alloc(%p), xoff(%i), yoff(%i), zoff(%i), comp(%i), "
"sizeBytes(%i)", (RsContext)con, alloc, xoff, yoff, zoff, compIdx, sizeBytes);
}
+ int mSize = sizeBytes;
+ int count = 0;
PER_ARRAY_TYPE(0, rsAllocationElementRead, false, (RsContext)con, alloc,
xoff, yoff, zoff, lod, ptr, sizeBytes, compIdx);
}