diff --git a/src/imageformats/ani.cpp b/src/imageformats/ani.cpp index 75e1800..fbd14c6 100644 --- a/src/imageformats/ani.cpp +++ b/src/imageformats/ani.cpp @@ -90,7 +90,7 @@ bool ANIHandler::read(QImage *outImage) } const QByteArray frameSizeData = device()->read(sizeof(quint32_le)); - if (frameSizeData.count() != sizeof(quint32_le)) { + if (frameSizeData.size() != sizeof(quint32_le)) { return false; } @@ -384,7 +384,7 @@ bool ANIHandler::ensureScanned() const // TODO should we check that the number of rate entries matches nSteps? auto *dataPtr = data.data(); QVector list; - for (int i = 0; i < data.count(); i += sizeof(quint32_le)) { + for (int i = 0; i < data.size(); i += sizeof(quint32_le)) { const auto entry = *(reinterpret_cast(dataPtr + i)); list.append(entry); } diff --git a/src/imageformats/raw.cpp b/src/imageformats/raw.cpp index bbf1f82..9d409df 100644 --- a/src/imageformats/raw.cpp +++ b/src/imageformats/raw.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #if defined(Q_OS_WINDOWS) && !defined(NOMINMAX) #define NOMINMAX @@ -222,7 +223,7 @@ QString createTag(char *asciiz, const char *tag) QString createTimeTag(time_t time, const char *tag) { - auto value = QDateTime::fromSecsSinceEpoch(time, Qt::UTC); + auto value = QDateTime::fromSecsSinceEpoch(time, QTimeZone::utc()); if (value.isValid() && time > 0) { return createTag(value.toString(Qt::ISODate), tag); }