diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
tree | 2b89637b93fc7d81c674106008566010f986d67c /src/gui/painting | |
parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/painting.pri | 1 | ||||
-rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 65 | ||||
-rw-r--r-- | src/gui/painting/qdrawhelper_p.h | 12 | ||||
-rw-r--r-- | src/gui/painting/qgammatables.cpp | 66 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine_raster_p.h | 4 | ||||
-rw-r--r-- | src/gui/painting/qpainter.cpp | 1 | ||||
-rw-r--r-- | src/gui/painting/qpdf.cpp | 1 |
8 files changed, 99 insertions, 53 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 0792343ce1..d1dd246e9c 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -75,6 +75,7 @@ SOURCES += \ SOURCES += \ painting/qpaintengine_raster.cpp \ painting/qdrawhelper.cpp \ + painting/qgammatables.cpp \ painting/qimagescale.cpp \ painting/qgrayraster.c \ painting/qpaintengine_blitter.cpp \ diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 3aea7945af..919a19eb9b 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -39,6 +39,18 @@ ** ****************************************************************************/ +#if defined(__OPTIMIZE__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) \ + && (__GNUC__ * 100 + __GNUC_MINOR__ >= 404) +// GCC 4.4 supports #pragma GCC optimize and #pragma GCC target +# pragma GCC optimize "O3" +# if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__) +# pragma GCC target "fpmath=sse" +# endif +#endif + +#include <qstylehints.h> +#include <qguiapplication.h> +#include <qatomic.h> #include <private/qdrawhelper_p.h> #include <private/qpaintengine_raster_p.h> #include <private/qpainter_p.h> @@ -51,6 +63,7 @@ #include <private/qdrawhelper_mips_dsp_p.h> #endif #include <private/qmath_p.h> +#include <private/qguiapplication_p.h> #include <qmath.h> QT_BEGIN_NAMESPACE @@ -5313,54 +5326,6 @@ inline static void qt_bitmapblit_quint16(QRasterBuffer *rasterBuffer, map, mapWidth, mapHeight, mapStride); } - -struct QDrawHelperGammaTables -{ - QDrawHelperGammaTables(); - - uchar qt_pow_rgb_gamma[256]; - uchar qt_pow_rgb_invgamma[256]; - -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) - uint qt_pow_gamma[256]; - uchar qt_pow_invgamma[2048]; -#endif -}; - -QDrawHelperGammaTables::QDrawHelperGammaTables() -{ - qreal smoothing = qreal(1.7); - - for (int i=0; i<256; ++i) { - qt_pow_rgb_gamma[i] = uchar(qRound(qPow(i / qreal(255.0), smoothing) * 255)); - qt_pow_rgb_invgamma[i] = uchar(qRound(qPow(i / qreal(255.), 1 / smoothing) * 255)); - } - -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) - const qreal gray_gamma = 2.31; - for (int i=0; i<256; ++i) - qt_pow_gamma[i] = uint(qRound(qPow(i / qreal(255.), gray_gamma) * 2047)); - for (int i=0; i<2048; ++i) - qt_pow_invgamma[i] = uchar(qRound(qPow(i / qreal(2047.0), 1 / gray_gamma) * 255)); -#endif -} - -Q_GLOBAL_STATIC(QDrawHelperGammaTables, qt_gamma_tables); - -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) -const uint *qt_pow_gamma() -{ - QDrawHelperGammaTables *tables = qt_gamma_tables(); - return tables ? tables->qt_pow_gamma : 0; -} -#endif - -const uchar *qt_pow_rgb_gamma() -{ - QDrawHelperGammaTables *tables = qt_gamma_tables(); - return tables ? tables->qt_pow_rgb_gamma : 0; -} - static void qt_alphamapblit_quint16(QRasterBuffer *rasterBuffer, int x, int y, quint32 color, const uchar *map, @@ -5473,7 +5438,7 @@ static void qt_alphamapblit_quint32(QRasterBuffer *rasterBuffer, const int destStride = rasterBuffer->bytesPerLine() / sizeof(quint32); #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) - QDrawHelperGammaTables *tables = qt_gamma_tables(); + const QDrawHelperGammaTables *tables = QGuiApplicationPrivate::instance()->gammaTables(); if (!tables) return; @@ -5570,7 +5535,7 @@ static void qt_alphargbblit_quint32(QRasterBuffer *rasterBuffer, int sb = qBlue(color); int sa = qAlpha(color); - QDrawHelperGammaTables *tables = qt_gamma_tables(); + const QDrawHelperGammaTables *tables = QGuiApplicationPrivate::instance()->gammaTables(); if (!tables) return; diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 442fd8bcd7..2e9f064951 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -328,6 +328,18 @@ struct QSpanData void adjustSpanMethods(); }; +struct QDrawHelperGammaTables +{ + explicit QDrawHelperGammaTables(qreal smoothing); + + void refresh(qreal smoothing); + + uchar qt_pow_rgb_gamma[256]; + uchar qt_pow_rgb_invgamma[256]; + uint qt_pow_gamma[256]; + uchar qt_pow_invgamma[2048]; +}; + static inline uint qt_gradient_clamp(const QGradientData *data, int ipos) { if (ipos < 0 || ipos >= GRADIENT_STOPTABLE_SIZE) { diff --git a/src/gui/painting/qgammatables.cpp b/src/gui/painting/qgammatables.cpp new file mode 100644 index 0000000000..06dc95a103 --- /dev/null +++ b/src/gui/painting/qgammatables.cpp @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <private/qdrawhelper_p.h> + +QT_BEGIN_NAMESPACE + + +QDrawHelperGammaTables::QDrawHelperGammaTables(qreal smoothing) +{ + const qreal gray_gamma = 2.31; + for (int i=0; i<256; ++i) + qt_pow_gamma[i] = uint(qRound(qPow(i / qreal(255.), gray_gamma) * 2047)); + for (int i=0; i<2048; ++i) + qt_pow_invgamma[i] = uchar(qRound(qPow(i / qreal(2047.0), 1 / gray_gamma) * 255)); + + refresh(smoothing); +} + +void QDrawHelperGammaTables::refresh(qreal smoothing) +{ + for (int i=0; i<256; ++i) { + qt_pow_rgb_gamma[i] = uchar(qRound(qPow(i / qreal(255.0), smoothing) * 255)); + qt_pow_rgb_invgamma[i] = uchar(qRound(qPow(i / qreal(255.), 1 / smoothing) * 255)); + } +} + +QT_END_NAMESPACE diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index b5e8bca7e0..15f344bf81 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -737,7 +737,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen) s->flags.fast_pen = pen_style > Qt::NoPen && s->penData.blend && ((pen.isCosmetic() && penWidth <= 1) - || (s->flags.tx_noshear && penWidth * s->txscale <= 1)); + || (!pen.isCosmetic() && s->flags.tx_noshear && penWidth * s->txscale <= 1)); s->flags.non_complex_pen = qpen_capStyle(s->lastPen) <= Qt::SquareCap && s->flags.tx_noshear; diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 79ed03e393..f1310a5dca 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -194,7 +194,7 @@ public: void clip(const QVectorPath &path, Qt::ClipOperation op); void clip(const QRect &rect, Qt::ClipOperation op); void clip(const QRegion ®ion, Qt::ClipOperation op); - inline const QClipData *clip() const; + inline const QClipData *clipData() const; void drawStaticTextItem(QStaticTextItem *textItem); virtual bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions, @@ -492,7 +492,7 @@ inline const QClipData *QRasterPaintEnginePrivate::clip() const { return baseClip.data(); } -inline const QClipData *QRasterPaintEngine::clip() const { +inline const QClipData *QRasterPaintEngine::clipData() const { Q_D(const QRasterPaintEngine); if (state() && state()->clip && state()->clip->enabled) return state()->clip; diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 2752fbd573..849955100b 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7248,6 +7248,7 @@ void QPainter::setRedirected(const QPaintDevice *device, const QPoint &offset) { Q_ASSERT(device != 0); + Q_UNUSED(device) Q_UNUSED(replacement) Q_UNUSED(offset) qWarning("QPainter::setRedirected(): ignoring call to deprecated function, use QWidget::render() instead"); diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 843551d51f..cfa0a28fda 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -1524,6 +1524,7 @@ bool QPdfEngine::begin(QPaintDevice *pdev) d->pages.clear(); d->imageCache.clear(); + d->alphaCache.clear(); setActive(true); d->writeHeader(); |