From 40abda4dad2d2434a919a20bc4dfe4f7171f19ad Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 24 Sep 2016 15:27:59 +0000 Subject: [PATCH] mostly const-fication of some arguments Signed-off-by: Ivailo Monev --- src/gui/painting/qoutlinemapper.cpp | 12 +++--- src/gui/painting/qoutlinemapper_p.h | 4 -- src/gui/painting/qpaintengine_raster.cpp | 49 ++++++++++------------ src/gui/painting/qpaintengine_raster_p.h | 13 +++--- src/gui/painting/qpaintengineex.cpp | 2 +- src/gui/painting/qpaintengineex_p.h | 2 +- src/gui/painting/qrasterdefs_p.h | 7 ++++ .../gl2paintengineex/qpaintengineex_opengl2_p.h | 2 +- src/opengl/qpaintengine_opengl_p.h | 2 +- 9 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index 58db9ab6c..a0d9e5fd2 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -222,12 +222,12 @@ void QOutlineMapper::endOutline() // Check for out of dev bounds... - const bool do_clip = !m_in_clip_elements && (controlPointRect.left() < -QT_RASTER_COORD_LIMIT - || controlPointRect.right() > QT_RASTER_COORD_LIMIT - || controlPointRect.top() < -QT_RASTER_COORD_LIMIT - || controlPointRect.bottom() > QT_RASTER_COORD_LIMIT - || controlPointRect.width() > QT_RASTER_COORD_LIMIT - || controlPointRect.height() > QT_RASTER_COORD_LIMIT); + const bool do_clip = !m_in_clip_elements && (controlPointRect.left() < -RASTER_COORD_LIMIT + || controlPointRect.right() > RASTER_COORD_LIMIT + || controlPointRect.top() < -RASTER_COORD_LIMIT + || controlPointRect.bottom() > RASTER_COORD_LIMIT + || controlPointRect.width() > RASTER_COORD_LIMIT + || controlPointRect.height() > RASTER_COORD_LIMIT); if (do_clip) { clipElements(elements, elementTypes(), element_count); diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index 7aa50f65d..9ffc66ea8 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -67,10 +67,6 @@ QT_BEGIN_NAMESPACE -// This limitations comes from qgrayraster.c. Any higher and -// rasterization of shapes will produce incorrect results. -const int QT_RASTER_COORD_LIMIT = 32767; - //#define QT_DEBUG_CONVERT /******************************************************************************** diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index e378abfc3..1555ae2c5 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -339,10 +339,10 @@ bool QRasterPaintEngine::begin(QPaintDevice *device) ensureOutlineMapper(); d->outlineMapper->m_clip_rect = d->deviceRect; - if (d->outlineMapper->m_clip_rect.width() > QT_RASTER_COORD_LIMIT) - d->outlineMapper->m_clip_rect.setWidth(QT_RASTER_COORD_LIMIT); - if (d->outlineMapper->m_clip_rect.height() > QT_RASTER_COORD_LIMIT) - d->outlineMapper->m_clip_rect.setHeight(QT_RASTER_COORD_LIMIT); + if (d->outlineMapper->m_clip_rect.width() > RASTER_COORD_LIMIT) + d->outlineMapper->m_clip_rect.setWidth(RASTER_COORD_LIMIT); + if (d->outlineMapper->m_clip_rect.height() > RASTER_COORD_LIMIT) + d->outlineMapper->m_clip_rect.setHeight(RASTER_COORD_LIMIT); d->rasterizer->setClipRect(d->deviceRect); @@ -517,13 +517,9 @@ QRasterPaintEngineState::QRasterPaintEngineState(QRasterPaintEngineState &s) */ QPainterState *QRasterPaintEngine::createState(QPainterState *orig) const { - QRasterPaintEngineState *s; if (!orig) - s = new QRasterPaintEngineState(); - else - s = new QRasterPaintEngineState(*static_cast(orig)); - - return s; + return new QRasterPaintEngineState(); + return new QRasterPaintEngineState(*static_cast(orig)); } /*! @@ -595,7 +591,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen) d->basicStroker.setCapStyle(qpen_capStyle(pen)); d->basicStroker.setMiterLimit(pen.miterLimit()); - qreal penWidth = qpen_widthf(pen); + const qreal penWidth = qpen_widthf(pen); if (penWidth == 0) d->basicStroker.setStrokeWidth(1); else @@ -875,8 +871,8 @@ void QRasterPaintEnginePrivate::drawImage(const QPointF &pt, void QRasterPaintEnginePrivate::systemStateChanged() { deviceRectUnclipped = QRect(0, 0, - qMin(QT_RASTER_COORD_LIMIT, device->width()), - qMin(QT_RASTER_COORD_LIMIT, device->height())); + qMin(RASTER_COORD_LIMIT, device->width()), + qMin(RASTER_COORD_LIMIT, device->height())); if (!systemClip.isEmpty()) { QRegion clippedDeviceRgn = systemClip & deviceRectUnclipped; @@ -1100,7 +1096,7 @@ void QRasterPaintEngine::clip(const QRect &rect, Qt::ClipOperation op) bool QRasterPaintEngine::setClipRectInDeviceCoords(const QRect &r, Qt::ClipOperation op) { Q_D(QRasterPaintEngine); - QRect clipRect = r & d->deviceRect; + const QRect clipRect = r & d->deviceRect; QRasterPaintEngineState *s = state(); if (op == Qt::ReplaceClip || s->clip == 0) { @@ -1222,10 +1218,10 @@ void QRasterPaintEngine::fillPath(const QPainterPath &path, QSpanData *fillData) QRasterPaintEngineState *s = state(); const QRect deviceRect = s->matrix.mapRect(controlPointRect).toRect(); ProcessSpans blend = d->getBrushFunc(deviceRect, fillData); - const bool do_clip = (deviceRect.left() < -QT_RASTER_COORD_LIMIT - || deviceRect.right() > QT_RASTER_COORD_LIMIT - || deviceRect.top() < -QT_RASTER_COORD_LIMIT - || deviceRect.bottom() > QT_RASTER_COORD_LIMIT); + const bool do_clip = (deviceRect.left() < -RASTER_COORD_LIMIT + || deviceRect.right() > RASTER_COORD_LIMIT + || deviceRect.top() < -RASTER_COORD_LIMIT + || deviceRect.bottom() > RASTER_COORD_LIMIT); if (!s->flags.antialiased && !do_clip) { d->initializeRasterizer(fillData); @@ -1529,10 +1525,10 @@ void QRasterPaintEngine::fill(const QVectorPath &path, const QBrush &brush) ProcessSpans blend = d->getBrushFunc(deviceRect, &s->brushData); // ### Falcon -// const bool do_clip = (deviceRect.left() < -QT_RASTER_COORD_LIMIT -// || deviceRect.right() > QT_RASTER_COORD_LIMIT -// || deviceRect.top() < -QT_RASTER_COORD_LIMIT -// || deviceRect.bottom() > QT_RASTER_COORD_LIMIT); +// const bool do_clip = (deviceRect.left() < -RASTER_COORD_LIMIT +// || deviceRect.right() > RASTER_COORD_LIMIT +// || deviceRect.top() < -RASTER_COORD_LIMIT +// || deviceRect.bottom() > RASTER_COORD_LIMIT); // ### Falonc: implement.... // if (!s->flags.antialiased && !do_clip) { @@ -2147,7 +2143,8 @@ static inline bool monoVal(const uchar* s, int x) /*! \internal */ -void QRasterPaintEngine::alphaPenBlt(const void* src, int bpl, int depth, int rx,int ry,int w,int h) +void QRasterPaintEngine::alphaPenBlt(const void* src, const int bpl, const int depth, + int rx, int ry, int w, int h) { Q_D(QRasterPaintEngine); QRasterPaintEngineState *s = state(); @@ -2808,7 +2805,7 @@ bool QRasterPaintEngine::supportsTransformations(const QFontEngine *fontEngine) return supportsTransformations(fontEngine->fontDef.pixelSize, m); } -bool QRasterPaintEngine::supportsTransformations(qreal pixelSize, const QTransform &m) const +bool QRasterPaintEngine::supportsTransformations(const qreal pixelSize, const QTransform &m) const { if (m.type() >= QTransform::TxProject) return true; @@ -3146,8 +3143,8 @@ QRasterBuffer::QRasterBuffer() QImage::Format QRasterBuffer::prepare(QImage *image) { m_buffer = (uchar *)image->bits(); - m_width = qMin(QT_RASTER_COORD_LIMIT, image->width()); - m_height = qMin(QT_RASTER_COORD_LIMIT, image->height()); + m_width = qMin(RASTER_COORD_LIMIT, image->width()); + m_height = qMin(RASTER_COORD_LIMIT, image->height()); bytes_per_pixel = image->depth()/8; bytes_per_line = image->bytesPerLine(); diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index a3857af78..f7367166a 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -213,12 +213,13 @@ public: void saveBuffer(const QString &s) const; #endif - void alphaPenBlt(const void* src, int bpl, int depth, int rx,int ry,int w,int h); + void alphaPenBlt(const void* src, const int bpl, const int depth, + int rx, int ry, int w, int h); Type type() const { return Raster; } bool supportsTransformations(const QFontEngine *fontEngine) const; - bool supportsTransformations(qreal pixelSize, const QTransform &m) const; + bool supportsTransformations(const qreal pixelSize, const QTransform &m) const; protected: QRasterPaintEngine(QRasterPaintEnginePrivate &d, QPaintDevice *); @@ -365,8 +366,8 @@ public: uint hasRectClip : 1; uint hasRegionClip : 1; - void appendSpan(int x, int length, int y, int coverage); - void appendSpans(const QSpan *s, int num); + void appendSpan(const int x, const int length, const int y, const int coverage); + void appendSpans(const QSpan *s, const int num); // ### Should optimize and actually kill the QSpans if the rect is // ### a subset of The current region. Thus the "fast" clipspan @@ -376,7 +377,7 @@ public: void fixup(); }; -inline void QClipData::appendSpan(int x, int length, int y, int coverage) +inline void QClipData::appendSpan(const int x, const int length, const int y, const int coverage) { Q_ASSERT(m_spans); // initialize() has to be called prior to adding spans.. @@ -391,7 +392,7 @@ inline void QClipData::appendSpan(int x, int length, int y, int coverage) ++count; } -inline void QClipData::appendSpans(const QSpan *s, int num) +inline void QClipData::appendSpans(const QSpan *s, const int num) { Q_ASSERT(m_spans); diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index d1eda6d7a..234ee3da6 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -1106,7 +1106,7 @@ void QPaintEngineEx::drawStaticTextItem(QStaticTextItem *staticTextItem) } } -bool QPaintEngineEx::supportsTransformations(qreal pixelSize, const QTransform &m) const +bool QPaintEngineEx::supportsTransformations(const qreal pixelSize, const QTransform &m) const { Q_UNUSED(pixelSize); diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index d96eb5d11..e513d9ad0 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -220,7 +220,7 @@ public: // that will be requested, and not just the "type". virtual QPixmapFilter *pixmapFilter(int /*type*/, const QPixmapFilter * /*prototype*/) { return 0; } - virtual bool supportsTransformations(qreal pixelSize, const QTransform &m) const; + virtual bool supportsTransformations(const qreal pixelSize, const QTransform &m) const; protected: QPaintEngineEx(QPaintEngineExPrivate &data); diff --git a/src/gui/painting/qrasterdefs_p.h b/src/gui/painting/qrasterdefs_p.h index 0cbf12c74..68e8e58a4 100644 --- a/src/gui/painting/qrasterdefs_p.h +++ b/src/gui/painting/qrasterdefs_p.h @@ -518,6 +518,13 @@ QT_FT_BEGIN_HEADER /* */ #define RASTER_POOL_SIZE 8192 + /*************************************************************************/ + /* */ + /* Any higher and rasterization of shapes will produce incorrect */ + /* results. */ + /* */ + #define RASTER_COORD_LIMIT 32767 + /* */ diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index db1110338..26328adf8 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -161,7 +161,7 @@ public: void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool supportsTransformations(qreal, const QTransform &) const { return true; } + bool supportsTransformations(const qreal, const QTransform &) const { return true; } private: Q_DISABLE_COPY(QGL2PaintEngineEx) }; diff --git a/src/opengl/qpaintengine_opengl_p.h b/src/opengl/qpaintengine_opengl_p.h index 0f724fa8b..dbcbf06d1 100644 --- a/src/opengl/qpaintengine_opengl_p.h +++ b/src/opengl/qpaintengine_opengl_p.h @@ -139,7 +139,7 @@ public: Qt::HANDLE handle() const; inline Type type() const { return QPaintEngine::OpenGL; } - bool supportsTransformations(qreal, const QTransform &) const { return true; } + bool supportsTransformations(const qreal, const QTransform &) const { return true; } private: void drawPolyInternal(const QPolygonF &pa, bool close = true); -- 2.11.0