drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 39dbb099: Merge change I36176536 into eclair

Browse Source 
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2

* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
  Fix ref counting bug that could cause memory leak in allApps.
This commit is contained in:
Jason Sams
2009-11-23 16:19:37 -08:00
committed by Android Git Automerger
parent cfe90ce461 39dbb09997
commit 6a2500a330
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/rs/rsAllocation.cpp
View File

@ -203,7 +203,7 @@ void Allocation::dumpLOGV(const char *prefix) const
LOGV("%s allocation ptr=%p mCpuWrite=%i, mCpuRead=%i, mGpuWrite=%i, mGpuRead=%i", LOGV("%s allocation ptr=%p mCpuWrite=%i, mCpuRead=%i, mGpuWrite=%i, mGpuRead=%i",
prefix, mPtr, mCpuWrite, mCpuRead, mGpuWrite, mGpuRead); 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); prefix, mIsTexture, mTextureID, mIsVertexBuffer, mBufferID);
@ -400,7 +400,6 @@ RsAllocation rsi_AllocationCreateFromBitmap(Context *rsc, uint32_t w, uint32_t h
LOGE("Memory allocation failure"); LOGE("Memory allocation failure");
return NULL; return NULL;
} }
texAlloc->incUserRef();
ElementConverter_t cvt = pickConverter(dst, src); ElementConverter_t cvt = pickConverter(dst, src);
cvt(texAlloc->getPtr(), data, w * h); cvt(texAlloc->getPtr(), data, w * h);