summaryrefslogtreecommitdiffstats
path: root/src/makeqpf
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 20:14:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 13:10:57 +0100
commitcf01d7136fb79ee3f8e8522748b08519f0ea528f (patch)
treeed4021fd66f4da1b164ca27e522da28525b473f7 /src/makeqpf
parent2f2dd0137982e5894b93ca1770c096c19e3dc46c (diff)
whitespace fixes
remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/makeqpf')
-rw-r--r--src/makeqpf/Blocks.txt4
-rw-r--r--src/makeqpf/qpf2.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/makeqpf/Blocks.txt b/src/makeqpf/Blocks.txt
index 9cc87547f..ad8474bd5 100644
--- a/src/makeqpf/Blocks.txt
+++ b/src/makeqpf/Blocks.txt
@@ -17,13 +17,13 @@
# Note: When comparing block names, casing, whitespace, hyphens,
# and underbars are ignored.
# For example, "Latin Extended-A" and "latin extended a" are equivalent.
-# For more information on the comparison of property values,
+# For more information on the comparison of property values,
# see UCD.html.
#
# All code points not explicitly listed for Block
# have the value No_Block.
-# Property: Block
+# Property: Block
#
# @missing: 0000..10FFFF; No_Block
diff --git a/src/makeqpf/qpf2.cpp b/src/makeqpf/qpf2.cpp
index 3221dc8d6..06cc6a303 100644
--- a/src/makeqpf/qpf2.cpp
+++ b/src/makeqpf/qpf2.cpp
@@ -490,8 +490,8 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges)
QByteArray glyphs;
if (options & RenderGlyphs) {
// this is only a rough estimation
- glyphs.reserve(glyphCount
- * (sizeof(QFontEngineQPF::Glyph)
+ glyphs.reserve(glyphCount
+ * (sizeof(QFontEngineQPF::Glyph)
+ qRound(fe->maxCharWidth() * (fe->ascent() + fe->descent()).toReal())));
QGlyphLayoutArray<10> layout;
@@ -638,7 +638,7 @@ const uchar *QPF::dumpHeader(const uchar *data)
{
const QFontEngineQPF::Header *header = reinterpret_cast<const QFontEngineQPF::Header *>(data);
qDebug() << "Header:";
- qDebug() << "magic ="
+ qDebug() << "magic ="
<< header->magic[0]
<< header->magic[1]
<< header->magic[2]