diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-14 10:13:44 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-19 13:13:14 -0700 |
| commit | edfb0922ea697ca96a3a61d029c64eb4de98e967 (patch) | |
| tree | f208c9dba9efe93db87d3b0ec8edaae3cf2feeae /src | |
| parent | 9ecf72704d752b3b5eec7364652266a09a16c728 (diff) | |
QtGui & its plugins: remove set-but-unused variables
Found by clang 13:
qfontsubset.cpp:1211:10: warning: variable 'sumAdvances' set but not used [-Wunused-but-set-variable]
Change-Id: Iea05060bc2c046928536fffd16adf500fb9bc8e5
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 93ab5e27db..295af01f8c 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -1208,7 +1208,6 @@ QByteArray QFontSubset::toTruetype() const QList<QTtfGlyph> glyphs; glyphs.reserve(numGlyphs); - uint sumAdvances = 0; for (int i = 0; i < numGlyphs; ++i) { glyph_t g = glyph_indices.at(i); QPainterPath path; @@ -1231,9 +1230,6 @@ QByteArray QFontSubset::toTruetype() const font.maxp.maxPoints = qMax(font.maxp.maxPoints, glyph.numPoints); font.maxp.maxContours = qMax(font.maxp.maxContours, glyph.numContours); - if (glyph.xMax > glyph.xMin) - sumAdvances += glyph.xMax - glyph.xMin; - // qDebug("adding glyph %d size=%d", glyph.index, glyph.data.size()); glyphs.append(glyph); widths[i] = glyph.advanceWidth; diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 1b084e2eea..a3fe9d740c 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -208,9 +208,7 @@ bool ICOReader::canRead(QIODevice *iodev) ICONDIR ikonDir; if (readIconDir(iodev, &ikonDir)) { - qint64 readBytes = ICONDIR_SIZE; if (readIconDirEntry(iodev, &ikonDir.idEntries[0])) { - readBytes += ICONDIRENTRY_SIZE; // ICO format does not have a magic identifier, so we read 6 different values, which will hopefully be enough to identify the file. if ( ikonDir.idReserved == 0 && (ikonDir.idType == 1 || ikonDir.idType == 2) |