diff options
Diffstat (limited to 'src/plugins/imageformats/gif')
| -rw-r--r-- | src/plugins/imageformats/gif/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/plugins/imageformats/gif/qgifhandler.cpp | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index 05cb8b45ec..b56859a264 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -1,7 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -# Generated from gif.pro. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## QGifPlugin Plugin: @@ -13,10 +11,7 @@ qt_internal_add_plugin(QGifPlugin SOURCES main.cpp qgifhandler.cpp qgifhandler_p.h - LIBRARIES # special case - Qt::Gui # special case - Qt::GuiPrivate # special case + LIBRARIES + Qt::Gui + Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>: -# OTHER_FILES = "gif.json" diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp index add6b64855..8ad4ff7510 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -1146,9 +1146,9 @@ QVariant QGifHandler::option(ImageOption option) const } // before the first frame is read, or we have an empty data stream if (frameNumber == -1) - return (imageSizes.count() > 0) ? QVariant(imageSizes.at(0)) : QVariant(); + return (imageSizes.size() > 0) ? QVariant(imageSizes.at(0)) : QVariant(); // after the last frame has been read, the next size is undefined - if (frameNumber >= imageSizes.count() - 1) + if (frameNumber >= imageSizes.size() - 1) return QVariant(); // and the last case: the size of the next frame return imageSizes.at(frameNumber + 1); @@ -1175,7 +1175,7 @@ int QGifHandler::imageCount() const QGIFFormat::scan(device(), &imageSizes, &loopCnt); scanIsCached = true; } - return imageSizes.count(); + return imageSizes.size(); } int QGifHandler::loopCount() const |