makeqpf: Fixing range in character-generation

MakeQPF currently omits generating the last character in the
selected ranges, e.g. ranges requested for conversion are
   0..127
   128..255
then only the characters
   0..126
   128..254
are generated in the QPF2 output file.
This fixes it, so that character 255 (in this example) also
gets created. This is according to the usage-specification!

Change-Id: Id85215781c9a67a90ac05efbbf374240f25bbb3c
Track-number: QTBUG-19561
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/tools/makeqpf/mainwindow.cpp b/tools/makeqpf/mainwindow.cpp
index 08fa30b..ec5bb33 100644
--- a/tools/makeqpf/mainwindow.cpp
+++ b/tools/makeqpf/mainwindow.cpp
@@ -236,7 +236,7 @@ void MainWindow::on_sampleFile_editingFinished()
     foreach (QChar ch, sortedCoverage) {
         QPF::CharacterRange r;
         r.start = ch.unicode();
-        r.end = r.start + 1;
+        r.end = r.start;
         sampleFileRanges.append(r);
     }
 
diff --git a/tools/makeqpf/qpf2.cpp b/tools/makeqpf/qpf2.cpp
index ee37c53..30800c8 100644
--- a/tools/makeqpf/qpf2.cpp
+++ b/tools/makeqpf/qpf2.cpp
@@ -499,7 +499,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges)
         foreach (CharacterRange range, ranges) {
             if (debugVerbosity > 2)
                 qDebug() << "rendering range from" << range.start << "to" << range.end;
-            for (uint uc = range.start; uc < range.end; ++uc) {
+            for (uint uc = range.start; uc <= range.end; ++uc) {
                 QChar ch(uc);
                 int nglyphs = 10;
                 if (!fe->stringToCMap(&ch, 1, &layout, &nglyphs, /*flags*/ 0))
diff --git a/tools/makeqpf/qpf2.h b/tools/makeqpf/qpf2.h
index 1a1df07..22e5c26 100644
--- a/tools/makeqpf/qpf2.h
+++ b/tools/makeqpf/qpf2.h
@@ -61,7 +61,7 @@ public:
 
     struct CharacterRange
     {
-        inline CharacterRange() : start(0), end(0x10000) {}
+        inline CharacterRange() : start(0), end(0xffff) {}
         uint start;
         uint end;
     };