1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QGraphicsScene::render: fix int/qsizetype mismatch

Browse Source 
Also suppresses the warning that we may be trying to allocate -1 items
in call to new[].

Task-number: QTBUG-105388
Task-number: QTBUG-105471
Change-Id: Ie4bb662dcb274440ab8bfffd17096d3606354647
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 70d040fa1abb5c195643a9e2c5d8681ba1ea54c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-08-08 10:00:16 -07:00 committed by Qt Cherry-pick Bot
parent 9b5361fa7f
commit 11d7070654
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -1816,8 +1816,8 @@ void QGraphicsScene::render(QPainter *painter, const QRectF &target, const QRect
// in reverse order). // in reverse order).
QList<QGraphicsItem *> itemList = items(sourceRect, Qt::IntersectsItemBoundingRect); QList<QGraphicsItem *> itemList = items(sourceRect, Qt::IntersectsItemBoundingRect);
QGraphicsItem **itemArray = new QGraphicsItem *[itemList.size()]; QGraphicsItem **itemArray = new QGraphicsItem *[itemList.size()];
const int numItems = itemList.size(); const qsizetype numItems = itemList.size();
for (int i = 0; i < numItems; ++i) for (qsizetype i = 0; i < numItems; ++i)
itemArray[numItems - i - 1] = itemList.at(i); itemArray[numItems - i - 1] = itemList.at(i);
itemList.clear(); itemList.clear();
@ -1834,7 +1834,7 @@ void QGraphicsScene::render(QPainter *painter, const QRectF &target, const QRect
// Generate the style options // Generate the style options
QStyleOptionGraphicsItem *styleOptionArray = new QStyleOptionGraphicsItem[numItems]; QStyleOptionGraphicsItem *styleOptionArray = new QStyleOptionGraphicsItem[numItems];
for (int i = 0; i < numItems; ++i) for (qsizetype i = 0; i < numItems; ++i)
itemArray[i]->d_ptr->initStyleOption(&styleOptionArray[i], painterTransform, targetRect.toRect()); itemArray[i]->d_ptr->initStyleOption(&styleOptionArray[i], painterTransform, targetRect.toRect());
// Render the scene. // Render the scene.