diff options
author | Alex Sakhartchouk <alexst@google.com> | 2011-07-12 13:25:14 -0700 |
---|---|---|
committer | Alex Sakhartchouk <alexst@google.com> | 2011-07-12 13:25:14 -0700 |
commit | 4b013ee9b72a1a5198ec0939bbe463463b0ebcb2 (patch) | |
tree | 3443ce158a64af1182bdf8be32c39402e288a119 /libs | |
parent | f25a8ce4a6a1025156d2977c7ddd37d4a01a5e71 (diff) | |
download | frameworks_base-4b013ee9b72a1a5198ec0939bbe463463b0ebcb2.zip frameworks_base-4b013ee9b72a1a5198ec0939bbe463463b0ebcb2.tar.gz frameworks_base-4b013ee9b72a1a5198ec0939bbe463463b0ebcb2.tar.bz2 |
Fix for the renderscript ref counting bug.
This only manifested itself in the situations where elements containing multiple ref counted objects were copied from Java.
Change-Id: I2c1cc89fe7f792259b3f033674142eb33d17a507
Diffstat (limited to 'libs')
-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(); } } } |