diff options
| author | 2009-11-23 16:24:17 -0800 | |
|---|---|---|
| committer | 2009-11-23 16:24:17 -0800 | |
| commit | 9f96a37aabbffffe719c1dfb73b5c437f190bcf0 (patch) | |
| tree | b9d0e38552908b4d943c01cea3e13498a10796c9 /libs/rs/rsAllocation.cpp | |
| parent | 01d9fe1d064af2394c82648c0ec7ffa721353889 (diff) | |
| parent | 6a2500a330ef41cbfca40827b60e9f5efdf72db7 (diff) | |
am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp
* commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7':
Fix ref counting bug that could cause memory leak in allApps.
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
| -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); |