slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dropped Incandescent white balance mode.

Browse Source 
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>
This commit is contained in:
Dmytro Poplavskiy
2011-08-25 16:18:50 +10:00
committed by Qt by Nokia
parent da9b436cd1
commit 5d71ee6abf
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/declarative-camera/CaptureControls.qml
View File

@@ -136,8 +136,8 @@ FocusScope {
} }
ListElement { ListElement {
icon: "images/camera_white_balance_incandescent.png" icon: "images/camera_white_balance_incandescent.png"
value: Camera.WhiteBalanceIncandescent value: Camera.WhiteBalanceTungsten
text: "Incandescent" text: "Tungsten"
} }
ListElement { ListElement {
icon: "images/camera_white_balance_flourescent.png" icon: "images/camera_white_balance_flourescent.png"

1
src/multimediakit/qcameraimageprocessing.cpp
View File

@@ -343,7 +343,6 @@ void QCameraImageProcessing::setDenoisingLevel(int level)
\value WhiteBalanceShade Shade white balance mode. \value WhiteBalanceShade Shade white balance mode.
\value WhiteBalanceTungsten Tungsten white balance mode. \value WhiteBalanceTungsten Tungsten white balance mode.
\value WhiteBalanceFluorescent Fluorescent white balance mode. \value WhiteBalanceFluorescent Fluorescent white balance mode.
\value WhiteBalanceIncandescent Incandescent white balance mode.
\value WhiteBalanceFlash Flash white balance mode. \value WhiteBalanceFlash Flash white balance mode.
\value WhiteBalanceSunset Sunset white balance mode. \value WhiteBalanceSunset Sunset white balance mode.
\value WhiteBalanceVendor Vendor defined white balance mode. \value WhiteBalanceVendor Vendor defined white balance mode.

5
src/multimediakit/qcameraimageprocessing.h
View File

@@ -71,9 +71,8 @@ public:
WhiteBalanceShade = 4, WhiteBalanceShade = 4,
WhiteBalanceTungsten = 5, WhiteBalanceTungsten = 5,
WhiteBalanceFluorescent = 6, WhiteBalanceFluorescent = 6,
WhiteBalanceIncandescent = 7, WhiteBalanceFlash = 7,
WhiteBalanceFlash = 8, WhiteBalanceSunset = 8,
WhiteBalanceSunset = 9,
WhiteBalanceVendor = 1000 WhiteBalanceVendor = 1000
}; };

13
tests/auto/qcamera/tst_qcamera.cpp
View File

@@ -556,7 +556,7 @@ void tst_QCamera::testCameraWhiteBalance()
QSet<QCameraImageProcessing::WhiteBalanceMode> whiteBalanceModes; QSet<QCameraImageProcessing::WhiteBalanceMode> whiteBalanceModes;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceAuto; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceAuto;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceIncandescent; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten;
MockCameraService service; MockCameraService service;
service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash); service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash);
@@ -574,11 +574,11 @@ void tst_QCamera::testCameraWhiteBalance()
QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceFlash); QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceFlash);
QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceAuto)); QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceAuto));
QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash)); QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash));
QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceIncandescent)); QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceTungsten));
QVERIFY(!camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceCloudy)); QVERIFY(!camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceCloudy));
cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceIncandescent); cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceTungsten);
QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceIncandescent); QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceTungsten);
cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceManual); cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceManual);
QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceManual); QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceManual);
@@ -1747,7 +1747,6 @@ void tst_QCamera::testEnumOfQCameraImageProcessing()
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceShade; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceShade;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFluorescent; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFluorescent;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceIncandescent;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceSunset; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceSunset;
whiteBalanceModes << QCameraImageProcessing::WhiteBalanceVendor; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceVendor;
@@ -1783,10 +1782,6 @@ void tst_QCamera::testEnumOfQCameraImageProcessing()
QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFluorescent)); QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFluorescent));
QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == 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); service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash);
QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash)); QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash));
QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceFlash); QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceFlash);