diff options
| author | Jason Sams <rjsams@android.com> | 2009-11-02 15:23:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-02 15:23:02 -0800 |
| commit | 46f385459ff7832d4e531cc8ac3430b24070aa33 (patch) | |
| tree | 37001286dcd729427464f740e8ec0ea20dc18657 /libs/rs | |
| parent | a3cbfe0e8f586341c421f6f6e5e5992deb7e318e (diff) | |
| parent | 15ec511b5c5cdb901bf1bd0e26ff0514635fc681 (diff) | |
| download | frameworks_base-46f385459ff7832d4e531cc8ac3430b24070aa33.zip frameworks_base-46f385459ff7832d4e531cc8ac3430b24070aa33.tar.gz frameworks_base-46f385459ff7832d4e531cc8ac3430b24070aa33.tar.bz2 | |
am 15ec511b: am 38f95586: am 03e778b9: Merge change Ic4918c30 into eclair
Merge commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681'
* commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681':
Fix a build break. Too many branches to keep track of.
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rsSimpleMesh.cpp | 2 | ||||
| -rw-r--r-- | libs/rs/rsType.cpp | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libs/rs/rsSimpleMesh.cpp b/libs/rs/rsSimpleMesh.cpp index 434a35f..b082fd7 100644 --- a/libs/rs/rsSimpleMesh.cpp +++ b/libs/rs/rsSimpleMesh.cpp @@ -99,8 +99,6 @@ SimpleMeshContext::SimpleMeshContext() SimpleMeshContext::~SimpleMeshContext() { - delete[] mVertexTypes; - delete[] mVertexBuffers; } diff --git a/libs/rs/rsType.cpp b/libs/rs/rsType.cpp index 0eb4111..ddaa2f0 100644 --- a/libs/rs/rsType.cpp +++ b/libs/rs/rsType.cpp @@ -57,7 +57,6 @@ TypeState::TypeState() TypeState::~TypeState() { - delete[] mLODs; } size_t Type::getOffsetForFace(uint32_t face) const |