aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbashi@chromium.org <bashi@chromium.org@a4e77c2c-9104-11de-800e-5b313e0d2bf3>2011-09-21 06:29:58 +0000
committerbashi@chromium.org <bashi@chromium.org@a4e77c2c-9104-11de-800e-5b313e0d2bf3>2011-09-21 06:29:58 +0000
commit89cec1ff662509176374a42c1248a46a7ad6505a (patch)
tree109b4fbf8e62c1476524a781b19b9f5a3ac21ec9
parent9251959e68ed10ac38b3bba49422d27564cf2fc8 (diff)
downloadots-89cec1ff662509176374a42c1248a46a7ad6505a.tar.gz
Sort NameRecords in name table if they are not sorted.
Also adds src/name.h to ots_souces in ots-common.gypi. Review url: http://codereview.chromium.org/7976019/ git-svn-id: http://ots.googlecode.com/svn/trunk@74 a4e77c2c-9104-11de-800e-5b313e0d2bf3
-rw-r--r--ots-common.gypi1
-rw-r--r--src/name.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/ots-common.gypi b/ots-common.gypi
index 0432b4a..944fa13 100644
--- a/ots-common.gypi
+++ b/ots-common.gypi
@@ -48,6 +48,7 @@
'src/metrics.cc',
'src/metrics.h',
'src/name.cc',
+ 'src/name.h',
'src/os2.cc',
'src/os2.h',
'src/ots.cc',
diff --git a/src/name.cc b/src/name.cc
index 10507aa..a22211b 100644
--- a/src/name.cc
+++ b/src/name.cc
@@ -154,7 +154,8 @@ bool ots_name_parse(OpenTypeFile* file, const uint8_t* data, size_t length) {
}
if ((i > 0) && !(prev_record < rec)) {
- OTS_FAILURE();
+ OTS_WARNING("name records are not sorted.");
+ sort_required = true;
}
name->names.push_back(rec);