summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenw@codeaurora.org>2014-12-08 19:15:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-08 19:15:29 +0000
commit2f9b0343452eef9b4508e1e82224ca91ba9dcf42 (patch)
tree7dcc1cf0d011957c39f40692a13b47a4df5b4379
parent68b45d6e448af9e6267b432f561dad898134ce0d (diff)
parent4dc1f8cec363906c5e3a5558cf66e0c65160c388 (diff)
downloadmako-2f9b0343452eef9b4508e1e82224ca91ba9dcf42.tar.gz
am 4dc1f8ce: camera: Fix memory leak in HDR mode
* commit '4dc1f8cec363906c5e3a5558cf66e0c65160c388': camera: Fix memory leak in HDR mode
-rwxr-xr-xcamera/QCameraHWI_Still.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/camera/QCameraHWI_Still.cpp b/camera/QCameraHWI_Still.cpp
index 34d8765..d3fe706 100755
--- a/camera/QCameraHWI_Still.cpp
+++ b/camera/QCameraHWI_Still.cpp
@@ -2092,12 +2092,10 @@ status_t QCameraStream_Snapshot::receiveRawPicture(mm_camera_ch_data_buf_t* recv
if(mHalCamCtrl->mHdrMode == HDR_MODE) {
if ((hdrRawCount % 3) != 2) {
+ hdrRawCount++;
mStopCallbackLock.unlock();
return NO_ERROR;
}
- else {
- hdrRawCount++;
- }
}
if (rc != NO_ERROR)