diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-07-12 16:27:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 16:27:09 -0700 |
| commit | 5b7da3d3df08ebe8470fbf8303804c547d20d1c0 (patch) | |
| tree | 6bbaf175834fecba11c0a5fb9c98999fca5b3b12 /libs/rs | |
| parent | 30e8f982770e4c79f2703f11d100e1ff1bb3b7bf (diff) | |
| parent | 4b013ee9b72a1a5198ec0939bbe463463b0ebcb2 (diff) | |
| download | frameworks_base-5b7da3d3df08ebe8470fbf8303804c547d20d1c0.zip frameworks_base-5b7da3d3df08ebe8470fbf8303804c547d20d1c0.tar.gz frameworks_base-5b7da3d3df08ebe8470fbf8303804c547d20d1c0.tar.bz2 | |
Merge "Fix for the renderscript ref counting bug."
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rsElement.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/rs/rsElement.cpp b/libs/rs/rsElement.cpp index 2b58e9e..b77b18a 100644 --- a/libs/rs/rsElement.cpp +++ b/libs/rs/rsElement.cpp @@ -263,10 +263,10 @@ void Element::incRefs(const void *ptr) const { const uint8_t *p = static_cast<const uint8_t *>(ptr); for (uint32_t i=0; i < mFieldCount; i++) { if (mFields[i].e->mHasReference) { - p = &p[mFields[i].offsetBits >> 3]; + const uint8_t *p2 = &p[mFields[i].offsetBits >> 3]; for (uint32_t ct=0; ct < mFields[i].arraySize; ct++) { - mFields[i].e->incRefs(p); - p += mFields[i].e->getSizeBytes(); + mFields[i].e->incRefs(p2); + p2 += mFields[i].e->getSizeBytes(); } } } @@ -285,10 +285,10 @@ void Element::decRefs(const void *ptr) const { const uint8_t *p = static_cast<const uint8_t *>(ptr); for (uint32_t i=0; i < mFieldCount; i++) { if (mFields[i].e->mHasReference) { - p = &p[mFields[i].offsetBits >> 3]; + const uint8_t *p2 = &p[mFields[i].offsetBits >> 3]; for (uint32_t ct=0; ct < mFields[i].arraySize; ct++) { - mFields[i].e->decRefs(p); - p += mFields[i].e->getSizeBytes(); + mFields[i].e->decRefs(p2); + p2 += mFields[i].e->getSizeBytes(); } } } |