summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2010-02-24 19:13:50 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-05 15:58:09 (GMT)
commitb4466fdf5c1d982f3ac740ea01fe77ac3d9ff8e5 (patch)
tree3b051cc947084114e91d8be6d04c9261fd2b3225
parent5c3c63768ab7d042c62d35f3f254d9723c87c83e (diff)
downloadQt-b4466fdf5c1d982f3ac740ea01fe77ac3d9ff8e5.zip
Qt-b4466fdf5c1d982f3ac740ea01fe77ac3d9ff8e5.tar.gz
Qt-b4466fdf5c1d982f3ac740ea01fe77ac3d9ff8e5.tar.bz2
finish last commit
don't skip non-starters in composition exclusions code; warn & exit instead Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
-rw-r--r--util/unicode/main.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp
index c5d04c0..5a2f45e 100644
--- a/util/unicode/main.cpp
+++ b/util/unicode/main.cpp
@@ -1004,9 +1004,10 @@ static void readDerivedNormalizationProps()
uint part1 = d.decomposition.at(0);
uint part2 = d.decomposition.at(1);
- UnicodeData first = unicodeData.value(part1, UnicodeData(part1));
- if (first.p.combiningClass != 0)
- continue;
+
+ // all non-starters are listed in DerivedNormalizationProps.txt
+ // and already excluded from composition
+ Q_ASSERT(unicodeData.value(part1, UnicodeData(part1)).p.combiningClass == 0);
++numLigatures;
highestLigature = qMax(highestLigature, (int)part1);