summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2009-11-23 15:27:33 -0800
committerJason Sams <rjsams@android.com>2009-11-23 15:28:55 -0800
commit361765361ae70a17fe4de64b8c1a3299a84e212d (patch)
treeb65d76c2ad139ee97b8dd9fb3e929f23ab078a7c /libs/rs
parent0d631b9b58db54bee58da717b38b8020bc3d0437 (diff)
downloadframeworks_base-361765361ae70a17fe4de64b8c1a3299a84e212d.zip
frameworks_base-361765361ae70a17fe4de64b8c1a3299a84e212d.tar.gz
frameworks_base-361765361ae70a17fe4de64b8c1a3299a84e212d.tar.bz2
Fix ref counting bug that could cause memory leak in allApps.
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/rsAllocation.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index 408d83f..b71d10c 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);