From 25ad679c254766a3ac0bf3925232052941485442 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den.exter@jollamobile.com>
Date: Wed, 9 Jul 2014 13:38:25 +1000
Subject: Add a color filter property to QCameraImageProcessing.

[ChangeLog] New color filter property for QCameraImageProcessing.

Change-Id: I999e349e3e4f284b533fa62ba50903fbd21cb400
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
---
 src/multimedia/camera/qcameraimageprocessing.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/multimedia/camera/qcameraimageprocessing.h')

diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index 4c3f71dcd..044e05f7c 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -54,7 +54,7 @@ class QCameraImageProcessingPrivate;
 class Q_MULTIMEDIA_EXPORT QCameraImageProcessing : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(WhiteBalanceMode)
+    Q_ENUMS(WhiteBalanceMode ColorFilter)
 public:
     enum WhiteBalanceMode {
         WhiteBalanceAuto = 0,
@@ -69,6 +69,19 @@ public:
         WhiteBalanceVendor = 1000
     };
 
+    enum ColorFilter {
+        ColorFilterNone,
+        ColorFilterGrayscale,
+        ColorFilterNegative,
+        ColorFilterSolarize,
+        ColorFilterSepia,
+        ColorFilterPosterize,
+        ColorFilterWhiteboard,
+        ColorFilterBlackboard,
+        ColorFilterAqua,
+        ColorFilterVendor = 1000
+    };
+
     bool isAvailable() const;
 
     WhiteBalanceMode whiteBalanceMode() const;
@@ -90,6 +103,10 @@ public:
     qreal denoisingLevel() const;
     void setDenoisingLevel(qreal value);
 
+    ColorFilter colorFilter() const;
+    void setColorFilter(ColorFilter filter);
+    bool isColorFilterSupported(ColorFilter filter) const;
+
 private:
     friend class QCamera;
     friend class QCameraPrivate;
@@ -104,7 +121,9 @@ private:
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)
+Q_DECLARE_METATYPE(QCameraImageProcessing::ColorFilter)
 
 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)
+Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, ColorFilter)
 
 #endif  // QCAMERAIMAGEPROCESSING_H
-- 
cgit v1.2.3