aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickmaskextruder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/particles/qquickmaskextruder.cpp')
-rw-r--r--src/particles/qquickmaskextruder.cpp46
1 files changed, 5 insertions, 41 deletions
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index f1726a51d4..51d8798ac8 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qquickmaskextruder_p.h"
#include <QtQml/qqml.h>
@@ -105,9 +69,9 @@ void QQuickMaskExtruder::finishMaskLoading()
QPointF QQuickMaskExtruder::extrude(const QRectF &r)
{
ensureInitialized(r);
- if (!m_mask.count() || m_img.isNull())
+ if (!m_mask.size() || m_img.isNull())
return r.topLeft();
- const QPointF p = m_mask[QRandomGenerator::global()->bounded(int(m_mask.count()))];
+ const QPointF p = m_mask[QRandomGenerator::global()->bounded(m_mask.size())];
//### Should random sub-pixel positioning be added?
return p + r.topLeft();
}
@@ -142,7 +106,7 @@ void QQuickMaskExtruder::ensureInitialized(const QRectF &rf)
// Image will in all likelyhood be in this format already, so
// no extra memory or conversion takes place
if (m_img.format() != QImage::Format_ARGB32 && m_img.format() != QImage::Format_ARGB32_Premultiplied)
- m_img = m_img.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+ m_img = std::move(m_img).convertToFormat(QImage::Format_ARGB32_Premultiplied);
// resample on the fly using 16-bit
int sx = (m_img.width() << 16) / r.width();