summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-02-10 23:35:33 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-13 10:21:44 +0100
commit048e38bd19b2a465469b5ff0c2bdc97857aded84 (patch)
treed82c7b34775f98e0d9b3bd1468c371e13dac3939 /src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
parent0d74c7193a26da48a60653ecf1942f5b287fce08 (diff)
Documentation updates for declarative camera elements.
A number of things were missing. Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraimageprocessing.cpp')
-rw-r--r--src/imports/multimedia/qdeclarativecameraimageprocessing.cpp33
1 files changed, 31 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index 96ab1a130..f764bf6cf 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -49,9 +49,38 @@ QT_BEGIN_NAMESPACE
\brief The CameraCapture element provides an interface for camera capture related settings
\ingroup multimedia_qml
- Documentation to be written.
+ The CameraImageProcessing element provides control over post-processing
+ done by the camera middleware, including white balance adjustments,
+ contrast, saturation, sharpening, and denoising
+
+ It is not constructed separately but is provided by the Camera element's
+ \l {Camera::imageProcessing}{imageProcessing} property.
+
+ \qml
+ import QtQuick 2.0
+ import QtMultimedia 5.0
+
+ Camera {
+ id: camera
+
+ imageProcessing {
+ whiteBalanceMode: Camera.WhiteBalanceTungsten
+ contrast: 0.66
+ saturation: -0.5
+ }
+ }
+
+ \endqml
+
+
+*/
+/*!
+ \class QDeclarativeCameraImageProcessing
+ \internal
+ \brief The CameraCapture element provides an interface for camera capture related settings
*/
+
QDeclarativeCameraImageProcessing::QDeclarativeCameraImageProcessing(QCamera *camera, QObject *parent) :
QObject(parent)
{
@@ -100,7 +129,7 @@ void QDeclarativeCameraImageProcessing::setWhiteBalanceMode(QDeclarativeCameraIm
}
/*!
- \qmlproperty int CameraImageProcessing::manualWhiteBalance
+ \qmlproperty qreal CameraImageProcessing::manualWhiteBalance
The color temperature used when in manual white balance mode (WhiteBalanceManual).
The units are Kelvin.