diff options
| author | 2009-11-23 16:19:37 -0800 | |
|---|---|---|
| committer | 2009-11-23 16:19:37 -0800 | |
| commit | 6a2500a330ef41cbfca40827b60e9f5efdf72db7 (patch) | |
| tree | d4ae895b59f1bdf60a901d5da3da3eaf5240b308 | |
| parent | cfe90ce461eacf3ae6a8556594a0f682a31cfb84 (diff) | |
| parent | 39dbb099974f2c8e1154f28123e53be14c47a76d (diff) | |
am 39dbb099: Merge change I36176536 into eclair
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2
* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
Fix ref counting bug that could cause memory leak in allApps.
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 408d83f262b6..b71d10cfb722 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -203,7 +203,7 @@ void Allocation::dumpLOGV(const char *prefix) const LOGV("%s allocation ptr=%p mCpuWrite=%i, mCpuRead=%i, mGpuWrite=%i, mGpuRead=%i", prefix, mPtr, mCpuWrite, mCpuRead, mGpuWrite, mGpuRead); - LOGV("%s allocation mIsTexture=%i mIsTextureID=%i, mIsVertexBuffer=%i, mBufferID=%i", + LOGV("%s allocation mIsTexture=%i mTextureID=%i, mIsVertexBuffer=%i, mBufferID=%i", prefix, mIsTexture, mTextureID, mIsVertexBuffer, mBufferID); @@ -400,7 +400,6 @@ RsAllocation rsi_AllocationCreateFromBitmap(Context *rsc, uint32_t w, uint32_t h LOGE("Memory allocation failure"); return NULL; } - texAlloc->incUserRef(); ElementConverter_t cvt = pickConverter(dst, src); cvt(texAlloc->getPtr(), data, w * h); |