summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-03-05 11:00:10 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-05 03:08:42 +0100
commit362e4438966ec0d643702db5ce6c9f517a2a5ffa (patch)
treeaaedb551bb3742a2eb6be5cdf17ecf8a2803ed29 /src/multimedia/camera
parent707be633619906e0e53ac8e2b577714447179a3e (diff)
Fix some memory leaks.
Adjusted a unit test or two to make leaks easier to find, and then fixed a few leaks. Change-Id: I47a20df8de7cac113d34a2015f76a65ab957dedd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r--src/multimedia/camera/qcameraexposure.cpp2
-rw-r--r--src/multimedia/camera/qcamerafocus.cpp1
-rw-r--r--src/multimedia/camera/qcameraimagecapture.cpp2
-rw-r--r--src/multimedia/camera/qcameraimageprocessing.cpp1
4 files changed, 6 insertions, 0 deletions
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 3568af001..c85e78006 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -216,6 +216,8 @@ QCameraExposure::~QCameraExposure()
Q_D(QCameraExposure);
if (d->exposureControl)
d->camera->service()->releaseControl(d->exposureControl);
+
+ delete d;
}
/*!
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 851befee8..a8a121fba 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -394,6 +394,7 @@ QCameraFocus::QCameraFocus(QCamera *camera):
QCameraFocus::~QCameraFocus()
{
+ delete d_ptr;
}
/*!
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 1f0b67d93..0754963ae 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -178,6 +178,8 @@ QCameraImageCapture::~QCameraImageCapture()
if (d->mediaObject)
d->mediaObject->unbind(this);
+
+ delete d_ptr;
}
/*!
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 3d7812b00..990795049 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -162,6 +162,7 @@ QCameraImageProcessing::QCameraImageProcessing(QCamera *camera):
QCameraImageProcessing::~QCameraImageProcessing()
{
+ delete d_ptr;
}