Dropped Incandescent white balance mode.

It's the same as Tungsten, was inittialy added by mistake.

Change-Id: Idf1d7be2f8d0969bba3480a8702034b7cabfdaef
Reviewed-on: http://codereview.qt.nokia.com/3563
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

diff --git a/examples/declarative-camera/CaptureControls.qml b/examples/declarative-camera/CaptureControls.qml
index cf2c77d..3332fe1 100644 (file)
--- a/examples/declarative-camera/CaptureControls.qml
+++ b/examples/declarative-camera/CaptureControls.qml
@@ -136,8 +136,8 @@ FocusScope {
                         }
                         ListElement {
                             icon: "images/camera_white_balance_incandescent.png"
-                            value: Camera.WhiteBalanceIncandescent
-                            text: "Incandescent"
+                            value: Camera.WhiteBalanceTungsten
+                            text: "Tungsten"
                         }
                         ListElement {
                             icon: "images/camera_white_balance_flourescent.png"

diff --git a/src/multimediakit/qcameraimageprocessing.cpp b/src/multimediakit/qcameraimageprocessing.cpp
index 6ed9bb4..79419a5 100644 (file)
--- a/src/multimediakit/qcameraimageprocessing.cpp
+++ b/src/multimediakit/qcameraimageprocessing.cpp
@@ -343,7 +343,6 @@ void QCameraImageProcessing::setDenoisingLevel(int level)
     \value WhiteBalanceShade        Shade white balance mode.
     \value WhiteBalanceTungsten     Tungsten white balance mode.
     \value WhiteBalanceFluorescent  Fluorescent white balance mode.
-    \value WhiteBalanceIncandescent Incandescent white balance mode.
     \value WhiteBalanceFlash        Flash white balance mode.
     \value WhiteBalanceSunset       Sunset white balance mode.
     \value WhiteBalanceVendor       Vendor defined white balance mode.

diff --git a/src/multimediakit/qcameraimageprocessing.h b/src/multimediakit/qcameraimageprocessing.h
index 9ed23d1..aba38a3 100644 (file)
--- a/src/multimediakit/qcameraimageprocessing.h
+++ b/src/multimediakit/qcameraimageprocessing.h
@@ -71,9 +71,8 @@ public:
         WhiteBalanceShade = 4,
         WhiteBalanceTungsten = 5,
         WhiteBalanceFluorescent = 6,
-        WhiteBalanceIncandescent = 7,
-        WhiteBalanceFlash = 8,
-        WhiteBalanceSunset = 9,
+        WhiteBalanceFlash = 7,
+        WhiteBalanceSunset = 8,
         WhiteBalanceVendor = 1000
     };
 

diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/qcamera/tst_qcamera.cpp
index 9234998..016e738 100644 (file)
--- a/tests/auto/qcamera/tst_qcamera.cpp
+++ b/tests/auto/qcamera/tst_qcamera.cpp
@@ -556,7 +556,7 @@ void tst_QCamera::testCameraWhiteBalance()
     QSet<QCameraImageProcessing::WhiteBalanceMode> whiteBalanceModes;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceAuto;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash;
-    whiteBalanceModes << QCameraImageProcessing::WhiteBalanceIncandescent;
+    whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten;
 
     MockCameraService service;
     service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash);
@@ -574,11 +574,11 @@ void tst_QCamera::testCameraWhiteBalance()
     QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceFlash);
     QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceAuto));
     QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash));
-    QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceIncandescent));
+    QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceTungsten));
     QVERIFY(!camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceCloudy));
 
-    cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceIncandescent);
-    QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceIncandescent);
+    cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceTungsten);
+    QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceTungsten);
 
     cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceManual);
     QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceManual);
@@ -1747,7 +1747,6 @@ void tst_QCamera::testEnumOfQCameraImageProcessing()
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceShade;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFluorescent;
-    whiteBalanceModes << QCameraImageProcessing::WhiteBalanceIncandescent;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceSunset;
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceVendor;
@@ -1783,10 +1782,6 @@ void tst_QCamera::testEnumOfQCameraImageProcessing()
     QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFluorescent));
     QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceFluorescent);
 
-    service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceIncandescent);
-    QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceIncandescent));
-    QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceIncandescent);
-
     service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash);
     QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash));
     QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceFlash);