summaryrefslogtreecommitdiffstats
path: root/rs/jni
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-03-08 00:17:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-08 00:17:27 +0000
commitb5c8004d6fe5bca9d40e97484bf0ba88c152d067 (patch)
tree7c3608ea106b748b966f397a9fef56716c42229e /rs/jni
parent12d8a860b847170b3a751682efa151512e016542 (diff)
parent449571c45e47e9b8d118c59dbd909b0d512f7e6d (diff)
downloadframeworks_base-b5c8004d6fe5bca9d40e97484bf0ba88c152d067.zip
frameworks_base-b5c8004d6fe5bca9d40e97484bf0ba88c152d067.tar.gz
frameworks_base-b5c8004d6fe5bca9d40e97484bf0ba88c152d067.tar.bz2
am 449571c4: am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '449571c45e47e9b8d118c59dbd909b0d512f7e6d': [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 f8bce2acd..c139df7 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -1306,6 +1306,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);
}