diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 07:57:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 07:57:24 (GMT) |
| commit | 3e5794f6a622414b0e7c01ffe00d664fead37c40 (patch) | |
| tree | 96124b0c9f439c52fddafd32370b49dcdd08ea56 /src/plugins | |
| parent | fd330a5a6009c17e28fb9eb36b5bffbc19c5df68 (diff) | |
| parent | 56a90692323a79e570c91e0b6ee0f8d075cafea3 (diff) | |
| download | Qt-3e5794f6a622414b0e7c01ffe00d664fead37c40.zip Qt-3e5794f6a622414b0e7c01ffe00d664fead37c40.tar.gz Qt-3e5794f6a622414b0e7c01ffe00d664fead37c40.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix bad merge
Fix wrong arguments order in a warning in QObject::moveToThread
Fix warnings and build on mingw
Fixes a deadlock with streaming in Phonon.
cetest build fix
cetest build fix for TCP sync connection
Fixed QPrintPreview text drawing (visible in Assistant).
Fix glyph advance on Mac/Carbon
itemChange() is now called when transformation properties change.
stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint
Fix QLabel::sizeHint()
Fix QFontMetrics::height() and QFontMetrics autotest
Add QFont::ForceIntegerMetrics style strategy flag
Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index 31e0c92..619aa4e 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -385,8 +385,8 @@ static bool checkGrayscale(const QVector<QRgb> &colorTable) const bool increasing = (colorTable.at(0) == 0xff000000); for (int i = 0; i < 256; ++i) { - if (increasing && colorTable.at(i) != qRgb(i, i, i) - || !increasing && colorTable.at(i) != qRgb(255 - i, 255 - i, 255 - i)) + if ((increasing && colorTable.at(i) != qRgb(i, i, i)) + || (!increasing && colorTable.at(i) != qRgb(255 - i, 255 - i, 255 - i))) return false; } return true; |