1 files changed, 28 insertions, 8 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
index a7521f60e..0e0cbb230 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -56,6 +56,7 @@ class QDeclarativeCameraImageProcessing : public QObject
 {
     Q_OBJECT
     Q_ENUMS(WhiteBalanceMode)
+    Q_ENUMS(ColorFilter)
 
     Q_PROPERTY(WhiteBalanceMode whiteBalanceMode READ whiteBalanceMode WRITE setWhiteBalanceMode NOTIFY whiteBalanceModeChanged)
     Q_PROPERTY(qreal manualWhiteBalance READ manualWhiteBalance WRITE setManualWhiteBalance NOTIFY manualWhiteBalanceChanged)
@@ -63,7 +64,7 @@ class QDeclarativeCameraImageProcessing : public QObject
     Q_PROPERTY(qreal saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
     Q_PROPERTY(qreal sharpeningLevel READ sharpeningLevel WRITE setSharpeningLevel NOTIFY sharpeningLevelChanged)
     Q_PROPERTY(qreal denoisingLevel READ denoisingLevel WRITE setDenoisingLevel NOTIFY denoisingLevelChanged)
-
+    Q_PROPERTY(ColorFilter colorFilter READ colorFilter WRITE setColorFilter NOTIFY colorFilterChanged REVISION 1)
 public:
     enum WhiteBalanceMode {
         WhiteBalanceAuto = QCameraImageProcessing::WhiteBalanceAuto,
@@ -78,6 +79,19 @@ public:
         WhiteBalanceVendor = QCameraImageProcessing::WhiteBalanceVendor
     };
 
+    enum ColorFilter {
+        ColorFilterNone = QCameraImageProcessing::ColorFilterNone,
+        ColorFilterGrayscale = QCameraImageProcessing::ColorFilterGrayscale,
+        ColorFilterNegative = QCameraImageProcessing::ColorFilterNegative,
+        ColorFilterSolarize = QCameraImageProcessing::ColorFilterSolarize,
+        ColorFilterSepia = QCameraImageProcessing::ColorFilterSepia,
+        ColorFilterPosterize = QCameraImageProcessing::ColorFilterPosterize,
+        ColorFilterWhiteboard = QCameraImageProcessing::ColorFilterWhiteboard,
+        ColorFilterBlackboard = QCameraImageProcessing::ColorFilterBlackboard,
+        ColorFilterAqua = QCameraImageProcessing::ColorFilterAqua,
+        ColorFilterVendor = QCameraImageProcessing::ColorFilterVendor
+    };
+
     ~QDeclarativeCameraImageProcessing();
 
     WhiteBalanceMode whiteBalanceMode() const;
@@ -88,6 +102,8 @@ public:
     qreal sharpeningLevel() const;
     qreal denoisingLevel() const;
 
+    ColorFilter colorFilter() const;
+
 public Q_SLOTS:
     void setWhiteBalanceMode(QDeclarativeCameraImageProcessing::WhiteBalanceMode mode) const;
     void setManualWhiteBalance(qreal colorTemp) const;
@@ -97,6 +113,8 @@ public Q_SLOTS:
     void setSharpeningLevel(qreal value);
     void setDenoisingLevel(qreal value);
 
+    void setColorFilter(ColorFilter colorFilter);
+
 Q_SIGNALS:
     void whiteBalanceModeChanged(QDeclarativeCameraImageProcessing::WhiteBalanceMode) const;
     void manualWhiteBalanceChanged(qreal) const;
@@ -106,6 +124,8 @@ Q_SIGNALS:
     void sharpeningLevelChanged(qreal);
     void denoisingLevelChanged(qreal);
 
+    void colorFilterChanged();
+
 private:
     friend class QDeclarativeCamera;
     QDeclarativeCameraImageProcessing(QCamera *camera, QObject *parent = 0);