diff options
| author | Stephen Hines <srhines@google.com> | 2012-01-30 12:23:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-30 12:23:21 -0800 |
| commit | bc19591c1f82366d00e30f988b88d66184b3dedf (patch) | |
| tree | 3095e8d861752e69769c518dcdcd08f8bb305244 /graphics/jni | |
| parent | cb3fbbd0370913e347167d6516689bcbd77442d6 (diff) | |
| parent | 855eadf942c8ff5c2665d7dc3b6d4b5ba630419a (diff) | |
| download | frameworks_base-bc19591c1f82366d00e30f988b88d66184b3dedf.zip frameworks_base-bc19591c1f82366d00e30f988b88d66184b3dedf.tar.gz frameworks_base-bc19591c1f82366d00e30f988b88d66184b3dedf.tar.bz2 | |
am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments."
* commit '855eadf942c8ff5c2665d7dc3b6d4b5ba630419a':
Fix potential bug with reordered size/offset arguments.
Diffstat (limited to 'graphics/jni')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index e9d5ce6..40dc980 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 The Android Open Source Project + * Copyright (C) 2011-2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -574,7 +574,7 @@ nAllocationElementData1D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint len = _env->GetArrayLength(data); LOG_API("nAllocationElementData1D, con(%p), alloc(%p), offset(%i), comp(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, compIdx, len, sizeBytes); jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsAllocation1DElementData(con, (RsAllocation)alloc, offset, lod, ptr, compIdx, sizeBytes); + rsAllocation1DElementData(con, (RsAllocation)alloc, offset, lod, ptr, sizeBytes, compIdx); _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); } |