diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:02:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:02:32 +0200 |
| commit | fd833044a5b986e8dafa124ab7f2c885d60f329d (patch) | |
| tree | cdb8bc8c22c80b9c0391a4f556b4c9afa210e64f | |
| parent | 6690a8453989408401d8166f1ab3aa41cc2d4360 (diff) | |
| parent | c183d1add9760ca7af845f45e37d1864feb6e5d2 (diff) | |
| download | qttools-fd833044a5b986e8dafa124ab7f2c885d60f329d.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
| -rw-r--r-- | src/distancefieldgenerator/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp index 3717330b4..ee4475ada 100644 --- a/src/distancefieldgenerator/mainwindow.cpp +++ b/src/distancefieldgenerator/mainwindow.cpp @@ -551,7 +551,7 @@ QByteArray MainWindow::createSfntTable() glyphRecord.boundingRectY = qToBigEndian(TO_FIXED_POINT(glyphData.boundingRect.y())); glyphRecord.boundingRectWidth = qToBigEndian(TO_FIXED_POINT(glyphData.boundingRect.width())); glyphRecord.boundingRectHeight = qToBigEndian(TO_FIXED_POINT(glyphData.boundingRect.height())); - glyphRecord.textureIndex = qToBigEndian(glyphData.textureIndex); + glyphRecord.textureIndex = qToBigEndian(quint16(glyphData.textureIndex)); buffer.write(reinterpret_cast<char *>(&glyphRecord), sizeof(QtdfGlyphRecord)); int expectedWidth = qCeil(glyphData.texCoord.width + glyphData.texCoord.xMargin * 2); |