diff options
| author | Alex Ray <aray@google.com> | 2013-07-09 19:18:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-09 19:18:35 +0000 |
| commit | ef079d59d1c3e1c4bfc9e994715838c4eae92bac (patch) | |
| tree | 7b4ac93c976d26ae4c5e019f1f698dc040e96096 | |
| parent | 18900a84344f50f4624d22e8e3cc8dfb5249b9ad (diff) | |
| parent | 90c0af71f67ea99da34f67f4739a8687247e01b7 (diff) | |
| download | hardware_libhardware-ef079d59d1c3e1c4bfc9e994715838c4eae92bac.zip hardware_libhardware-ef079d59d1c3e1c4bfc9e994715838c4eae92bac.tar.gz hardware_libhardware-ef079d59d1c3e1c4bfc9e994715838c4eae92bac.tar.bz2 | |
Merge "modules: camera: make Metadata a delete-able object"
| -rw-r--r-- | modules/camera/Metadata.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/camera/Metadata.cpp b/modules/camera/Metadata.cpp index 362a087..b26986d 100644 --- a/modules/camera/Metadata.cpp +++ b/modules/camera/Metadata.cpp @@ -43,8 +43,18 @@ Metadata::Metadata() Metadata::~Metadata() { + Entry *current = mHead; + + while (current != NULL) { + Entry *tmp = current; + current = current->mNext; + delete tmp; + } + if (mGenerated != NULL) free_camera_metadata(mGenerated); + + pthread_mutex_destroy(&mMutex); } Metadata::Metadata(uint8_t mode, uint8_t intent) |