diff options
| author | Jason Sams <rjsams@android.com> | 2009-11-23 16:29:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-23 16:29:46 -0800 |
| commit | 79e2646504f1b931bcdadc02d41f869ac024d1e9 (patch) | |
| tree | 7d6d1a43bc50b33794adac6c9ce67b14b67f6295 /libs/rs | |
| parent | 9e7cd27daf888239109256cd28759d52263787d3 (diff) | |
| parent | 9f96a37aabbffffe719c1dfb73b5c437f190bcf0 (diff) | |
| download | frameworks_base-79e2646504f1b931bcdadc02d41f869ac024d1e9.zip frameworks_base-79e2646504f1b931bcdadc02d41f869ac024d1e9.tar.gz frameworks_base-79e2646504f1b931bcdadc02d41f869ac024d1e9.tar.bz2 | |
am 9f96a37a: am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0'
* commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0':
Fix ref counting bug that could cause memory leak in allApps.
Diffstat (limited to 'libs/rs')
| -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 bc62f92..c997c73 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -222,7 +222,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); } @@ -424,7 +424,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); |